瀏覽代碼

개발배포용 3

huiwon.seo 4 年之前
父節點
當前提交
4719e39070

+ 31 - 34
src/main/webapp/WEB-INF/jsp/accept/info.jsp

@@ -17,42 +17,36 @@ $( function(){
     
     $( "#acceptForm" ).validate({
         submitHandler: function(form) {
-            if( $( ".accept-checkbox[accessKey='required']" ).not(':checked').length > 0 ){
-                alertBox({ txt : "서비스를 이용하시려면 필수 약관에 모두 동의해주세요" });
+            if( $( ".accept-checkbox[accessKey='required']" ).not(':checked').length > 0 || $( ".accept-radio[accessKey='required']" ).not(':checked').length > 0  ){
+                confirmCheck();
             } else {
                 form.submit();
             }
         }
     });
-})
+});
+
+function confirmCheck(){
+    alertBox({ type:"confirm", 
+        txt : "모든 항목에 동의하지 않으시는 경우  서비스 이용이 불가합니다.<br/> 로그인 페이지로 이동하시겠습니까?", 
+        callBack: function( result ){
+            if( result ) {
+                location.href='/login/logout';
+            }
+        }
+});
+}
 </script>
 <style>
 <!--
  /* Font Definitions */
- @font-face    {font-family:"Cambria Math";    panose-1:2 4 5 3 5 4 6 3 2 4;}
- @font-face    {font-family:"Arial Unicode MS";    panose-1:2 11 6 4 2 2 2 2 2 4;}
-@font-face    {font-family:"Malgun Gothic";    panose-1:2 11 5 3 2 0 0 2 0 4;}
-@font-face    {font-family:함초롬바탕;    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:함초롬돋움;    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:휴먼명조;    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:HYGothic-Medium;    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:"\@Malgun Gothic";}
-@font-face    {font-family:"\@Arial Unicode MS";    panose-1:2 11 6 4 2 2 2 2 2 4;}
-@font-face    {font-family:"\@휴먼명조";    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:"\@HYGothic-Medium";    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:"\@함초롬바탕";    panose-1:0 0 0 0 0 0 0 0 0 0;}
-@font-face    {font-family:"\@함초롬돋움";    panose-1:0 0 0 0 0 0 0 0 0 0;}
  /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal{margin:0in;text-autospace:none;word-break:break-all;font-size:11.0pt;font-family:"Malgun Gothic",sans-serif;}
-p.a, li.a, div.a{mso-style-name:바탕글; margin:0in;text-align:justify;text-justify:inter-ideograph;line-height:103%;text-autospace:none;  word-break:break-all;font-size:10.0pt;font-family:"함초롬바탕",serif;color:black;}
-.MsoChpDefault    {font-family:"Malgun Gothic",sans-serif;}
+p.a, li.a, div.a{margin:0in;text-align:justify;text-justify:inter-ideograph;line-height:30px;text-autospace:none;word-break:break-all;font-size:10.0pt;serif;color:black;}
  /* Page Definitions */
- @page WordSection1    {size:595.25pt 841.85pt;    margin:99.2pt 85.0pt 85.0pt 85.0pt;}
-div.WordSection1    {page:WordSection1;}
- /* List Definitions */
- ol    {margin-bottom:0in;}
-ul    {margin-bottom:0in;}
+div.WordSection1    {page:WordSection1;font-family: Noto Sans KR, Nunito Sans,-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica Neue,Arial,sans-serif !important;}
 -->
+
+tbody tr td p{background:none !important;}
 </style>
 </head>
 <body>
@@ -63,7 +57,7 @@ ul    {margin-bottom:0in;}
                     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-box align-middle"><path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"></path><polyline points="3.27 6.96 12 12.01 20.73 6.96"></polyline><line x1="12" y1="22.08" x2="12" y2="12"></line></svg>
                     <span class="align-middle text-dark">생활치료센터 의료진 시스템</span>
                 </a>
-                <h1 class="mt-2">생활치료센터 의료진 시스템 이용약관</h1>
+                <h1 class="mt-2">이용약관 및 개인정보처리방침</h1>
             </div>
             
             <hr class="my-4">
@@ -76,27 +70,30 @@ ul    {margin-bottom:0in;}
                                 <form action="/accept/insert" method="post" id="acceptForm">
                                     <div class="card-body">
                                         <c:forEach var="al" items="${acceptList}" varStatus="lStatus">
-                                            <div class="row mb-3 mt-3">
-                                                <div class="col-12">
-                                                    <h4 class="">${lStatus.index + 1}. <c:out value="${al.title}"/>
-                                                        <c:if test="${al.necessaryYn eq 'Y'}">(필수)</c:if>
-                                                        <c:if test="${al.necessaryYn ne 'Y'}">(선택)</c:if>
-                                                    </h4>
+                                            <c:if test="${lStatus.index > 0}">
+                                                <div class="row">
+                                                    <div class="col-8" style="padding-left:30%">
+                                                        <h4 class="text-center h1"><c:out value="${al.title}"/>
+<%--                                                             <c:if test="${al.necessaryYn eq 'Y'}">(필수)</c:if> --%>
+<%--                                                             <c:if test="${al.necessaryYn ne 'Y'}">(선택)</c:if> --%>
+                                                        </h4>
+                                                    </div>
                                                 </div>
-                                            </div>
                                             
-                                            <div style="width:100%;height:400px;overflow-y:auto;padding:20px;background:#e9ecef;border:1px solid #ced4da;">
+                                            <div style="width:100%;height:500px;overflow-y:auto;padding:20px;background:#e9ecef;border:1px solid #ced4da;margin-bottom:50px;">
                                                 <c:out value="${al.content}" escapeXml="false"/>
                                             </div>
                                             
+                                            </c:if>
                                         </c:forEach>
                                         
+                                        
                                         <hr class="my-4">
                                         
                                         <div class="row mt-3">
                                             <div class="col-12">
                                                 <div class="text-center">
-                                                    <button type="button" class="btn btn-info btn-lg" onclick="history.back();">뒤로가기</button>
+                                                    <button type="button" class="btn btn-info btn-lg pl-5 pr-5" onclick="history.back();">뒤로가기</button>
                                                 </div>
                                             </div>
                                         </div>

+ 1 - 1
src/main/webapp/WEB-INF/jsp/accept/list.jsp

@@ -66,7 +66,7 @@ tbody tr td p{background:none !important;}
                 <div class="container-fluid p-0">
                     <div class="row pl-5 pr-5">
                         <div class="col-12 col-lg-12">
-                            <h1 class="h3 mb-3 text-danger">※ 아래의 이용약관과 개인정보처리방침에 동의하지 않으시는 경우에는 서비스 이용이 불가합니다.</h1>
+                            <h1 class="h3 mb-3 text-danger">서비스 이용을 원하시면 이용약관, 개인정보처리방침에 대한 내용을 확인하신 후 동의해 주시기 바랍니다.</h1>
                         </div>
 <!--                         <div class="col-4 col-lg-4 text-right mt-4"> -->
 <!--                             <h4 class="text-info"> -->

+ 1 - 1
src/main/webapp/WEB-INF/jsp/api/info.jsp

@@ -1238,7 +1238,7 @@ public static String aesEncrypt(String encKey, byte[] iv, String paramInput) thr
                                                 
                                                 <blockquote class="blockquote">
                                                     <p class="mb-1">4. 문의</p>
-                                                    <footer class="blockquote-footer">API 이용 관련 기술, 정책 문의는 </footer>
+                                                    <footer class="blockquote-footer">API 이용 관련 기술, 정책 문의는 한국보건의료정보원 02-6263-8377로 문의해 주세요.</footer>
                                                 </blockquote>
                                             </div>
                                         </div>

+ 3 - 2
src/main/webapp/WEB-INF/jsp/include/sidebar.jsp

@@ -45,7 +45,7 @@
             <span class="align-middle">생활치료센터 의료진 시스템</span>
         </a>
 
-        <ul class="sidebar-nav">
+        <ul class="sidebar-nav" style="padding-bottom: 200px;overflow-y: auto;">
             <li class="sidebar-header">
                 <c:if test="${data._SES_CENTER_NAME ne ''}"><c:out value="${data._SES_CENTER_NAME}" /></c:if>
                 <c:if test="${data._SES_CENTER_NAME eq ''}">관리자</c:if>
@@ -63,9 +63,10 @@
         
         
         <div class="sidebar-bottom d-none d-lg-block">
-            <div class="d-none d-lg-block" style="position:absolute;margin-bottom:20px;bottom:71px;left:0;width:inherit;min-width:256px;max-width:256px;text-align:center;color:#FFF;font-size:18px;">
+            <div class="d-none d-lg-block" style="background:#354052;position:absolute;padding:10px 0 20px 0;bottom:71px;left:0;width:inherit;min-width:256px;max-width:256px;text-align:center;color:#FFF;font-size:18px;">
                 <div style="text-align:center;">생활치료센터 콜센터</div>
                 <div style="text-align:center;">☎ 1661-8308</div>
+                <div style="text-align:center;"><a href="/accept/info" class="text-white" style="">개인정보처리방침</a></div>
             </div>
             
             <div class="media">

+ 14 - 6
src/main/webapp/WEB-INF/jsp/mobile/accept/info.jsp

@@ -45,6 +45,12 @@ ul    {margin-bottom:0in;}
 div.WordSection1 *{font-size:13px !important;}
 div.WordSection1 table td {width:auto !important;}
 -->
+
+p.a a{padding:0 !important;margin:0 !important;
+    border: 0 !important;
+    box-shadow:0 0 0 0 !important;
+    display: inline-block !important;
+    position: inherit !important;margin-bottom:0 !important;}
 </style>
 <body>
     <div id="sub">
@@ -53,29 +59,31 @@ div.WordSection1 table td {width:auto !important;}
                 <div class="previous">
 <!--                     <a href="./menu">이전</a> -->
                 </div>
-                <div class="title">이용약관</div>
+                <div class="title">개인정보처리방침</div>
             </div>
 <!--             <div class="alert">환자용 앱 서비스 이용을 위한 약관에 동의해주세요</div> -->
             <div class="accept-wrap">
                 <ul class="list">
                     <c:forEach var="al" items="${acceptList}" varStatus="lStatus">
+                        <c:if test="${lStatus.index > 0}">
                         <li>
                             <a href="javascript:;" class="">
                                 <input type="checkbox" name="acceptIdx" value="${al.acceptIdx}" id="accept${lStatus.index}" checked="checked" readonly disabled/>
                                 <label for="accept${lStatus.index}"><span></span>
                                     <c:out value="${al.title}"/>
-                                    <c:if test="${al.necessaryYn eq 'Y'}">(필수)</c:if>
-                                    <c:if test="${al.necessaryYn ne 'Y'}">(선택)</c:if>
+<%--                                     <c:if test="${al.necessaryYn eq 'Y'}">(필수)</c:if> --%>
+<%--                                     <c:if test="${al.necessaryYn ne 'Y'}">(선택)</c:if> --%>
                                 </label>
-                                <span class="detail">보기</span>
+                                <span class="detail">보기(View)</span>
                             </a>
-                            <div class="content-wrap" style="display:none;">
+                            <div class="content-wrap">
                                 <div class="relative">
-                                    <div class="title"><c:out value="${al.title}"/> <span class="close" onclick="$(this).closest('.content-wrap').hide();"></span></div>
+                                    <div class="title"><c:out value="${al.title}"/> <span class="close" onclick="history.back();"></span></div>
                                     <div class="content"><c:out value="${al.content}" escapeXml="false"/></div>
                                 </div>
                             </div>
                         </li>
+                        </c:if>
                     </c:forEach>
                 </ul>
             </div>

+ 7 - 3
src/main/webapp/WEB-INF/jsp/mobile/accept/list.jsp

@@ -59,6 +59,11 @@ ul    {margin-bottom:0in;}
 div.WordSection1 *{font-size:13px !important;}
 div.WordSection1 table td {width:auto !important;}
 -->
+p.a a{padding:0 !important;margin:0 !important;
+    border: 0 !important;
+    box-shadow:0 0 0 0 !important;
+    display: inline-block !important;
+    position: inherit !important;margin-bottom:0 !important;}
 </style>
 <body>
 <form action="/mobile/accept/insert" method="post" id="acceptForm">
@@ -68,11 +73,10 @@ div.WordSection1 table td {width:auto !important;}
                 <div class="previous">
 <!--                     <a href="./menu">이전</a> -->
                 </div>
-                <div class="title">이용약관 및 개인정보처리방침 동의 <br/><span style="font-size:14px;">(Terms of service and Privacy Policy Agree)</span>
+                <div class="title">이용약관 및 개인정보처리방침<br/><span style="font-size:14px;">(Terms of service and Privacy Policy)</span>
 </div>
             </div>
-            <div class="alert">※ 아래의 이용약관과 개인정보처리방침에 동의하지 않으시는 경우에는 서비스 이용이 불가합니다.<br/>(If you do not agree to the terms of service and privacy policy below, you will not be able to use the service.)
-</div>
+            <div class="alert">※ 서비스 이용을 원하시면 이용약관, 개인정보처리방침에 대한 내용을 확인하신 후 동의해 주시기 바랍니다.<br/>(If you wish to use the service, please confirm and agree to the terms of service and privacy policy.)</div>
             <div class="accept-wrap">
                 <ul class="list">
                     <c:forEach var="al" items="${acceptList}" varStatus="lStatus">

+ 2 - 2
src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -73,8 +73,8 @@ function searchingDevice() {
                             </li -->
                         </ul>
                     </div>
-                    <div class="version">
-<!--                         <span onclick="location.href='/mobile/accept/info'">이용약관</span> |  -->
+                    <div class="version" style="width:100%;text-align:right;">
+                        <span style="position:absolute;bottom:30px;right:0;"onclick="location.href='/mobile/accept/info'">개인정보처리방침</span> | 
                         <span>버전정보 v<c:out value="${deviceVersion}"/></span>
                     </div>
                 </div>