Bladeren bron

21.03.17 수정사항 적용

huiwon.seo 4 jaren geleden
bovenliggende
commit
6a7fa27abb

+ 4 - 3
src/main/webapp/WEB-INF/jsp/center/list.jsp

@@ -161,15 +161,16 @@ function getExcel(){
                                                 </td>
                                                 <th>상태</th>
                                                 <td>
-                                                    <div class="row">
-                                                        <div class="col-lg-5 col-sm-5">
+                                                    <div class="form-row">
+                                                        <div class="col-6">
                                                             <select class="custom-select form-control" name="useYn">
                                                                 <option value="">전체</option>
                                                                 <option value="Y" <c:if test="${useYn eq 'Y'}">selected="selected"</c:if>>운영</option>
                                                                 <option value="N" <c:if test="${useYn eq 'N'}">selected="selected"</c:if>>종료</option>
                                                             </select>
                                                         </div>
-                                                        <div class="col-sm-12 col-lg-2">
+                                                        
+                                                        <div class="col-6">
                                                             <button class="btn btn-primary">검색</button>
                                                         </div>
                                                     </div>

+ 4 - 2
src/main/webapp/WEB-INF/jsp/center/new.jsp

@@ -196,14 +196,16 @@ $( function(){
                                                 <th><span class="fix">*</span>담당자 전화번호</th>
                                                 <td colspan="3">
 <!--                                                 placeholder="'-'를 제외한 숫자만 입력하세요" -->
-                                                    <input type="text" class="form-control" name="staffPhoneNumber" required onkeypress="onlyNumber();">
+                                                    <input type="text" class="form-control" name="staffPhoneNumber" required onkeypress="onlyNumber();" autocomplete="off">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th><span class="fix">*</span>비밀번호</th>
                                                 <td colspan="3">
 <!--                                                 placeholder="숫자, 영문, 특수문자 조합 8~15자 이내" -->
-                                                    <input type="password" class="form-control" name="staffPw" id="staffPw" maxlength="15" placeholder="최소 8자리 이상의 (대문자, 소문자, 숫자, 특수문자) 2가지 종류 이상의 조합 or 10자리 이상의 비밀번호" required>
+                                                    <input type="text" autocomplete="off" style="opacity:0;display: block; width:0px; height:0px; border: 0;">
+                                                    <input type="password" autocomplete="off" style="opacity:0;display: block; width:0px; height:0px; border: 0;">
+                                                    <input type="password" class="form-control" name="staffPw" id="staffPw" maxlength="15" placeholder="최소 8자리 이상의 (대문자, 소문자, 숫자, 특수문자) 2가지 종류 이상의 조합 or 10자리 이상의 비밀번호" required autocomplete="off">
                                                 </td>
                                             </tr>
                                             <tr>

+ 20 - 2
src/main/webapp/WEB-INF/jsp/include/paging.jsp

@@ -9,7 +9,21 @@
 <c:if test="${param.total > 0 && param.endPageNo > 1}">
 <nav aria-label="Page navigation">
     <ul class="pagination pagination-mb">
-        <li class="page-item"><a class="page-link" href="?${fn:escapeXml(pagingUrl)}&${fn:escapeXml(pagingPreFix)}=${param.prevPageNo}"><i class="fas fa-angle-left"></i></a></li>
+        <c:set value='${param.startPageNo - 1}' var="prevPageNo" />
+        <c:set value='${param.endPageNo + 1}' var="nextPageNo" />
+        
+        <c:if test="${(param.startPageNo - 1 ) < 1}">
+            <c:set value='1' var="prevPageNo" />
+        </c:if>
+        <c:if test="${(param.endPageNo + 1 ) > param.finalPageNo}">
+            <c:set value='${param.finalPageNo}' var="nextPageNo" />
+        </c:if>
+        
+<%--         <c:if test="${param.pageNo <= 1 * param.groupCount}"> --%>
+            <li class="page-item"><a class="page-link" href="?${fn:escapeXml(pagingUrl)}&${fn:escapeXml(pagingPreFix)}=1"><i class="fas fa-angle-double-left"></i></a></li>
+            <li class="page-item"><a class="page-link" href="?${fn:escapeXml(pagingUrl)}&${fn:escapeXml(pagingPreFix)}=${prevPageNo}">이전</a></li>
+<%--         </c:if> --%>
+        
         <c:forEach var="i" begin="${param.startPageNo}" end="${param.endPageNo}" step="1">
             <c:choose>
                 <c:when test="${i eq param.pageNo}">
@@ -20,7 +34,11 @@
                 </c:otherwise>
             </c:choose>
         </c:forEach>
-        <li class="page-item"><a class="page-link" href="?${fn:escapeXml(pagingUrl)}&${fn:escapeXml(pagingPreFix)}=${param.nextPageNo}"><i class="fas fa-angle-right"></i></a></li>
+        <li class="page-item"><a class="page-link" href="?${fn:escapeXml(pagingUrl)}&${fn:escapeXml(pagingPreFix)}=${nextPageNo}">다음</a></li>
+        
+        <c:if test="${param.pageNo ne param.total}">
+            <li class="page-item"><a class="page-link" href="?${fn:escapeXml(pagingUrl)}&${fn:escapeXml(pagingPreFix)}=${param.finalPageNo}"><i class="fas fa-angle-double-right"></i></a></li>
+        </c:if>
     </ul>
 </nav>
 </c:if>

+ 2 - 2
src/main/webapp/resources/js/common/common.js

@@ -267,8 +267,8 @@ function alertBox( obj ) {
         },
         buttonText: {
             ok: '확인',
-            yes: 'Yes',
-            cancel: 'Cancel'
+            yes: '',
+            cancel: '아니오'
         }
     });
 }