1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Wed May 13 21:46:26 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Thu May 14 22:48:01 2020 +0200
1.3 @@ -31,7 +31,7 @@
1.4 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
1.5
1.6 <%-- Make the base href easily available at request scope --%>
1.7 -<c:set scope="request" var="baseHref" value="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}/" />
1.8 +<c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}" />
1.9
1.10 <%-- Define an alias for the request path --%>
1.11 <c:set scope="page" var="requestPath" value="${requestScope[Constants.REQ_ATTR_PATH]}"/>
1.12 @@ -45,6 +45,9 @@
1.13 <%-- Define an alias for the fragment name --%>
1.14 <c:set scope="page" var="fragment" value="${requestScope[Constants.REQ_ATTR_FRAGMENT]}"/>
1.15
1.16 +<%-- Define an alias for the optional redirect location --%>
1.17 +<c:set scope="page" var="redirectLocation" value="${requestScope[Constants.REQ_ATTR_REDIRECT_LOCATION]}"/>
1.18 +
1.19 <%-- Define an alias for the additional stylesheet --%>
1.20 <c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/>
1.21
1.22 @@ -66,6 +69,9 @@
1.23 </fmt:bundle>
1.24 </title>
1.25 <meta charset="UTF-8">
1.26 + <c:if test="${not empty redirectLocation}">
1.27 + <meta http-equiv="refresh" content="0; URL=${redirectLocation}">
1.28 + </c:if>
1.29 <link rel="stylesheet" href="lightpit.css" type="text/css">
1.30 <c:if test="${not empty extraCss}">
1.31 <link rel="stylesheet" href="${extraCss}" type="text/css">
1.32 @@ -87,6 +93,7 @@
1.33 <div id="content-area">
1.34 <c:if test="${not empty fragment}">
1.35 <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/>
1.36 + <fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
1.37 <c:import url="${fragment}" />
1.38 </c:if>
1.39 </div>
