From 922f0a163098f5e5f1278acab76a7c96a9f1ba58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 4 Mar 2022 17:31:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/admin/request.jsp | 36 +++++++-----------
 .../webapp/WEB-INF/jsp/admin/userInfo.jsp     | 37 ++++++-------------
 2 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
index f1e2390..847d965 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
@@ -15,18 +15,17 @@
 
         <div class="col-auto">
             <ul class="nav nav-pills" role="tablist">
-                <li role="presentation" class="nav-item" style="margin-left: 16px"><a
-                        class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
+                <li role="presentation" class="nav-item ms-2">
+                  <a class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
                 </li>
-                <li role="presentation" class="nav-item"><a
-                        class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a>
+                <li role="presentation" class="nav-item">
+                  <a class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a>
                 </li>
-                <li role="presentation" class="nav-item"><a
-                        class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}"
-                        href="/admin/request?status=-1">반려</a></li>
-                <li role="presentation" class="nav-item"><a
-                        class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}"
-                        href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}"/></span></a>
+                <li role="presentation" class="nav-item">
+                  <a class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}" href="/admin/request?status=-1">반려</a>
+                </li>
+                <li role="presentation" class="nav-item">
+                  <a class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}" href="/admin/request?status=99">승인대기(${statusCnt})</a>
                 </li>
             </ul>
         </div>
@@ -34,21 +33,12 @@
         <div class="col-auto row">
             <div class="col-auto">
                 <select class="form-select" name="searchCondition">
-                    <option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected"/></c:if>
-                            value="all">통합검색
-                    </option>
-                    <option <c:if test="${useRequestSearchVO.searchCondition eq 'title'}"><c:out
-                            value="selected"/></c:if> value="title">작업명
-                    </option>
-                    <option <c:if test="${useRequestSearchVO.searchCondition eq 'name'}"><c:out
-                            value="selected"/></c:if> value="name">이름
-                    </option>
-                    <option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out
-                            value="selected"/></c:if> value="company">소속
-                    </option>
+                    <option value="all" ${useRequestSearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
+                    <option value="title" ${useRequestSearchVO.searchCondition eq 'title'?'selected':''}>작업명</option>
+                    <option value="name" ${useRequestSearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
+                    <option value="company" ${useRequestSearchVO.searchCondition eq 'company'?'selected':''}>소속</option>
                 </select>
             </div>
-
             <div class="col-auto">
                 <input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}"/>
             </div>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
index d7472ed..2fc971c 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
@@ -17,12 +17,13 @@
 
         <div class="row justify-content-between bg-white mx-3 py-2">
             <div class="col-auto">
-                <ul class="nav nav-pills" role="tablist" style="margin-left: 16px">
-                    <li role="presentation" class="nav-item"><a
-                            class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span
-                            class="badge"><c:out value='${standByCount}'/></span></a></li>
-                    <li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}"
-                                                                href="/admin/userInfo">회원 관리</a></li>
+                <ul class="nav nav-pills ms-2" role="tablist">
+                    <li role="presentation" class="nav-item">
+                      <a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기(${standByCount})</a>
+                    </li>
+                    <li role="presentation" class="nav-item">
+                      <a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a>
+                    </li>
                 </ul>
                 <input type="hidden" name="auth" value="${userSearchVO.auth}"/>
             </div>
@@ -30,24 +31,11 @@
             <div class="col-auto row">
                 <div class="col-auto">
                     <select class="form-select" name="searchCondition">
-                        <option
-                                <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색
-                        </option>
-                        <option
-                                <c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름
-                        </option>
-                        <option
-                                <c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if>
-                                value="company">소속
-                        </option>
-                        <option
-                                <c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">
-                            이메일
-                        </option>
-                        <option
-                                <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if>
-                                value="phonenum">전화번호
-                        </option>
+                        <option value="all" ${userSearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
+                        <option value="name" ${userSearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
+                        <option value="company" ${userSearchVO.searchCondition eq 'company'?'selected':''}>소속</option>
+                        <option value="email" ${userSearchVO.searchCondition eq 'email'?'selected':''}>이메일</option>
+                        <option value="phonenum" ${userSearchVO.searchCondition eq 'phonenum'?'selected':''}>전화번호</option>
                     </select>
                 </div>
 
@@ -78,7 +66,6 @@
                 <c:if test="${count >= 1}">
                     <c:forEach var="user" items="${userList}" varStatus="idx">
                         <tr>
-                                <%--<a href="/admin/userInfo/<c:out value='${item.userid}' />"></a>--%>
                             <td class="clickAbleObj userInfoModalBtn useridTd"><c:out value='${user.userid}'/></td>
                             <td class="clickAbleObj userInfoModalBtn"><c:out value='${user.name}'/></td>
                             <td class="clickAbleObj userInfoModalBtn"><c:out value='${user.company}'/></td>