Skip to content

Commit 5f21bed

Browse files
author
jrivard@gmail.com
committed
Merge remote-tracking branch 'origin/master'
2 parents fbb7bb5 + 9a29bd6 commit 5f21bed

File tree

6 files changed

+83
-54
lines changed

6 files changed

+83
-54
lines changed

‎webapp/src/main/webapp/WEB-INF/jsp/fragment/header-common.jsp

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<%--
2+
~ Password Management Servlets (PWM)
3+
~ http://www.pwm-project.org
4+
~
5+
~ Copyright (c) 2006-2009 Novell, Inc.
6+
~ Copyright (c) 2009-2018 The PWM Project
7+
~
8+
~ This program is free software; you can redistribute it and/or modify
9+
~ it under the terms of the GNU General Public License as published by
10+
~ the Free Software Foundation; either version 2 of the License, or
11+
~ (at your option) any later version.
12+
~
13+
~ This program is distributed in the hope that it will be useful,
14+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
~ GNU General Public License for more details.
17+
~
18+
~ You should have received a copy of the GNU General Public License
19+
~ along with this program; if not, write to the Free Software
20+
~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21+
--%>
22+
23+
<%@ page import="password.pwm.PwmApplication" %>
24+
<%@ page import="password.pwm.PwmConstants" %>
25+
<%@ page import="password.pwm.error.PwmUnrecoverableException" %>
26+
<%@ page import="password.pwm.http.ContextManager" %>
27+
<%@ page import="password.pwm.http.PwmRequest" %>
28+
<%@ page import="password.pwm.http.tag.conditional.PwmIfTest" %>
29+
<%@ page import="password.pwm.http.tag.value.PwmValue" %>
30+
<%@ page import="password.pwm.http.PwmRequestFlag" %>
31+
<%@ page import="password.pwm.http.tag.url.PwmThemeURL" %>
32+
<%@ page import="password.pwm.http.JspUtility" %>
33+
<%@ taglib uri="pwm" prefix="pwm" %>
34+
35+
<pwm:if test="<%=PwmIfTest.authenticated%>" negate="true"><title><pwm:display key="Title_TitleBar"/></title></pwm:if>
36+
<pwm:if test="<%=PwmIfTest.authenticated%>"><title><pwm:display key="Title_TitleBarAuthenticated"/></title></pwm:if>
37+
<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
38+
<meta name="robots" content="noindex,nofollow"/>
39+
<meta id="application-info" name="application-name" content="<%=PwmConstants.PWM_APP_NAME%> Password Self Service"
40+
<pwm:if test="<%=PwmIfTest.showVersionHeader%>">data-<%=PwmConstants.PWM_APP_NAME.toLowerCase()%>-version="<%=PwmConstants.BUILD_VERSION%>" data-<%=PwmConstants.PWM_APP_NAME.toLowerCase()%>-build="<%=PwmConstants.BUILD_NUMBER%>"</pwm:if>
41+
data-<%=PwmConstants.PWM_APP_NAME.toLowerCase()%>-instance="<pwm:value name="<%=PwmValue.instanceID%>"/>"
42+
data-jsp-name="<pwm:value name="<%=PwmValue.currentJspFilename%>"/>"
43+
data-url-context="<pwm:context/>"
44+
data-pwmFormID="<pwm:FormID/>"
45+
data-clientEtag="<pwm:value name="<%=PwmValue.clientETag%>"/>">
46+
<meta name="viewport" content="width=device-width, initial-scale = 1.0, user-scalable=no"/>
47+
<meta http-equiv="X-UA-Compatible" content="IE=10; IE=9; IE=8; IE=7" />
48+
<link rel="icon" type="image/png" href="<pwm:url url='/public/resources/favicon.png' addContext="true"/>"/>
49+
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/pwm-icons.css' addContext="true"/>"/>
50+
<link href="<pwm:url url='/public/resources/style.css' addContext="true"/>" rel="stylesheet" type="text/css" media="screen"/>
51+
<link href="<pwm:url url='/public/resources/style-print.css' addContext="true"/>" rel="stylesheet" type="text/css" media="print"/>
52+
<link href="<pwm:url url="%THEME_URL%"/>" rel="stylesheet" type="text/css" media="screen"/>
53+
<pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.NO_MOBILE_CSS%>" negate="true">
54+
<link media="only screen and (max-width: 600px)" href="<pwm:url url='/public/resources/mobileStyle.css' addContext="true"/>" type="text/css" rel="stylesheet"/><%-- iphone css --%>
55+
<link media="only screen and (max-width: 600px)" href="<pwm:url url="%MOBILE_THEME_URL%"/>" type="text/css" rel="stylesheet"/><%-- mobile css --%>
56+
</pwm:if>
57+
<link href="<pwm:url url='/public/resources/webjars/dijit/themes/nihilo/nihilo.css' addContext="true"/>" rel="stylesheet" type="text/css"/>
58+
<link href="<pwm:url url='/public/resources/webjars/dgrid/css/dgrid.css' addContext="true"/>" rel="stylesheet" type="text/css"/>
59+
<pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.INCLUDE_CONFIG_CSS%>">
60+
<link href="<pwm:url url='<%=PwmThemeURL.CONFIG_THEME_URL.token()%>' addContext="true"/>" rel="stylesheet" type="text/css" media="screen"/>
61+
</pwm:if>
62+
<pwm:script>
63+
<script type="text/javascript">
64+
var PWM_GLOBAL = PWM_GLOBAL || {}; PWM_GLOBAL['startupFunctions'] = [];
65+
</script>
66+
</pwm:script>

‎webapp/src/main/webapp/WEB-INF/jsp/fragment/header.jsp

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -20,55 +20,10 @@
2020
~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2121
--%>
2222

23-
<%@ page import="password.pwm.AppProperty" %>
24-
<%@ page import="password.pwm.PwmApplication" %>
25-
<%@ page import="password.pwm.PwmConstants" %>
26-
<%@ page import="password.pwm.error.PwmUnrecoverableException" %>
27-
<%@ page import="password.pwm.http.ContextManager" %>
28-
<%@ page import="password.pwm.http.PwmRequest" %>
29-
<%@ page import="password.pwm.http.tag.conditional.PwmIfTest" %>
30-
<%@ page import="password.pwm.http.tag.value.PwmValue" %>
31-
<%@ page import="password.pwm.http.PwmRequestFlag" %>
32-
<%@ page import="password.pwm.http.tag.url.PwmThemeURL" %>
33-
<%@ page import="password.pwm.http.JspUtility" %>
34-
<%@ taglib uri="pwm" prefix="pwm" %>
35-
23+
<%--
24+
The code for this JSP has been moved into header-common.jsp. Pages pointing to header.jsp will continue to work as
25+
they did before, but pages that need access to the header tag can now include header-common.jsp as shown below:
26+
--%>
3627
<head>
37-
<pwm:if test="<%=PwmIfTest.authenticated%>" negate="true"><title><pwm:display key="Title_TitleBar"/></title></pwm:if>
38-
<pwm:if test="<%=PwmIfTest.authenticated%>"><title><pwm:display key="Title_TitleBarAuthenticated"/></title></pwm:if>
39-
<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
40-
<meta name="robots" content="noindex,nofollow"/>
41-
<meta id="application-info" name="application-name" content="<%=PwmConstants.PWM_APP_NAME%> Password Self Service"
42-
<pwm:if test="<%=PwmIfTest.showVersionHeader%>">data-<%=PwmConstants.PWM_APP_NAME.toLowerCase()%>-version="<%=PwmConstants.BUILD_VERSION%>" data-<%=PwmConstants.PWM_APP_NAME.toLowerCase()%>-build="<%=PwmConstants.BUILD_NUMBER%>"</pwm:if>
43-
data-<%=PwmConstants.PWM_APP_NAME.toLowerCase()%>-instance="<pwm:value name="<%=PwmValue.instanceID%>"/>"
44-
data-jsp-name="<pwm:value name="<%=PwmValue.currentJspFilename%>"/>"
45-
data-url-context="<pwm:context/>"
46-
data-pwmFormID="<pwm:FormID/>"
47-
data-clientEtag="<pwm:value name="<%=PwmValue.clientETag%>"/>">
48-
<meta name="viewport" content="width=device-width, initial-scale = 1.0, user-scalable=no"/>
49-
<meta http-equiv="X-UA-Compatible" content="IE=10; IE=9; IE=8; IE=7" />
50-
<link rel="icon" type="image/png" href="<pwm:url url='/public/resources/favicon.png' addContext="true"/>"/>
51-
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/pwm-icons.css' addContext="true"/>"/>
52-
<link href="<pwm:url url='/public/resources/style.css' addContext="true"/>" rel="stylesheet" type="text/css" media="screen"/>
53-
<link href="<pwm:url url='/public/resources/style-print.css' addContext="true"/>" rel="stylesheet" type="text/css" media="print"/>
54-
<link href="<pwm:url url="%THEME_URL%"/>" rel="stylesheet" type="text/css" media="screen"/>
55-
<pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.NO_MOBILE_CSS%>" negate="true">
56-
<link media="only screen and (max-width: 600px)" href="<pwm:url url='/public/resources/mobileStyle.css' addContext="true"/>" type="text/css" rel="stylesheet"/><%-- iphone css --%>
57-
<link media="only screen and (max-width: 600px)" href="<pwm:url url="%MOBILE_THEME_URL%"/>" type="text/css" rel="stylesheet"/><%-- mobile css --%>
58-
</pwm:if>
59-
<link href="<pwm:url url='/public/resources/webjars/dijit/themes/nihilo/nihilo.css' addContext="true"/>" rel="stylesheet" type="text/css"/>
60-
<link href="<pwm:url url='/public/resources/webjars/dgrid/css/dgrid.css' addContext="true"/>" rel="stylesheet" type="text/css"/>
61-
<pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.INCLUDE_CONFIG_CSS%>">
62-
<link href="<pwm:url url='<%=PwmThemeURL.CONFIG_THEME_URL.token()%>' addContext="true"/>" rel="stylesheet" type="text/css" media="screen"/>
63-
</pwm:if>
64-
<pwm:script>
65-
<script type="text/javascript">
66-
var PWM_GLOBAL = PWM_GLOBAL || {}; PWM_GLOBAL['startupFunctions'] = [];
67-
</script>
68-
</pwm:script>
69-
70-
<% if (JspUtility.getPwmRequest(pageContext).isFlag(PwmRequestFlag.INCLUDE_IAS_ANGULAR) || JspUtility.getPwmRequest(pageContext).isFlag(PwmRequestFlag.INCLUDE_IAS_CSS)) { %>
71-
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias/ias-icons.css' addContext="true"/>"/>
72-
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias/ux-ias.css' addContext="true"/>"/>
73-
<% } %>
28+
<%@ include file="/WEB-INF/jsp/fragment/header-common.jsp" %>
7429
</head>

‎webapp/src/main/webapp/WEB-INF/jsp/helpdesk.jsp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@
2424
<%@ page import="password.pwm.http.PwmRequestAttribute" %>
2525

2626
<!DOCTYPE html>
27-
<% JspUtility.setFlag(pageContext, PwmRequestFlag.INCLUDE_IAS_ANGULAR); %>
2827
<%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
2928
<%@ taglib uri="pwm" prefix="pwm" %>
3029
<html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
31-
<%@ include file="/WEB-INF/jsp/fragment/header.jsp" %>
30+
<head>
31+
<%@ include file="/WEB-INF/jsp/fragment/header-common.jsp" %>
32+
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias/ias-icons.css' addContext="true"/>"/>
33+
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias/ux-ias.css' addContext="true"/>"/>
34+
</head>
3235
<body class="nihilo">
3336
<div id="wrapper" class="helpdesk-wrapper">
3437
<jsp:include page="/WEB-INF/jsp/fragment/header-body.jsp">

‎webapp/src/main/webapp/WEB-INF/jsp/newuser-wait.jsp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
<%@ page import="password.pwm.error.PwmException" %>
2424
<%@ page import="password.pwm.http.servlet.newuser.NewUserServlet" %>
25+
<%@ page import="password.pwm.AppProperty" %>
2526

2627
<!DOCTYPE html>
2728
<% JspUtility.setFlag(pageContext, PwmRequestFlag.HIDE_HEADER_BUTTONS); %>

‎webapp/src/main/webapp/WEB-INF/jsp/peoplesearch.jsp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@
2121
--%>
2222

2323
<!DOCTYPE html>
24-
<% JspUtility.setFlag(pageContext, PwmRequestFlag.INCLUDE_IAS_ANGULAR); %>
2524
<%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
2625
<%@ taglib uri="pwm" prefix="pwm" %>
2726
<html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
28-
<%@ include file="/WEB-INF/jsp/fragment/header.jsp" %>
27+
<head>
28+
<%@ include file="/WEB-INF/jsp/fragment/header-common.jsp" %>
29+
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias/ias-icons.css' addContext="true"/>"/>
30+
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias/ux-ias.css' addContext="true"/>"/>
31+
</head>
2932
<body class="nihilo printable">
3033
<div id="wrapper" class="peoplesearch-wrapper">
3134
<jsp:include page="/WEB-INF/jsp/fragment/header-body.jsp">

‎webapp/src/main/webapp/public/reference/settings.jsp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<%@ page import="java.util.*" %>
3131
<%@ page import="password.pwm.util.macro.MacroMachine" %>
3232
<%@ page import="com.novell.ldapchai.util.StringHelper" %>
33+
<%@ page import="password.pwm.AppProperty" %>
3334

3435
<!DOCTYPE html>
3536
<% JspUtility.setFlag(pageContext, PwmRequestFlag.HIDE_HEADER_WARNINGS); %>

0 commit comments

Comments
 (0)