Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into sudden

src/main/resources/messages/message_ar.properties

@@ -45,9 +45,9 @@ login.location.list.자가치료자 = معالج ذاتي
 
 # 메인페이지 /mobile/menu
 name.sir = سيدي المحترم
-menu.top.title = خدمة العلاج Untact (عن بعد) في مركز علاج الحياة اليومية
+menu.top.title = خدمة العلاج Untact (عن بعد) في مركز علاج الحياة اليومية <div style="margin-bottom:20px;"></div>
 menu.center.title = مركز علاج الحياة اليومية
-menu.top.info = سجل المعلومات الصحية اليومي
+menu.top.info = <div style="width:85%;padding-right:10px;font-size:22px;">سجل المعلومات الصحية اليومي</div>
 menu.top.emCall = رقم هاتف الطوارئ
 menu.left.logout = تسجيل خروج
 menu.left.healthRecord = سجل المعلومات الصحية

src/main/resources/messages/message_en.properties

@@ -44,7 +44,7 @@ login.location.list.자가치료자 = self therapist
 # # 메인페이지 /mobile/menu
 name.sir = Sir
 menu.top.title = Residential treatment center Untact treatment system
-menu.top.info = Please record today′s health record
+menu.top.info = <div style="width:85%;padding-right:10px;font-size:22px;word-break: break-word;">Please record today′s health record</div>
 menu.top.emCall = emergency call
 menu.left.logout = logout
 menu.left.healthRecord = Health Record

src/main/resources/messages/message_ko.properties

@@ -294,14 +294,14 @@ nonface.btn.end = 종료하기
 
 
 # # 이용약관
-title.accept.terms = 이용약관 (Terms of service)
-title.accept.privacy = 개인정보처리방침 (Privacy Policy)
+title.accept.terms = 이용약관
+title.accept.privacy = 개인정보처리방침
 title.accept.privacy.prev = 이전 개인정보 처리방침
 title.accept.privacy.prev.date = (2020. 12. 1 ~ 2021. 5. 23)
-title.accept = 이용약관 및 개인정보처리방침<br/>(Terms of service and Privacy Policy)
-accept.msg.notice = ※ 서비스 이용을 원하시면 이용약관, 개인정보처리방침에 대한 내용을 확인하신 후 동의해 주시기 바랍니다.<br/>(If you wish to use the service, please confirm and agree to the terms of service and privacy policy.)
+title.accept = 이용약관 및 개인정보처리방침
+accept.msg.notice = ※ 서비스 이용을 원하시면 이용약관, 개인정보처리방침에 대한 내용을 확인하신 후 동의해 주시기 바랍니다.
 accept.necessary.y = (필수)
 accept.btn.view = 보기
 accept.btn.agree = 약관을 충분히 이해했으며 동의 합니다
-accept.btn.agree.all = 모두 동의하였으며 계속 진행합니다<br/>(All agree and continue.)
+accept.btn.agree.all = 모두 동의하였으며 계속 진행합니다
 accept.insert.error = 비정상적인 접근입니다 필수입력값을 확인하세요

src/main/webapp/WEB-INF/jsp/mobile/health/health1.jsp

@@ -70,6 +70,11 @@ $( function(){
 //     } else {
 //         alert("App에서만 사용가능한 기능입니다.");
 //     }
+
+    // $( "input[name='temperature']" ).click( function(){
+    //   document.body.scrollTop = document.body.scrollHeight;
+    // });
+
 });
 
 /*

src/main/webapp/WEB-INF/jsp/mobile/health/health6.jsp

@@ -132,7 +132,7 @@ $( function(){
 
                 <div class="accept-wrap">
                     <p class="diagnosis-desc2"><spring:message code="health.mental.agree.text1" /></p>
-
+                    <br/>
                     <div class="diagnosis-agree">
                         <p><spring:message code="health.mental.agree.text2" /></p>
                         <div>

src/main/webapp/WEB-INF/jsp/mobile/include/header.jsp

@@ -14,7 +14,7 @@
 <!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" > -->
 <!-- <link rel="stylesheet" type="text/css" href="/resources/css/mobile/bootstrap-datepicker.css" /> -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<link rel="stylesheet" type="text/css" href="/resources/css/mobile/style.css?ver=1.4" />
+<link rel="stylesheet" type="text/css" href="/resources/css/mobile/style.css?ver=1.5" />
 <link rel="stylesheet" type="text/css" href="/resources/css/mobile/jquery.modal.css" />
 
 
@@ -22,7 +22,7 @@
 <script type="text/javascript" src="/resources/js/mobile/app.js"></script>
 <!-- <script type="text/javascript" src="/resources/js/mobile/bootstrap-datepicker.min.js"></script> -->
 <!-- <script type="text/javascript" src="/resources/js/mobile/bootstrap-datepicker.ko.min.js"></script> -->
-<script type="text/javascript" src="/resources/js/mobile/common.js?ver=1.3"></script>
+<script type="text/javascript" src="/resources/js/mobile/common.js?ver=1.4"></script>
 <script type="text/javascript" src="/resources/js/mobile/jquery.modal.min.js"></script>
 <script>
   var setLocale='<c:out value="${data._LOCALE_CODE}"/>' == 'ko_KR' ? 'ko' : '<c:out value="${data._LOCALE_CODE}"/>';

src/main/webapp/resources/css/mobile/style.css

@@ -159,7 +159,7 @@ caption {text-align:left;}
 #main .nav .name span { font-size: 24px; font-weight: 900; }
 #main .nav .name a.logout {position: absolute;top:50%;right: 0px; background-color: #40A3DF; color:#FFFFFF;line-height:30px;height:30px;padding:0px 10px;border-radius:5px;margin-top:-15px; }
 #main .nav .category li { border-bottom: 1px solid #DDDDDD; }
-#main .nav .category li a { display: block; font-size: 16px; font-weight: 500; line-height: 60px; height: 56px; }
+#main .nav .category li a { display: block; font-size: 16px; font-weight: 500; padding:15px 0px; }
 #main .nav .version { position: absolute; font-size: 13px; color:#333333; right: 20px; bottom: 20px; }
 #main .header { position: absolute; left: 0px; right: 0px; top: 0px; height: 60px; padding:20px 0px; z-index: 10; }
 #main .header:after { display: block; content: ''; clear: both; }
@@ -349,7 +349,7 @@ input[type="radio"]:checked + label span {  background-image:url('../../images/m
 .device_tab { background-color: #FAFAFA; padding: 10px 0px; border-bottom: 1px solid #DDDDDD; }
 .device_tab ul:after { display: block; content: ''; clear: both; }
 .device_tab li { float: left; width: 20%; }
-.device_tab li a { display: block; font-size: 12px; color:#666666; letter-spacing: -0.5px; text-align: center; padding-top: 40px; background-repeat: no-repeat; background-position: top center; background-size: 34px; }
+.device_tab li a { display: block; font-size: 12px; color:#666666; letter-spacing: -0.5px; text-align: center; padding-top: 40px; background-repeat: no-repeat; background-position: top center; background-size: 34px;    word-break: break-word; }
 .device_tab li a.active { font-weight: 700; color:#333333; } 
 .device_tab li a.one { background-image: url('../../images/mobile/device_connect_unlink_1.png'); }
 .device_tab li a.two { background-image: url('../../images/mobile/device_connect_unlink_2.png'); }
@@ -555,7 +555,7 @@ button.not-accept{background-color:#CCCCCC !important;}
 /* 정신건강 */
 /*line 295 ~ 310 수정 및 추가 */
 .device_tab ul {display: flex; overflow-x: auto; overflow-y: hidden;}
-.device_tab ul li {flex: none; width: 16.66666666666667%;} /* 수정 */
+.device_tab ul li {flex: none; width: 19%;} /* 수정 */
 .device_tab li a.six {background-image: url(../../images/mobile/device_connect_unlink_6.png);}
 .device_tab li a.six.active {background-image: url(../../images/mobile/device_connect_link_6.png);}
 

src/main/webapp/resources/js/mobile/health.js

@@ -179,7 +179,9 @@ function addZeros(num, digit) { // 자릿수 맞춰주기
 }
 function scrollDown() {
     var scrollHeight = $( document ).height();
-    $( 'body,html').stop().animate({
-        scrollTop: scrollHeight
-    }, 300);
+    setTimeout( function(){ 
+      $( 'body,html').stop().animate({
+          scrollTop: scrollHeight
+      }, 200 );
+    }, 300 );
 }