1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Wed May 13 18:55:05 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Wed May 13 21:10:23 2020 +0200
1.3 @@ -30,9 +30,15 @@
1.4 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.5 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
1.6
1.7 +<%-- Define an alias for the request path --%>
1.8 +<c:set scope="page" var="requestPath" value="${requestScope[Constants.REQ_ATTR_PATH]}"/>
1.9 +
1.10 <%-- Define an alias for the main menu --%>
1.11 <c:set scope="page" var="mainMenu" value="${requestScope[Constants.REQ_ATTR_MENU]}"/>
1.12
1.13 +<%-- Define an alias for the sub menu --%>
1.14 +<c:set scope="page" var="subMenu" value="${requestScope[Constants.REQ_ATTR_SUB_MENU]}"/>
1.15 +
1.16 <%-- Define an alias for the fragment name --%>
1.17 <c:set scope="page" var="fragment" value="${requestScope[Constants.REQ_ATTR_FRAGMENT]}"/>
1.18
1.19 @@ -65,22 +71,16 @@
1.20 <body>
1.21 <div id="mainMenu">
1.22 <c:forEach var="menu" items="${mainMenu}">
1.23 - <div class="menuEntry"
1.24 - <c:if test="${requestScope[Constants.REQ_ATTR_MODULE_CLASSNAME] eq menu.moduleClassName}">
1.25 - data-active
1.26 - </c:if>
1.27 - >
1.28 - <a href="${menu.pathName}">
1.29 - <fmt:bundle basename="${menu.resourceKey.bundle}">
1.30 - <fmt:message key="${menu.resourceKey.key}" />
1.31 - </fmt:bundle>
1.32 - </a>
1.33 - </div>
1.34 + <%@ include file="../jspf/menu-entry.jspf" %>
1.35 </c:forEach>
1.36 </div>
1.37 - <div id="subMenu">
1.38 -
1.39 - </div>
1.40 + <c:if test="${not empty subMenu}">
1.41 + <div id="subMenu">
1.42 + <c:forEach var="menu" items="${subMenu}">
1.43 + <%@ include file="../jspf/menu-entry.jspf" %>
1.44 + </c:forEach>
1.45 + </div>
1.46 + </c:if>
1.47 <div id="content-area">
1.48 <c:if test="${not empty fragment}">
1.49 <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/>
