1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Fri Oct 23 12:26:08 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Fri Oct 23 12:38:20 2020 +0200 1.3 @@ -36,9 +36,6 @@ 1.4 <%-- Define an alias for the request path --%> 1.5 <c:set scope="page" var="requestPath" value="${requestScope[Constants.REQ_ATTR_PATH]}"/> 1.6 1.7 -<%-- Define an alias for the main menu --%> 1.8 -<c:set scope="page" var="mainMenu" value="${requestScope[Constants.REQ_ATTR_MENU]}"/> 1.9 - 1.10 <%-- Define an alias for the navigation menu --%> 1.11 <c:set scope="page" var="navMenu" value="${requestScope[Constants.REQ_ATTR_NAVIGATION]}"/> 1.12 1.13 @@ -79,9 +76,21 @@ 1.14 </head> 1.15 <body> 1.16 <div id="mainMenu"> 1.17 - <c:forEach var="menu" items="${mainMenu}"> 1.18 - <%@include file="../jspf/menu-entry.jspf" %> 1.19 - </c:forEach> 1.20 + <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> > 1.21 + <a href="projects/"> 1.22 + <fmt:message bundle="${lightpit_bundle}" key="menu.projects"/> 1.23 + </a> 1.24 + </div> 1.25 + <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/teams/')}">data-active</c:if> > 1.26 + <a href="teams/"> 1.27 + <fmt:message bundle="${lightpit_bundle}" key="menu.users"/> 1.28 + </a> 1.29 + </div> 1.30 + <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> > 1.31 + <a href="language/"> 1.32 + <fmt:message bundle="${lightpit_bundle}" key="menu.languages"/> 1.33 + </a> 1.34 + </div> 1.35 </div> 1.36 <div> 1.37 <c:if test="${not empty navMenu}">