From fccccb32aa90c14bc9a3b45d764af333d03c898f 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: Tue, 22 Feb 2022 09:13:43 +0900
Subject: [PATCH] =?UTF-8?q?tiles=20=EC=84=A4=EC=A0=95=20=EC=99=84=EB=A3=8C?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/layout/header.jsp | 25 ---------------
 .../webapp/WEB-INF/jsp/layout/leftMenu.jsp    | 32 +++++++++++++++++++
 src/main/webapp/WEB-INF/tiles/tiles.xml       |  8 ++---
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/layout/header.jsp b/src/main/webapp/WEB-INF/jsp/layout/header.jsp
index 0850a93..fb8647d 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/header.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/header.jsp
@@ -21,15 +21,6 @@
       </a>
     </div>
   </header>
-
-  <nav class="common_nav">
-    <div class="header_menu">
-      <ul>
-        <li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">지도사용 요청</li>
-        <li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">회원정보수정</li>
-      </ul>
-    </div>
-  </nav>
 </sec:authorize>
 
 <sec:authorize access="hasRole('ROLE_ADMIN')">
@@ -43,20 +34,4 @@
       </a>
     </div>
   </header>
-  <nav class="common_nav">
-    <div class="header_menu">
-      <ul>
-        <li <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if> onclick="location.href='/admin/dashBoard'">
-          <img src="../../../images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
-        <li <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if> onclick="location.href='/admin/request'">
-          <img src="../../../images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
-        <li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'">
-          <img src="../../../images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
-        <li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'">
-          <img src="../../../images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
-        <li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'">
-          <img src="../../../images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
-      </ul>
-    </div>
-  </nav>
 </sec:authorize>
diff --git a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
index 6d1ff83..e29c892 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
@@ -4,3 +4,35 @@
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %><!--시큐리티 태그 라이브러리 선언-->
 <%@ taglib prefix="fn" 	uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+
+<c:set var="tilesURI" value="${requestScope['javax.servlet.forward.request_uri']}"/>
+<c:set var="tilesURIParam"	value="${requestScope['javax.servlet.forward.query_string']}"/>
+
+<sec:authorize access="hasRole('ROLE_USER')">
+  <nav class="common_nav">
+    <div class="header_menu">
+      <ul>
+        <li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">지도사용 요청</li>
+        <li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">회원정보수정</li>
+      </ul>
+    </div>
+  </nav>
+</sec:authorize>
+<sec:authorize access="hasRole('ROLE_ADMIN')">
+  <nav class="common_nav">
+    <div class="header_menu">
+      <ul>
+        <li <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if> onclick="location.href='/admin/dashBoard'">
+          <img src="../../../images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
+        <li <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if> onclick="location.href='/admin/request'">
+          <img src="../../../images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
+        <li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'">
+          <img src="../../../images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
+        <li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'">
+          <img src="../../../images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
+        <li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'">
+          <img src="../../../images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
+      </ul>
+    </div>
+  </nav>
+</sec:authorize>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tiles/tiles.xml b/src/main/webapp/WEB-INF/tiles/tiles.xml
index 43fa37f..6ba01c7 100644
--- a/src/main/webapp/WEB-INF/tiles/tiles.xml
+++ b/src/main/webapp/WEB-INF/tiles/tiles.xml
@@ -16,18 +16,18 @@
 	<definition name="mainTemplate" template="/WEB-INF/jsp/layout/template_main.jsp">
 		<put-attribute name="title"		value="모바일센터 관리시스템" />
 		<put-attribute name="header"	value="/WEB-INF/jsp/layout/header.jsp" />
-		<put-attribute name="left"	value="/WEB-INF/jsp/layout/left.jsp" />
+		<put-attribute name="left"	value="/WEB-INF/jsp/layout/leftMenu.jsp" />
 	</definition>
 
-	<definition name="/login" extends="loginTemplate">
+	<definition name="login" extends="loginTemplate">
 		<put-attribute name="center"		value="/WEB-INF/jsp/login.jsp" />
 	</definition>
 
-	<definition name="/*/html/*" extends="empty">
+	<definition name="*/html/*" extends="empty">
 		<put-attribute name="center"		value="/WEB-INF/jsp/{1}/{2}.jsp" />
 	</definition>
 
-	<definition name="/*/*" extends="mainTemplate">
+	<definition name="*/*" extends="mainTemplate">
 		<put-attribute name="center"		value="/WEB-INF/jsp/{1}/{2}.jsp" />
 	</definition>
 </tiles-definitions>
\ No newline at end of file