Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Sun Jun 21 12:38:15 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Sat Aug 22 16:25:03 2020 +0200
@@ -40,7 +40,7 @@
 <c:set scope="page" var="mainMenu" value="${requestScope[Constants.REQ_ATTR_MENU]}"/>
 
 <%-- Define an alias for the main menu --%>
-<c:set scope="page" var="breadcrumbs" value="${requestScope[Constants.REQ_ATTR_BREADCRUMBS]}"/>
+<c:set scope="page" var="navMenu" value="${requestScope[Constants.REQ_ATTR_NAVIGATION]}"/>
 
 <%-- Define an alias for the content page name --%>
 <c:set scope="page" var="contentPage" value="${requestScope[Constants.REQ_ATTR_CONTENT_PAGE]}"/>
@@ -83,17 +83,19 @@
         <%@include file="../jspf/menu-entry.jsp" %>
     </c:forEach>
 </div>
-<c:if test="${not empty breadcrumbs}">
-    <div id="breadcrumbs">
-        <c:forEach var="menu" items="${breadcrumbs}">
-            <%@include file="../jspf/menu-entry.jsp" %>
-        </c:forEach>
+<div>
+    <c:if test="${not empty navMenu}">
+        <div id="sideMenu">
+            <c:forEach var="menu" items="${navMenu}">
+                <%@include file="../jspf/menu-entry.jsp" %>
+            </c:forEach>
+        </div>
+    </c:if>
+    <div id="content-area" <c:if test="${not empty navMenu}">class="sidebar-spacing"</c:if>>
+        <c:if test="${not empty contentPage}">
+            <c:import url="${contentPage}"/>
+        </c:if>
     </div>
-</c:if>
-<div id="content-area">
-    <c:if test="${not empty contentPage}">
-        <c:import url="${contentPage}"/>
-    </c:if>
 </div>
 </body>
 </html>