From 35e5cf9b9bfc3041407f88744651608062f06b5f Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 9 Aug 2024 14:23:56 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20Font=20=EB=B3=80=EA=B2=BD=20=ED=8A=B9?= =?UTF-8?q?=EC=A0=95=20=EA=B8=80=EC=9E=90=EA=B0=80=20=EC=95=88=20=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EA=B0=80=20=EC=9E=88?= =?UTF-8?q?=EC=96=B4=EC=84=9C=20font=EB=A5=BC=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geoinfo/main/main/MainController.java | 21 +- .../WEB-INF/views/body/join/provision.jsp | 51 +- .../WEB-INF/views/home/personalinfo.jsp | 1161 ++++++++++++----- .../views/home/personalinfo_20230101.jsp | 434 ++++++ src/main/webapp/com/css/apply.bat | 2 +- src/main/webapp/com/css/common.v2.0.css | 10 +- src/main/webapp/com/css/sass/common.v2.0.scss | 10 +- src/main/webapp/com/css/style.css | 32 +- .../personalinfo/01_personal_information.jpg | Bin 0 -> 16743 bytes .../02_personal_information_items.jpg | Bin 0 -> 17088 bytes ...ose_of_personal_information_processing.jpg | Bin 0 -> 17278 bytes ..._personal_information_to_third_parties.jpg | Bin 0 -> 18930 bytes ...ent_of_personal_information_processing.jpg | Bin 0 -> 18578 bytes ..._personal_information_retention_period.jpg | Bin 0 -> 18302 bytes ...07_destruction_of_personal_information.jpg | Bin 0 -> 15461 bytes .../08_rights_of_the_data_subject.jpg | Bin 0 -> 14880 bytes .../personalinfo/09_security_measures.jpg | Bin 0 -> 15438 bytes .../10_changes_to_the_privacy_policy.jpg | Bin 0 -> 12567 bytes ...ersonal_information_protection_manager.jpg | Bin 0 -> 17299 bytes .../12_department_handling_complaints.jpg | Bin 0 -> 14445 bytes ...request_access_to_personal_information.jpg | Bin 0 -> 11110 bytes ..._for_preventing_infringement_of_rights.jpg | Bin 0 -> 15736 bytes 22 files changed, 1322 insertions(+), 399 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/home/personalinfo_20230101.jsp create mode 100644 src/main/webapp/com/img/main/personalinfo/01_personal_information.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/02_personal_information_items.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/03_purpose_of_personal_information_processing.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/04_provision_of_personal_information_to_third_parties.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/05_consignment_of_personal_information_processing.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/06_personal_information_retention_period.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/07_destruction_of_personal_information.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/08_rights_of_the_data_subject.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/09_security_measures.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/10_changes_to_the_privacy_policy.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/11_appointment_and_status_of_personal_information_protection_manager.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/12_department_handling_complaints.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/13_how_to_request_access_to_personal_information.jpg create mode 100644 src/main/webapp/com/img/main/personalinfo/14_guidance_on_agencies_for_preventing_infringement_of_rights.jpg diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index c662ec7c..560d436b 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -165,8 +165,15 @@ public class MainController if (request.getSession().getAttribute("USERID") == null) { // login 아래 btn 설정 html - mv.addObject("isLogin", false); - mv.addObject("msg", "로그인이 필요한 시버스입니다."); + mv.addObject("isLogin", false); + int joinsearchIndex = url.indexOf("joinsearch"); + int joinIndex = url.indexOf("join"); + int pwsearchIndex = url.indexOf("pwsearch"); + + if( joinsearchIndex == -1 && joinIndex == -1 && pwsearchIndex == -1) { + mv.addObject("msg", "로그인이 필요한 시버스입니다."); + } + }else { mv.addObject("isLogin", true); @@ -1243,6 +1250,16 @@ public class MainController return mv; } + // 개인정보처리방침 이전 방침(20230101) + @RequestMapping(value = "personalinfo_20230101.do") + public ModelAndView personalinfo_20230101(Map map, HttpServletRequest request, HttpServletResponse response) throws Exception + { + ModelAndView mv = new ModelAndView("home/personalinfo_20230101"); + + return mv; + } + + // 개인정보처리방침 이전 방침(20190606) @RequestMapping(value = "personalinfo_20190606.do") public ModelAndView personalinfo_2018(Map map, HttpServletRequest request, HttpServletResponse response) throws Exception diff --git a/src/main/webapp/WEB-INF/views/body/join/provision.jsp b/src/main/webapp/WEB-INF/views/body/join/provision.jsp index 5730fab8..b2415a55 100644 --- a/src/main/webapp/WEB-INF/views/body/join/provision.jsp +++ b/src/main/webapp/WEB-INF/views/body/join/provision.jsp @@ -340,18 +340,21 @@ - 내용에 동의하시겠습니까? +
+ 내용에 동의하시겠습니까? -
- - +
+ + +
+
@@ -445,20 +448,22 @@
- 필수항목 수집에 동의하시겠습니까? - -
- - +
+ 필수항목 수집에 동의하시겠습니까? + +
+ + +
- 선택항목 수집에 동의하시겠습니까?(선택) + 선택항목 수집에 동의하시겠습니까?