diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index cb2e332e..226aa435 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -628,7 +628,7 @@
-
+

주소록 상세 결과

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp index 3016456a..7561e7df 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp @@ -749,7 +749,7 @@ $(document).on('click', '#errorExcelBtn', function() {
-
+

주소록 상세 결과

diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index 96dbc182..4658f36f 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -601,6 +601,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .send_general.sec .tType1 tbody tr:first-child {border-top: 0;} .send_top .excelWrap {padding: 20px 0;} .excel_middle {background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 20px 0;} +.excel_middle .select_btnWrap div{gap:6px;} .send_top .excelWrap .excel_selBox {margin-bottom: 10px; display: flex; justify-content: space-between;} .send_top .excelWrap .excel_selBox select.selType1 {padding: 0 80px 0 10px;} .send_top .excelWrap .excel_selBox span {color: #e40000; font-size: 14px; padding-left: 5px;} @@ -1576,8 +1577,9 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);} .kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);} .kakaotalkset_cont .list_info .btnType8{width: 140px;} -.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;} -.kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} +.kakaotalkset_cont .kakao_template_list{display:flex;margin: 20px 0 0 0;flex-wrap:wrap;gap:13px;} +/* .kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} */ +.kakaotalkset_cont .kakao_template_list li{position: relative; width:calc((100%/4) - 26px); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;} .kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;} .kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;} .kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;} @@ -1733,6 +1735,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn{height: 40px; border: 5px solid #129738; color: #129738; font-size: 16px; font-weight: 500; padding: 0 15px; border-radius: 5px;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn i{width: 17px; height: 15px; background-image: url(/publish/images/content/excel_img.png); margin: 0 5px 5px 0;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap01{display: none !important;} +.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .btnType{margin:0 0 0 6px;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .listType{width: 100%;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .receipt_num .list_table_num{width: calc(100% - 60px);} .kakaotalksend_cont .kakao_wrap .put_right .qmMark{width: 19px; height: 19px; background-image: url(/publish/images/content/qmIcon_s.png); margin: -0.3px 0 2px 4px;} @@ -1740,7 +1743,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .kakaotalksend_cont .kakao_wrap .kakao_template_text {display: flex;justify-content: space-between;} .kakaotalksend_cont .kakao_wrap .put_right .btn_popup_wrap{margin: 0 0 5px 0;} .kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left{height: 234px;} -.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 58px);} +.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 80px);} .kakaotalksend_cont .kakao_wrap .button_type_wrap{display: flex; border: 1px solid #e5e5e5; border-radius: 5px; padding: 10px 20px; margin: 10px 0 0 0;} .kakaotalksend_cont .kakao_wrap .button_type_wrap dt{width: 110px; font-weight: 400; padding: 8px 0 0 0;} .kakaotalksend_cont .kakao_wrap .button_type_wrap .button_type_input{width: 483px;} diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css index 5c3626ef..3beed5ec 100644 --- a/src/main/webapp/publish/css/popupLayer.css +++ b/src/main/webapp/publish/css/popupLayer.css @@ -296,7 +296,7 @@ .histroy_trans ul {background-color: #f5f5f5; padding: 0 20px; border: 1px solid #dadada; border-radius: 0 0 5px 5px; margin-top: -3px;} .histroy_trans ul li {position: relative; height: 30px; line-height: 30px; border-bottom: 1px solid #e8e8e8;} .histroy_trans ul li:only-child {border-bottom: 0;} -.histroy_trans ul li p {display: inline-block; color: #666; font-size: 14px; font-weight: 300; padding-left: 15px; letter-spacing: 0.5px;} +.histroy_trans ul li p {display: inline-block; width: 100%; color: #666; font-size: 14px; font-weight: 300; letter-spacing: 0.5px; text-align:center;} .histroy_trans ul li button {position: absolute; right: 0; top: 50%; transform: translateY(-50%);} .popup_btn_wrap2.hisroy_btn {width: 178px;} .popup_btn_wrap2.hisroy_btn button {width: calc(100%/2 - 2.5px); height: 32px; font-size: 14px;} @@ -1035,7 +1035,7 @@ /* 발신프로필 등록 */ .add_profile_popup01 .layer_tType1 .cf_text{display: block; font-size: 16px; font-weight: 300; color: #666; padding: 10px 0 0 0;} .add_profile_popup01 .layer_tType1 td{padding: 10px 0 10px 10px;} -.add_profile_popup01 .layer_tType1 select{width: 207px;} +.add_profile_popup01 .layer_tType1 select{min-width: 200px;width:auto;} .add_profile_popup01 .table_top{padding: 0 0 10px 0;} .add_profile_popup01 .table_top p{font-size: 16px; color: #555;} .add_profile_popup01 .kakaotalk_tag{position: absolute; left: 27px; top: 20px;} diff --git a/src/main/webapp/publish/js/popupLayer.js b/src/main/webapp/publish/js/popupLayer.js index c2e17c73..71facede 100644 --- a/src/main/webapp/publish/js/popupLayer.js +++ b/src/main/webapp/publish/js/popupLayer.js @@ -116,6 +116,19 @@ function tooltip() { $("body").find(".mask").addClass("on"); $("body").css("overflow","hidden"); wrapWindowByMask(popName); + + if($(e.target).closest(".popup-com").is(".popup-com") == true){ + $(".mask").attr("style","z-index:101;"); + $("."+popName).closest(".tooltip-wrap").attr("style","z-index:105;"); + } + + // 엑셀 불러오기 > 주소록 상세결과 팝업 마스크 오류 예외처리 + if($("[data-tooltip-con="+popName+"]").is(".adr_detail_result")){ + $(".mask").removeClass("on"); + $(".adr_detail_result").before('
'); + $("body").css("overflow","hidden"); + $(".adr_detail_result").closest(".tooltip-wrap").attr("style","z-index:120;"); + } /* 주소록 대량등록, 주소롟 불러오기 팝업에 있는 테이블 스크롤바 꾸미기 */ $(".adr_pop_list2 .adr_bd_wrap").mCustomScrollbar({ @@ -148,17 +161,32 @@ function tooltip() { /* 상세보기 버튼 클릭 시 레이어팝업*/ // 팝업이 보이고 있으면 마스크 노출/미노출 // 레이어 팝업 2개 뜰 경우 - if($(".popup-com:visible").length <= 1){ + if($(".popup-com:visible").length < 1){ $(".mask").removeClass("on"); - }else{} + }else{ + $(".mask").attr("style","z-index:99;"); + $(".mask").addClass("on"); + $("body").css("overflow","hidden"); + } if($(this).closest(".adr_layer").is(".adr_popup14") == true){ $(".mask").addClass("on"); + $("body").css("overflow","hidden"); }else{} + // 결과상세에서 레이어팝업 2개 뜰 경우 - if($(this).closest(".adr_layer").is(".rev_popup02") == true){ + if($(this).closest(".adr_layer").is(".rev_popup02") == true && $(this).closest(".adr_layer").is(".add_adr_popup") == false){ $(".mask").addClass("on"); - }else{} + $("body").css("overflow","hidden"); + } + else{} + + // 엑셀 불러오기 > 주소록 상세결과 팝업 마스크 오류 예외처리 + if($(this).closest(".adr_layer").is(".adr_detail_result")){ + $(".mask").removeClass("off"); + $(".adr_detail_result").siblings(".mask").remove(); + } + }) } diff --git a/src/main/webapp/publish/textingmsg_2025_detail.html b/src/main/webapp/publish/textingmsg_2025_detail.html index 9bca4843..21470587 100644 --- a/src/main/webapp/publish/textingmsg_2025_detail.html +++ b/src/main/webapp/publish/textingmsg_2025_detail.html @@ -244,7 +244,7 @@
-
+

발송대상 리스트

@@ -335,7 +335,7 @@
- +
@@ -542,7 +542,7 @@
-
+

주소록에 등록