1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Sun Jun 21 12:38:15 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Sat Aug 22 16:25:03 2020 +0200
1.3 @@ -40,7 +40,7 @@
1.4 <c:set scope="page" var="mainMenu" value="${requestScope[Constants.REQ_ATTR_MENU]}"/>
1.5
1.6 <%-- Define an alias for the main menu --%>
1.7 -<c:set scope="page" var="breadcrumbs" value="${requestScope[Constants.REQ_ATTR_BREADCRUMBS]}"/>
1.8 +<c:set scope="page" var="navMenu" value="${requestScope[Constants.REQ_ATTR_NAVIGATION]}"/>
1.9
1.10 <%-- Define an alias for the content page name --%>
1.11 <c:set scope="page" var="contentPage" value="${requestScope[Constants.REQ_ATTR_CONTENT_PAGE]}"/>
1.12 @@ -83,17 +83,19 @@
1.13 <%@include file="../jspf/menu-entry.jsp" %>
1.14 </c:forEach>
1.15 </div>
1.16 -<c:if test="${not empty breadcrumbs}">
1.17 - <div id="breadcrumbs">
1.18 - <c:forEach var="menu" items="${breadcrumbs}">
1.19 - <%@include file="../jspf/menu-entry.jsp" %>
1.20 - </c:forEach>
1.21 +<div>
1.22 + <c:if test="${not empty navMenu}">
1.23 + <div id="sideMenu">
1.24 + <c:forEach var="menu" items="${navMenu}">
1.25 + <%@include file="../jspf/menu-entry.jsp" %>
1.26 + </c:forEach>
1.27 + </div>
1.28 + </c:if>
1.29 + <div id="content-area" <c:if test="${not empty navMenu}">class="sidebar-spacing"</c:if>>
1.30 + <c:if test="${not empty contentPage}">
1.31 + <c:import url="${contentPage}"/>
1.32 + </c:if>
1.33 </div>
1.34 -</c:if>
1.35 -<div id="content-area">
1.36 - <c:if test="${not empty contentPage}">
1.37 - <c:import url="${contentPage}"/>
1.38 - </c:if>
1.39 </div>
1.40 </body>
1.41 </html>
