diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp index 4b3e043c..ca0ac7d1 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp @@ -4,6 +4,9 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> + + + diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/edit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/edit.jsp index 978d7a55..a8697556 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/edit.jsp @@ -71,7 +71,7 @@ -

+
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/write.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/write.jsp index 42f747b8..c3cedbf0 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/write.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/write.jsp @@ -68,7 +68,7 @@ -

+
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/exam/edit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/exam/edit.jsp index 21941b57..e37b5d17 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/exam/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/exam/edit.jsp @@ -69,7 +69,7 @@ -

+
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp index 5acc56ba..d3e47cda 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp @@ -24,7 +24,9 @@ $(document).ready(function(){ }; //시작일 - jQuery("#fixDay").datetimepicker(); + jQuery("#fixDay").datetimepicker({ + buttonImage: "/kofair_case_seed/adm/images/component/icon_calendar.png" + }); //$('img.ui-datepicker-trigger').css({'cursor':'pointer', 'margin-bottom':'-4px'}); //아이콘(icon) 위치 setTimeout(function() { @@ -545,7 +547,7 @@ function fn_checkList() {
- +
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp index 39b3002f..f10ca949 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp @@ -1676,7 +1676,7 @@ function showConsignmentGubun(){ -
+
등록된 데이터가 없습니다.
@@ -1782,7 +1782,7 @@ function showConsignmentGubun(){ -
+
등록된 데이터가 없습니다.
@@ -1910,7 +1910,7 @@ function showConsignmentGubun(){ -
+
등록된 데이터가 없습니다.
@@ -2016,7 +2016,7 @@ function showConsignmentGubun(){ -
+
등록된 데이터가 없습니다.
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp index 1f5d1aec..34a27a11 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp @@ -36,7 +36,7 @@
  • - class="active" target="_blank"> + class="active">
  • diff --git a/src/main/webapp/kofair_case_seed/adm/images/component/dragdrop_img.png b/src/main/webapp/kofair_case_seed/adm/images/component/dragdrop_img.png new file mode 100644 index 00000000..12e73c54 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/component/dragdrop_img.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/scripts/layout.js b/src/main/webapp/kofair_case_seed/adm/scripts/layout.js index ddc71977..016aad49 100644 --- a/src/main/webapp/kofair_case_seed/adm/scripts/layout.js +++ b/src/main/webapp/kofair_case_seed/adm/scripts/layout.js @@ -13,7 +13,13 @@ function leftMenu() { }) }) - + $(".menu_title").each(function(idx,itm){ + var menuTitle = $(itm).text().trim(); + if(menuTitle == "Dashboard"){ + $(itm).addClass("none"); + } + + }) $('.menu_title').on('click',function () { diff --git a/src/main/webapp/kofair_case_seed/adm/style/layout.css b/src/main/webapp/kofair_case_seed/adm/style/layout.css index 22972426..ba011ae1 100644 --- a/src/main/webapp/kofair_case_seed/adm/style/layout.css +++ b/src/main/webapp/kofair_case_seed/adm/style/layout.css @@ -12,6 +12,7 @@ .leftmenu .depth01_li.active{border:0;} .leftmenu .menu_title{position:relative;display:flex;width:100%;height:54px;font-size:18px;font-weight:500;text-align:left;color:#888bbc;letter-spacing:-0.4px;align-items:center;} .leftmenu .menu_title::after{position:absolute;content:"";width:10px;height:10px;border-top:2px solid #888bbc;border-right:2px solid #888bbc;transform:rotate(-45deg);right:20px;top:23px;} +.leftmenu .menu_title.none::after{display:none;} .leftmenu .active .menu_title{color:#fff;} .leftmenu .active .menu_title::after{border-top:2px solid #fff;border-right:2px solid #fff;transform:rotate(135deg);top:20px;} diff --git a/src/main/webapp/kofair_case_seed/adm/style/style.css b/src/main/webapp/kofair_case_seed/adm/style/style.css index 3f822b34..fd38df9e 100644 --- a/src/main/webapp/kofair_case_seed/adm/style/style.css +++ b/src/main/webapp/kofair_case_seed/adm/style/style.css @@ -180,6 +180,10 @@ form h3,.title.depth02{font-size:20px;font-weight:bold;} /* editor */ div.webnote_toolbar_container{display:flex;} +/* 드래그드롭 */ +.dragdrop_wrap{margin:10px 0 0 0;border-radius:5px;} +.bbs-view-item .innorix_basic div.irx_filetree.empty-uploader{background:url(/kofair_case_seed/adm/images/component/dragdrop_img.png) no-repeat center center !important;} + /* 댓글 */ .cmmt_wrap{margin-top: 30px;} .cmmt_tit{display: flex; align-items: center;} diff --git a/src/main/webapp/kofair_case_seed/usr/scripts/common.js b/src/main/webapp/kofair_case_seed/usr/scripts/common.js index 80a6173e..23baaae7 100644 --- a/src/main/webapp/kofair_case_seed/usr/scripts/common.js +++ b/src/main/webapp/kofair_case_seed/usr/scripts/common.js @@ -265,7 +265,7 @@ function calendar() { $(".start_date").each(function (idx, itm) { $(this).find(".duet-date__input").attr("id", inputName); $(this).find(".duet-date__input").attr("name", inputName); - $(this).find(".duet-date__input").attr("value", startSub); + $(this).find(".duet-date__input").attr("value", startDtVal); $(this).find(".duet-date__input").next().attr("name", inputName + "_submit"); $(this).find(".duet-date__input").next().attr("value", startSub); }); @@ -373,7 +373,7 @@ function calendar() { $(".end_date").each(function (idx, itm) { $(itm).find(".duet-date__input").attr("id", inputName); $(itm).find(".duet-date__input").attr("name", inputName); - $(itm).find(".duet-date__input").attr("value", endSub); + $(itm).find(".duet-date__input").attr("value", endDtVal); $(itm).find(".duet-date__input").next().attr("name", inputName + "_submit"); $(itm).find(".duet-date__input").next().attr("value", endSub); }); diff --git a/src/main/webapp/kofair_case_seed/usr/scripts/layout.js b/src/main/webapp/kofair_case_seed/usr/scripts/layout.js index 1fb62c9c..eb5df12d 100644 --- a/src/main/webapp/kofair_case_seed/usr/scripts/layout.js +++ b/src/main/webapp/kofair_case_seed/usr/scripts/layout.js @@ -122,6 +122,7 @@ function snb() { var menuText = $(itm).text().trim(); if(menuText == "실시간 상담"){ $(itm).html("실시간 상담 "); + $(itm).attr("target","_blank"); } }) diff --git a/src/main/webapp/kofair_case_seed/usr/style/counsel.css b/src/main/webapp/kofair_case_seed/usr/style/counsel.css index 3adf2a99..6606313d 100644 --- a/src/main/webapp/kofair_case_seed/usr/style/counsel.css +++ b/src/main/webapp/kofair_case_seed/usr/style/counsel.css @@ -30,7 +30,7 @@ .free_counsel_content .depth02:nth-child(2){margin:0;} .free_counsel_content .box.gray_border .info_ul .title{font-weight:400;} .free_counsel_content .box.gray_border .info_ul .title::after{top:7px;} -.free_counsel_content .check_wrap{display:flex;margin:20px 0 0 0;font-size:1.7rem;justify-content:space-between;align-items:flex-start;} +.free_counsel_content .check_wrap{display:flex;margin:20px 0 0 0;font-size:1.7rem;line-height:1.4;justify-content:space-between;align-items:flex-start;} .free_counsel_content .check_wrap .checkbox{margin:-3px 10px 0 0;} .free_counsel_content .check_wrap label{color:#888;} .free_counsel_content .check_wrap :checked+label{color:#333;} diff --git a/src/main/webapp/kofair_case_seed/usr/style/mypage.css b/src/main/webapp/kofair_case_seed/usr/style/mypage.css index 8b19f25f..f28f4efa 100644 --- a/src/main/webapp/kofair_case_seed/usr/style/mypage.css +++ b/src/main/webapp/kofair_case_seed/usr/style/mypage.css @@ -38,7 +38,7 @@ .idf_method .btn_idf.kakao span{background:#f9d300;color:#371c1d;} /* 분쟁조정신청현황 > 현황 */ -.apl_status_content.detail h3{margin:0 0 40px 0;} +.apl_status_content.detail h3{margin:32px 0 40px 0;} .apl_status_content.detail .table_top.title{border-bottom:1px solid #cacaca;padding:0 0 10px 0;} .apl_status_content.detail .apl_list>li{margin:30px 0;} .apl_status_content.detail .apl_list .apl_title{position:relative;} diff --git a/src/main/webapp/kofair_case_seed/usr/style/style.css b/src/main/webapp/kofair_case_seed/usr/style/style.css index 8c9e286a..6bc1371b 100644 --- a/src/main/webapp/kofair_case_seed/usr/style/style.css +++ b/src/main/webapp/kofair_case_seed/usr/style/style.css @@ -45,7 +45,7 @@ .search_wrap{display:flex;margin:40px 0 30px 0;padding:30px;border-radius:5px;background:#f4f5f7;align-items:center;justify-content:center;flex-wrap:wrap;gap:10px;} .search_wrap li{display:flex;font-size:1.6rem;align-items:center;gap:10px;} .search_wrap .calendar{width:130px;} -.search_wrap .calendar .duet-date__input{font-size:1.5rem;;} +.search_wrap .calendar .duet-date__input{font-size:1.5rem;} .search_wrap .btn_search{width:80px;} .page{display:flex;margin:40px 0 0 0;justify-content:center;align-items:center;} @@ -166,7 +166,7 @@ .file_upload_wrap li a .file_size{font-size:1.4rem;font-weight:300;color:#666;margin:0 0 0 35px;} /* info_ul */ -.info_ul{display:flex;flex-direction:column;gap:25px;} +.info_ul{display:flex;line-height:1.4;flex-direction:column;gap:25px;} .info_ul .btn_wrap{margin:20px 0 0 0;} .info_ul .title+.btn_wrap{padding:0 0 0 19px;}