From 557231c5fbf91af4045284b92e3d6a8a80b34d21 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 26 Jan 2024 10:51:46 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EC=84=A0=EC=96=B8=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=82=B4=EC=95=8C=EB=A6=BC,?= =?UTF-8?q?=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20=ED=83=80=EC=9D=B4?= =?UTF-8?q?=ED=8B=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 5 +++-- src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp | 5 +++-- src/main/webapp/visitEdu/usr/publish/script/common.js | 7 ++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index e762cd9a..5200f2e7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -14,13 +14,14 @@ <%-- 웹접근성 각 페이지 타이틀 변경 220125--%> $(document).ready(function (){ - var titleNm = ''; + /* 240126 - common.js에서도 title 선언이 되어 중복 제거를 위한 주석처리 */ + /* var titleNm = ''; if($('body').find('h2').length > 0){ titleNm = document.querySelector('h2').textContent; if(document.title.indexOf(titleNm) < 0){ document.title = titleNm + "<" + document.title; } - } + } */ }); diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index 2d5656c8..422380d5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -136,7 +136,8 @@ function isMobile(){ } <%-- 웹접근성 각 페이지 타이틀 변경 220125--%> $(document).ready(function (){ - var titleNm = ''; +/* 240126 - common.js에서도 title 선언이 되어 중복 제거를 위한 주석처리 */ +/* var titleNm = ''; if($('body').find('h2').length > 0){ titleNm = document.querySelector('h2').textContent; if(document.title.indexOf(titleNm) < 0){ @@ -145,7 +146,7 @@ $(document).ready(function (){ document.title = titelNavi.eq(4).text() +"<"+titelNavi.eq(2).text()+"< 한국저작권위원회 저작권교육 시스템"; } - } + } */ }); diff --git a/src/main/webapp/visitEdu/usr/publish/script/common.js b/src/main/webapp/visitEdu/usr/publish/script/common.js index b953ff00..85a43574 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/common.js +++ b/src/main/webapp/visitEdu/usr/publish/script/common.js @@ -25,11 +25,16 @@ $(document).ready(function () { else if($(".cont_tit h2").text() == "로그인"){ $("head title").text("로그인페이지 < 한국저작권위원회 저작권배움터"); } + else if(dep01_Text == ''){ + $("head title").text(dep02_Text+" < "+" 한국저작권위원회 저작권배움터"); + } else{ $("head title").text(dep02_Text+" < "+dep01_Text+" < "+" 한국저작권위원회 저작권배움터"); } - + if(dep01_Text == '' && dep02_Text == ''){ + $("head title").text($(".cont_tit h2").text() + " < "+" 한국저작권위원회 저작권배움터"); + } if($(".full_menu .depth01_li a:contains('ZOOM 신청 게시판(청소년)')").length == "1"){ $(".full_menu .depth01_li>a").css("width","24%"); From 3b0320042e35a7140ff3f22402fd5f95f6802729 Mon Sep 17 00:00:00 2001 From: subsub Date: Fri, 26 Jan 2024 10:56:54 +0900 Subject: [PATCH 2/7] =?UTF-8?q?2024/01/26=20fullmenu=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20/=20=EC=8B=9C=EA=B0=84=ED=8C=9D=EC=97=85=20=EB=8B=AB?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=ED=8F=AC=EC=BB=A4=EC=8B=B1=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/visitEdu/usr/publish/script/common.js | 1 + src/main/webapp/visitEdu/usr/publish/script/content.js | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/visitEdu/usr/publish/script/common.js b/src/main/webapp/visitEdu/usr/publish/script/common.js index b953ff00..42e4cf51 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/common.js +++ b/src/main/webapp/visitEdu/usr/publish/script/common.js @@ -90,6 +90,7 @@ $(document).ready(function () { // shift+tab 했을 때 } else { $(".full_menu").removeClass("on"); + $(".header .logo a").focus(); } } }); diff --git a/src/main/webapp/visitEdu/usr/publish/script/content.js b/src/main/webapp/visitEdu/usr/publish/script/content.js index 33481a50..257b49bc 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/content.js +++ b/src/main/webapp/visitEdu/usr/publish/script/content.js @@ -523,10 +523,12 @@ function timeInput() { function timeLayerUtil() { if ($(".time_layer").is(":visible") == true) { $(".time_layer").removeClass("on"); - $(".mask2").hide() + $(".mask2").hide(); + var btnItm = event.target; + $(btnItm).closest(".time_layer").prev(".time_set_btn").focus(); } else { $(".time_layer").addClass("on"); - $(".mask2").show() + $(".mask2").show(); } } From 9572284a4e343515bc845b3fd4b670c970adc091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Fri, 26 Jan 2024 11:05:16 +0900 Subject: [PATCH 3/7] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/popup/qustnrPopList.jsp | 5 ++-- .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 27 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp index 6a7e6f86..fbd699a8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp @@ -223,7 +223,8 @@ $(document).ready(function(){ $(".tooltip-close").click(function(){ var activeTarget = $('[data-tooltip-con="sub37_pop20"]'); activeTarget.hide(); - $('[data-tooltip="sub37_pop20"]:first-child').focus(); + //$('[data-tooltip="sub37_pop20"]:first-child').focus(); + $('[data-info="${chasiInfo.eduChasiOrd}"]').focus(); }); }) @@ -236,7 +237,7 @@ $(document).ready(function(){ -
+

강의만족도 결과 등록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index feddfd97..8a264691 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -433,6 +433,19 @@ popupWindow.close() }, 5000) }; + + + $(document).ready(function(){ + // 레이어팝업 포커싱 이동 수정 + $(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="sub37_pop20"]'); + activeTarget.hide(); + //$('[data-tooltip="sub37_pop20"]:first-child').focus(); + $('[data-info="${chasiInfo.eduChasiOrd}"]').focus(); + }); + + }) + @@ -723,7 +736,7 @@
-

강사 정보

+

강사 정보22

@@ -1183,23 +1196,23 @@ - - - - @@ -1213,13 +1226,13 @@ - - From 26850d4809188bd55b5f15c5d62cef73b5a3e3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Fri, 26 Jan 2024 11:07:45 +0900 Subject: [PATCH 4/7] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 8a264691..d653cd6b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -433,19 +433,6 @@ popupWindow.close() }, 5000) }; - - - $(document).ready(function(){ - // 레이어팝업 포커싱 이동 수정 - $(".tooltip-close").click(function(){ - var activeTarget = $('[data-tooltip-con="sub37_pop20"]'); - activeTarget.hide(); - //$('[data-tooltip="sub37_pop20"]:first-child').focus(); - $('[data-info="${chasiInfo.eduChasiOrd}"]').focus(); - }); - - }) - @@ -736,7 +723,7 @@
-

강사 정보22

+

강사 정보

From cbdf3b9f76bc3e1545577b566a8d7a73161f7072 Mon Sep 17 00:00:00 2001 From: subsub Date: Fri, 26 Jan 2024 11:25:08 +0900 Subject: [PATCH 5/7] =?UTF-8?q?2024/01/26=20=ED=8C=9D=EC=97=85=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp index f01e5138..814b7c8f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp @@ -169,7 +169,7 @@ $(document).ready(function(){
-

신청인1정보

+

신청인정보

From c756b8946d56baba5f6382e28f5146cf7782fd12 Mon Sep 17 00:00:00 2001 From: kmg Date: Fri, 26 Jan 2024 11:37:48 +0900 Subject: [PATCH 6/7] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20caption=20=EA=B4=80=EB=A0=A8=20class=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp index 767157d6..09f93bde 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp @@ -981,7 +981,7 @@ ※ 운영지원금 지원을 위한 계획서(계획은 운영에 따라 변경 가능)
※ 담당교사의 재량으로 자율 편성하되, 1일 최대 2차시까지만 운영 가능
-
+
From e356debd5b6ccea4ea89b78904074341af1517bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Fri, 26 Jan 2024 12:08:57 +0900 Subject: [PATCH 7/7] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/popup/qustnrPrintPopList.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp index 56d9f131..87d59dbd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp @@ -264,9 +264,9 @@ $(document).ready(function(){
-
+
-

강의만족도 설문지 출력

+

강의만족도 설문지 출력

@@ -448,7 +448,7 @@ $(document).ready(function(){ - +
@@ -467,7 +467,7 @@ $(document).ready(function(){
- +