tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sub'

Browse Source
This commit is contained in:
subsub 2024-12-12 17:35:21 +09:00
commit 41d21895d2
7 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/decorators.xml
View File

@ -106,6 +106,7 @@
<pattern>/xxx/*</pattern><!-- 테스트 페이지 --> <pattern>/xxx/*</pattern><!-- 테스트 페이지 -->
<pattern>/common/gtm/multiFileList.do</pattern><!-- AS-IS 분쟁조정--> <pattern>/common/gtm/multiFileList.do</pattern><!-- AS-IS 분쟁조정-->
<pattern>/com/srch/*</pattern> <pattern>/com/srch/*</pattern>
<pattern>/sym/log/clg/SelectWebLogList.do</pattern> <!-- 접속통계 > 사용자메뉴별접속통계 -->
</decorator> </decorator>
<decorator name="seedNolayout" page="/WEB-INF/jsp/layout/seedNoLayout.jsp"> <decorator name="seedNolayout" page="/WEB-INF/jsp/layout/seedNoLayout.jsp">

1
src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerUpdt.jsp
View File

@ -231,6 +231,7 @@ function fn_egov_downFile(atchFileId, fileSn){
<td class="upload_area"> <td class="upload_area">
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/> <input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/>
<button type="button" id="filebutton" class="btn btn_text btn_36 blue_border btn_add_file">파일 첨부하기</button> <button type="button" id="filebutton" class="btn btn_text btn_36 blue_border btn_add_file">파일 첨부하기</button>
<span class="cf_text ml10">*이미지 사이즈 : 179 X 54px</span>
<div class="file_wrap file_upload_box no_img_box"> <div class="file_wrap file_upload_box no_img_box">
<table class="tbType02"> <table class="tbType02">
<colgroup> <colgroup>

4
src/main/webapp/WEB-INF/jsp/manager/bbs/bbsSetEdit.jsp
View File

@ -420,11 +420,11 @@
<button type="submit" class="btn btn_text btn_46 blue_fill"><s:message code="common.button.mod"/></button> <button type="submit" class="btn btn_text btn_46 blue_fill"><s:message code="common.button.mod"/></button>
<c:if test='${memberGrant == "S" || memberAuth}'> <c:if test='${memberGrant == "S" || memberAuth}'>
<c:if test="${tBbsSetDB.bbsSetStatus == 'D'}"> <c:if test="${tBbsSetDB.bbsSetStatus == 'D'}">
<a class="btn btn_text btn_46 gray_fill" href="/${pageType}/proc/<c:out escapeXml='true' value='${siteIdx}' />/bbsSetDelProc/<c:out escapeXml='true' value='${tBbsSetDB.bbsSetIdx}' />.do?page=<c:out escapeXml='true' value='${page}' />&amp;row=<c:out escapeXml='true' value='${row}' />&amp;orderColumn=<c:out escapeXml='true' value='${orderColumn}' />&amp;order=<c:out escapeXml='true' value='${order}' />&amp;column=<c:out escapeXml='true' value='${column}' />&amp;search=<c:out escapeXml='true' value='${search}' />"><s:message code="common.button.del"/></a> <a class="btn btn_text btn_46 gray_fill" style="display:flex;justify-content:center;align-items:center;" href="/${pageType}/proc/<c:out escapeXml='true' value='${siteIdx}' />/bbsSetDelProc/<c:out escapeXml='true' value='${tBbsSetDB.bbsSetIdx}' />.do?page=<c:out escapeXml='true' value='${page}' />&amp;row=<c:out escapeXml='true' value='${row}' />&amp;orderColumn=<c:out escapeXml='true' value='${orderColumn}' />&amp;order=<c:out escapeXml='true' value='${order}' />&amp;column=<c:out escapeXml='true' value='${column}' />&amp;search=<c:out escapeXml='true' value='${search}' />"><s:message code="common.button.del"/></a>
</c:if> </c:if>
</c:if> </c:if>
<c:if test='${memberGrant == "S" || memberAuth || (pageType == "gte" && (memberAuthG || memberAuthM))}'> <c:if test='${memberGrant == "S" || memberAuth || (pageType == "gte" && (memberAuthG || memberAuthM))}'>
<a class="btn btn_text btn_46 gray_fill" href="/${pageType}/<c:out escapeXml='true' value='${siteIdx}' />/bbsSetList.do?page=<c:out escapeXml='true' value='${page}' />&amp;row=<c:out escapeXml='true' value='${row}' />&amp;orderColumn=<c:out escapeXml='true' value='${orderColumn}' />&amp;order=<c:out escapeXml='true' value='${order}' />&amp;column=<c:out escapeXml='true' value='${column}' />&amp;search=<c:out escapeXml='true' value='${search}' />"><s:message code="common.button.list"/></a> <a class="btn btn_text btn_46 gray_fill" style="display:flex;justify-content:center;align-items:center;" href="/${pageType}/<c:out escapeXml='true' value='${siteIdx}' />/bbsSetList.do?page=<c:out escapeXml='true' value='${page}' />&amp;row=<c:out escapeXml='true' value='${row}' />&amp;orderColumn=<c:out escapeXml='true' value='${orderColumn}' />&amp;order=<c:out escapeXml='true' value='${order}' />&amp;column=<c:out escapeXml='true' value='${column}' />&amp;search=<c:out escapeXml='true' value='${search}' />"><s:message code="common.button.list"/></a>
</c:if> </c:if>
</div> </div>
</fieldset> </fieldset>

5
src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp
View File

@ -54,7 +54,8 @@ $( document ).ready(function(){
//오늘을 기준으로 지난 날만 선택하려면 minDate를 maxDate로 변경, 전체 선택하려면 minDate나 maxDate 삭제 //오늘을 기준으로 지난 날만 선택하려면 minDate를 maxDate로 변경, 전체 선택하려면 minDate나 maxDate 삭제
}; };
//시작일 //시작일
jQuery("#dateSt, #dateEnd").datepicker(dateOption); /* jQuery("#dateSt, #dateEnd").datepicker(dateOption); */
$("#startDate01, #endDate").datepicker(dateOption);
//종료일 //종료일
//jQuery("#Dateend").datepicker(dateOption); //jQuery("#Dateend").datepicker(dateOption);
@ -302,7 +303,7 @@ function webLogListExcelDownload(){
<ul class="search_ul" style="gap:10px;"> <ul class="search_ul" style="gap:10px;">
<li> <li>
<div class="calendar calendar_term"> <div class="calendar calendar_term">
<input type="text" id="startDate01" name="searchStartDt" value="${searchVO.searchStartDt}"> ~ <input type="text" id="endDate" name="searchEndDt" value="${searchVO.searchEndDt}"> <input type="text" id="startDate01" name="searchStartDt" value="${searchVO.searchStartDt}" autocomplete="off"> ~ <input type="text" id="endDate" name="searchEndDt" value="${searchVO.searchEndDt}" autocomplete="off">
</div> </div>
<!-- <!--

1
src/main/webapp/WEB-INF/jsp/uss/ion/pwm/MainZoneModify.jsp
View File

@ -230,6 +230,7 @@ function fn_egov_downFile(atchFileId, fileSn){
<td class="upload_area"> <td class="upload_area">
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/> <input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/>
<button type="button" id="filebutton" class="btn btn_text btn_36 blue_border">파일 첨부하기</button> <button type="button" id="filebutton" class="btn btn_text btn_36 blue_border">파일 첨부하기</button>
<span class="cf_text ml10">*이미지 사이즈 : 1920 X 677px</span>
<div class="file_wrap file_upload_box no_img_box"> <div class="file_wrap file_upload_box no_img_box">
<table> <table>
<colgroup> <colgroup>

4
src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp
View File

@ -11,10 +11,10 @@
<title> <title>
<c:choose> <c:choose>
<c:when test="${fn:contains(URL , 'main/mainPage.do')}"> <c:when test="${fn:contains(URL , 'main/mainPage.do')}">
한국공정거래조정원 온라인분쟁조정시스템 > 메인화면 한국공정거래조정원 분쟁조정사건처리시스템 > 메인화면
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:forEach var="result" items="${menuCurrentResultList}" varStatus="status">${result.menuNm}&lt;</c:forEach> 한국공정거래조정원 온라인분쟁조정시스템 <c:forEach var="result" items="${menuCurrentResultList}" varStatus="status">${result.menuNm}&lt;</c:forEach> 한국공정거래조정원 분쟁조정사건처리시스템
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</title> </title>

2
src/main/webapp/kofair_case_seed/adm/style/style.css
View File

@ -74,6 +74,7 @@ form h3,.title.depth02{font-size:20px;font-weight:bold;}
.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close::after{position:absolute;content:"닫기";font-size:15px;color:#666;;left:50%;transform:translateX(-50%);} .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close::after{position:absolute;content:"닫기";font-size:15px;color:#666;;left:50%;transform:translateX(-50%);}
.wrap .bbs-view-item .item-box .datepicker{background:#fff url(/kofair_case_seed/adm/images/component/icon_calendar.png) no-repeat calc(100% - 15px) center !important;} .wrap .bbs-view-item .item-box .datepicker{background:#fff url(/kofair_case_seed/adm/images/component/icon_calendar.png) no-repeat calc(100% - 15px) center !important;}
.ui-datepicker-next.ui-corner-all,.ui-datepicker-prev.ui-corner-all{display:none;}
/* table - 리스트 */ /* table - 리스트 */
.wrap .form-wrap{border:0;} .wrap .form-wrap{border:0;}
@ -231,6 +232,7 @@ div.webnote_toolbar_container{display:flex;}
.title.prc_title .select_wrap{display:flex;gap:8px;} .title.prc_title .select_wrap{display:flex;gap:8px;}
.title.prc_title .select_wrap *{height:36px;font-size:16px;} .title.prc_title .select_wrap *{height:36px;font-size:16px;}
.prc_content .btn_wrap{margin:0 0 40px 0;align-items:flex-end} .prc_content .btn_wrap{margin:0 0 40px 0;align-items:flex-end}
.prc_content .btn_wrap .area_right:only-child{width:100%;}
.prc_content .btn_wrap *{min-height:36px;} .prc_content .btn_wrap *{min-height:36px;}
.prc_content .btn_wrap.ac *{height:46px;} .prc_content .btn_wrap.ac *{height:46px;}
.prc_content .btn_wrap .area_left,.prc_content .btn_wrap .area_right{display:flex;align-items:center;gap:8px;flex-wrap:wrap;} .prc_content .btn_wrap .area_left,.prc_content .btn_wrap .area_right{display:flex;align-items:center;gap:8px;flex-wrap:wrap;}