src/main/webapp/WEB-INF/jsp/site.jsp

changeset 217
a5ad7cd5d000
parent 213
5b55a5318a83
child 219
556c03f1dd4e
--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Mon Aug 09 16:28:42 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Mon Aug 09 16:57:56 2021 +0200
@@ -31,7 +31,7 @@
 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <%-- Version suffix for forcing browsers to update the CSS / JS files --%>
-<c:set scope="page" var="versionSuffix" value="20210809"/>
+<c:set scope="page" var="versionSuffix" value="20210809b"/>
 
 <%-- Make the base href easily available at request scope --%>
 <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/>
@@ -90,41 +90,41 @@
     </c:if>
 </head>
 <body>
-<div id="mainMenu">
-    <div class="menuEntry"
-         <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> >
-        <a href="projects/">
-            <fmt:message key="menu.projects"/>
-        </a>
-    </div>
-    <div class="menuEntry"
-         <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> >
-        <a href="users/">
-            <fmt:message key="menu.users"/>
-        </a>
+    <div id="body-area">
+        <div id="mainMenu">
+            <div class="menuEntry"
+                 <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> >
+                <a href="projects/">
+                    <fmt:message key="menu.projects"/>
+                </a>
+            </div>
+            <div class="menuEntry"
+                 <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> >
+                <a href="users/">
+                    <fmt:message key="menu.users"/>
+                </a>
+            </div>
+            <div class="menuEntry"
+                 <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> >
+                <a href="language/">
+                    <fmt:message key="menu.languages"/>
+                </a>
+            </div>
+            <div class="menuEntry"
+                 <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> >
+                <a href="about/">
+                    <fmt:message key="menu.about"/>
+                </a>
+            </div>
+        </div>
+        <c:if test="${not empty navMenu}">
+            <div id="sideMenu">
+                <%@include file="../jspf/navmenu.jspf" %>
+            </div>
+        </c:if>
+        <div id="content-area">
+            <c:import url="${contentPage}"/>
+        </div>
     </div>
-    <div class="menuEntry"
-         <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> >
-        <a href="language/">
-            <fmt:message key="menu.languages"/>
-        </a>
-    </div>
-    <div class="menuEntry"
-         <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> >
-        <a href="about/">
-            <fmt:message key="menu.about"/>
-        </a>
-    </div>
-</div>
-<div>
-    <c:if test="${not empty navMenu}">
-        <div id="sideMenu">
-            <%@include file="../jspf/navmenu.jspf" %>
-        </div>
-    </c:if>
-    <div id="content-area" <c:if test="${not empty navMenu}">class="sidebar-spacing"</c:if>>
-        <c:import url="${contentPage}"/>
-    </div>
-</div>
 </body>
 </html>

mercurial