We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
pwm
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Put the angular and ng-ias stuff in a common place, so they can be activated on pages that need them.

jalbr74 7 years ago
parent
53405cf2cb
commit
91f8424401
5 changed files with 17 additions and 17 deletions
Unified View Show Diff Stats
  1. 1 0
      server/src/main/java/password/pwm/http/PwmRequestFlag.java
  2. 9 0
      server/src/main/webapp/WEB-INF/jsp/fragment/footer.jsp
  3. 4 0
      server/src/main/webapp/WEB-INF/jsp/fragment/header.jsp
  4. 2 9
      server/src/main/webapp/WEB-INF/jsp/helpdesk.jsp
  5. 1 8
      server/src/main/webapp/WEB-INF/jsp/peoplesearch.jsp

+ 1 - 0
server/src/main/java/password/pwm/http/PwmRequestFlag.java
View File 

@@ -34,4 +34,5 @@ public enum PwmRequestFlag
 
     NO_MOBILE_CSS,
 
     NO_MOBILE_CSS,
 
     ALWAYS_EXPAND_MESSAGE_TEXT,
 
     ALWAYS_EXPAND_MESSAGE_TEXT,
 
     INCLUDE_CONFIG_CSS,
 
     INCLUDE_CONFIG_CSS,
 
+    INCLUDE_IAS_ANGULAR,
 
 }
 
 }

+ 9 - 0
server/src/main/webapp/WEB-INF/jsp/fragment/footer.jsp
View File 

@@ -25,6 +25,15 @@
 
 <%@ page import="password.pwm.http.tag.conditional.PwmIfTest" %>
 
 <%@ page import="password.pwm.http.tag.conditional.PwmIfTest" %>
 
 <%@ page import="password.pwm.http.PwmRequestFlag" %>
 
 <%@ page import="password.pwm.http.PwmRequestFlag" %>
 
 <%@ taglib uri="pwm" prefix="pwm" %>
 
 <%@ taglib uri="pwm" prefix="pwm" %>
 
+
 
+<pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.INCLUDE_IAS_ANGULAR%>">
 
+    <pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
 
+    <pwm:script-ref url="/public/resources/webjars/angular-aria/angular-aria.min.js" />
 
+    <pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
 
+    <pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
 
+    <pwm:script-ref url="/public/resources/webjars/pwm-client/vendor/ng-ias.js" />
 
+</pwm:if>
 
+
 
 <%-- begin pwm footer --%>
 
 <%-- begin pwm footer --%>
 
 <pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.HIDE_FOOTER_TEXT%>" negate="true">
 
 <pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.HIDE_FOOTER_TEXT%>" negate="true">
 
     <div id="footer">
 
     <div id="footer">

+ 4 - 0
server/src/main/webapp/WEB-INF/jsp/fragment/header.jsp
View File 

@@ -64,4 +64,8 @@
 
             var PWM_GLOBAL = PWM_GLOBAL || {}; PWM_GLOBAL['startupFunctions'] = [];
 
             var PWM_GLOBAL = PWM_GLOBAL || {}; PWM_GLOBAL['startupFunctions'] = [];
 
         </script>
 
         </script>
 
     </pwm:script>
 
     </pwm:script>
 
+    <pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.INCLUDE_IAS_ANGULAR%>">
 
+        <link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ias-icons.css' addContext="true"/>"/>
 
+        <link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias.css' addContext="true"/>"/>
 
+    </pwm:if>
 
 </head>
 
 </head>

+ 2 - 9
server/src/main/webapp/WEB-INF/jsp/helpdesk.jsp
View File 

@@ -24,6 +24,7 @@
 
 <%@ page import="password.pwm.http.PwmRequestAttribute" %>
 
 <%@ page import="password.pwm.http.PwmRequestAttribute" %>
 
 
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
+<% JspUtility.setFlag(pageContext, PwmRequestFlag.INCLUDE_IAS_ANGULAR); %>
 
 <%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
 
 <%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
 
 <%@ taglib uri="pwm" prefix="pwm" %>
 
 <%@ taglib uri="pwm" prefix="pwm" %>
 
 <html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
 
 <html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
 
@@ -44,17 +45,9 @@
 
     <div class="push"></div>
 
     <div class="push"></div>
 
 </div>
 
 </div>
 
 
 
-<pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
 
-<pwm:script-ref url="/public/resources/webjars/angular-aria/angular-aria.min.js" />
 
-<pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
 
-<pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
 
-
 
 <jsp:include page="/WEB-INF/jsp/fragment/footer.jsp"/>
 
 <jsp:include page="/WEB-INF/jsp/fragment/footer.jsp"/>
 
-<pwm:script-ref url="/public/resources/js/helpdesk.js"/>
 
 
 
-<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ias-icons.css' addContext="true"/>"/>
 
-<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias.css' addContext="true"/>"/>
 
-<pwm:script-ref url="/public/resources/webjars/pwm-client/vendor/ng-ias.js" />
 
+<pwm:script-ref url="/public/resources/js/helpdesk.js"/>
 
 <pwm:script-ref url="/public/resources/webjars/pwm-client/helpdesk.ng.js" />
 
 <pwm:script-ref url="/public/resources/webjars/pwm-client/helpdesk.ng.js" />
 
 <pwm:script-ref url="/public/resources/js/changepassword.js"/>
 
 <pwm:script-ref url="/public/resources/js/changepassword.js"/>

+ 1 - 8
server/src/main/webapp/WEB-INF/jsp/peoplesearch.jsp
View File 

@@ -21,6 +21,7 @@
 
 --%>
 
 --%>
 
 
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
+<% JspUtility.setFlag(pageContext, PwmRequestFlag.INCLUDE_IAS_ANGULAR); %>
 
 <%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
 
 <%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
 
 <%@ taglib uri="pwm" prefix="pwm" %>
 
 <%@ taglib uri="pwm" prefix="pwm" %>
 
 <html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
 
 <html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
 
@@ -38,16 +39,8 @@
 
     <div class="push"></div>
 
     <div class="push"></div>
 
 </div>
 
 </div>
 
 
 
-<pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
 
-<pwm:script-ref url="/public/resources/webjars/angular-aria/angular-aria.min.js" />
 
-<pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
 
-<pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
 
-
 
 <%@ include file="fragment/footer.jsp" %>
 
 <%@ include file="fragment/footer.jsp" %>
 
 
 
-<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ias-icons.css' addContext="true"/>"/>
 
-<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias.css' addContext="true"/>"/>
 
-<pwm:script-ref url="/public/resources/webjars/pwm-client/vendor/ng-ias.js" />
 
 <pwm:script-ref url="/public/resources/webjars/pwm-client/peoplesearch.ng.js" />
 
 <pwm:script-ref url="/public/resources/webjars/pwm-client/peoplesearch.ng.js" />
 
 
 
 </body>
 
 </body>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5