From ad7e60c5d5a090160c6b9be63c02a75a6c369b91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 14:10:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/views/user/userAdd.html |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/user/userAdd.html b/src/main/webapp/views/user/userAdd.html
index 38b8cb0..b36c13d 100644
--- a/src/main/webapp/views/user/userAdd.html
+++ b/src/main/webapp/views/user/userAdd.html
@@ -1,7 +1,7 @@
    <div class="content-box">
        <div class="row">
            <div class="join-box">
-               <a href="http://owlsolution.co.kr" target="_self"><img alt="" src="/assets/images/logo-owl-dark.png" class="join-logo"></a>
+               <a href="http://owlsolution.co.kr" target="_self"><img alt="" src="/assets/images/logo-kisa-ko.png" class="join-logo"></a>
                <span class="login-btn"><span translate="users.usedAccount">�씠誘� 怨꾩젙�씠 �엳�쑝�떊媛��슂?</span>
                     <a class="link" ui-sref="login">Log in</a>
                </span>
@@ -62,13 +62,14 @@
                                           kr-input
                                           autocomplete="off"
                                           ng-model="vm.form.password"
-                                          minlength="4"
+                                          ng-pattern="/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
+                                          minlength="8"
                                           maxLength="20"
                                           required>
-                                   <div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
-                                        translate="users.least4CharactersPassword">鍮꾨�踰덊샇�뒗 理쒖냼 4�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.
+                                   <div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
+                                        translate="users.least8CharactersPassword">鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 理쒖냼 8�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.
                                    </div>
-                                   <small class="fc-grey" translate="users.enter4CharactersPassword">鍮꾨�踰덊샇�뒗 4�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.</small>
+                                   <small class="fc-grey" translate="users.enter8CharactersPassword">鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 8�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.</small>
                                </div>
                            </div>
                            <div class="col-sm-6">
@@ -133,14 +134,18 @@
                                    <label for="userAddForm6"><span translate="users.phoneNumber">�뿰�씫泥�</span> </label>
                                    <input id="userAddForm6"
                                           type="text"
-                                          maxLength="20"
+                                          name="phone"
+                                          maxlength="11"
+                                          minlength="10"
                                           class="form-control"
                                           input-regex="[^0-9]"
                                           kr-input
                                           autocomplete="off"
                                           ng-model="vm.form.phone">
-                                   <small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
-                                   </small>
+                                   <small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span></small>
+                                   <div ng-show="userAddForm.phone.$error.minlength" class="help-block form-text text-danger"
+                                        translate="common.least10CharactersPhone">�빖�뱶�룿 踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(10�옄由� �씠�긽)
+                                   </div>
                                </div>
                            </div>
                        </div>

--
Gitblit v1.8.0