1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Mon Aug 09 16:28:42 2021 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Mon Aug 09 16:57:56 2021 +0200
1.3 @@ -31,7 +31,7 @@
1.4 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
1.5
1.6 <%-- Version suffix for forcing browsers to update the CSS / JS files --%>
1.7 -<c:set scope="page" var="versionSuffix" value="20210809"/>
1.8 +<c:set scope="page" var="versionSuffix" value="20210809b"/>
1.9
1.10 <%-- Make the base href easily available at request scope --%>
1.11 <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/>
1.12 @@ -90,41 +90,41 @@
1.13 </c:if>
1.14 </head>
1.15 <body>
1.16 -<div id="mainMenu">
1.17 - <div class="menuEntry"
1.18 - <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> >
1.19 - <a href="projects/">
1.20 - <fmt:message key="menu.projects"/>
1.21 - </a>
1.22 + <div id="body-area">
1.23 + <div id="mainMenu">
1.24 + <div class="menuEntry"
1.25 + <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> >
1.26 + <a href="projects/">
1.27 + <fmt:message key="menu.projects"/>
1.28 + </a>
1.29 + </div>
1.30 + <div class="menuEntry"
1.31 + <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> >
1.32 + <a href="users/">
1.33 + <fmt:message key="menu.users"/>
1.34 + </a>
1.35 + </div>
1.36 + <div class="menuEntry"
1.37 + <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> >
1.38 + <a href="language/">
1.39 + <fmt:message key="menu.languages"/>
1.40 + </a>
1.41 + </div>
1.42 + <div class="menuEntry"
1.43 + <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> >
1.44 + <a href="about/">
1.45 + <fmt:message key="menu.about"/>
1.46 + </a>
1.47 + </div>
1.48 + </div>
1.49 + <c:if test="${not empty navMenu}">
1.50 + <div id="sideMenu">
1.51 + <%@include file="../jspf/navmenu.jspf" %>
1.52 + </div>
1.53 + </c:if>
1.54 + <div id="content-area">
1.55 + <c:import url="${contentPage}"/>
1.56 + </div>
1.57 </div>
1.58 - <div class="menuEntry"
1.59 - <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> >
1.60 - <a href="users/">
1.61 - <fmt:message key="menu.users"/>
1.62 - </a>
1.63 - </div>
1.64 - <div class="menuEntry"
1.65 - <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> >
1.66 - <a href="language/">
1.67 - <fmt:message key="menu.languages"/>
1.68 - </a>
1.69 - </div>
1.70 - <div class="menuEntry"
1.71 - <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> >
1.72 - <a href="about/">
1.73 - <fmt:message key="menu.about"/>
1.74 - </a>
1.75 - </div>
1.76 -</div>
1.77 -<div>
1.78 - <c:if test="${not empty navMenu}">
1.79 - <div id="sideMenu">
1.80 - <%@include file="../jspf/navmenu.jspf" %>
1.81 - </div>
1.82 - </c:if>
1.83 - <div id="content-area" <c:if test="${not empty navMenu}">class="sidebar-spacing"</c:if>>
1.84 - <c:import url="${contentPage}"/>
1.85 - </div>
1.86 -</div>
1.87 </body>
1.88 </html>
