Fisheye: Tag ca098d61e6eb6a97a606dc32edb14a2afa01565e refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Page5.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/WEB-INF/tags/PageAdmin.tag =================================================================== diff -u --- lams_admin/web/WEB-INF/tags/PageAdmin.tag (revision 0) +++ lams_admin/web/WEB-INF/tags/PageAdmin.tag (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -0,0 +1,84 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-function" prefix="fn" %> +<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> + +<%@ attribute name="type" required="false" rtexprvalue="true"%> +<%@ attribute name="formID" required="false" rtexprvalue="true"%> +<%@ attribute name="title" required="false" rtexprvalue="true"%> +<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%> +<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%> + + +
+ + + <%-- The Breadcrumb + We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do + accessibility this way. Also ensure that all pages implement the same breadcrumb element + + BreadcrumbItems is an array that includes the breadcrumb details as follows + + String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...] + + In the page, you build these as follows: + + admin/sysadminstart.do | + . | + + + Then you pass breadcrumbItems to the Page.tag as: + + + --%> + +
+ + + +
+ + + + ${titleHelpURL} + + + +
+
+ +

+ +

+ + + +
+
+
+ Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision faa119a6a494bab9b265ba46a597ee3442bb56cd) +++ lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -338,8 +338,8 @@ /WEB-INF/tags/Page.tag - Page5 - /WEB-INF/tags/Page5.tag + PageAdmin + /WEB-INF/tags/PageAdmin.tag PageLearner Index: lams_admin/web/appadmin.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/appadmin.jsp (.../appadmin.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/appadmin.jsp (.../appadmin.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -16,9 +16,8 @@ - - - + +
- - - Index: lams_admin/web/ldap.jsp =================================================================== diff -u -r85121f2d5a0394c96ef2ad1859c22b82391279b7 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/ldap.jsp (.../ldap.jsp) (revision 85121f2d5a0394c96ef2ad1859c22b82391279b7) +++ lams_admin/web/ldap.jsp (.../ldap.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,11 +1,12 @@ - <%@ include file="/taglibs.jsp"%> - <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %> <%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %> <%@ page import="org.lamsfoundation.lams.usermanagement.service.ILdapService" %> + + + - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - ${breadcrumbItems}, . | - - +
@@ -272,8 +268,6 @@ -
- - - + + \ No newline at end of file Index: lams_admin/web/loginmaintain.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/loginmaintain.jsp (.../loginmaintain.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/loginmaintain.jsp (.../loginmaintain.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,7 +1,10 @@ - <%@ include file="/taglibs.jsp"%> - +<%-- Build breadcrumb --%> +admin/appadminstart.do | +. | + + @@ -14,17 +17,8 @@ - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - . | - - - - - + @@ -37,10 +31,7 @@ - - + - - - + Index: lams_admin/web/orgPasswordChange.jsp =================================================================== diff -u -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/orgPasswordChange.jsp (.../orgPasswordChange.jsp) (revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307) +++ lams_admin/web/orgPasswordChange.jsp (.../orgPasswordChange.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,7 +1,5 @@ - <%@ include file="/taglibs.jsp"%> - <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> @@ -10,6 +8,16 @@ <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> +<%-- Build breadcrumb --%> + + admin/appadminstart.do | + + + ${breadcrumbItems}, admin/orgmanage.do?org=1 | + + + ${breadcrumbItems}, admin/usermanage.do?org= | + @@ -326,19 +334,7 @@ -<%-- Build breadcrumb --%> - - admin/appadminstart.do | - - - ${breadcrumbItems}, admin/orgmanage.do?org=1 | - - - ${breadcrumbItems}, admin/usermanage.do?org= | - - - - +

@@ -453,6 +449,5 @@ - - + Index: lams_admin/web/policies/editPolicy.jsp =================================================================== diff -u -re3a1990532eb6f5524cd15ec1feec08131d9b3d2 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/policies/editPolicy.jsp (.../editPolicy.jsp) (revision e3a1990532eb6f5524cd15ec1feec08131d9b3d2) +++ lams_admin/web/policies/editPolicy.jsp (.../editPolicy.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,11 @@ + <%@ include file="/taglibs.jsp"%> +<%-- Build breadcrumb --%> +admin/appadminstart.do | +admin/policyManagement/list.do | +. | + - @@ -72,17 +77,9 @@ }); - - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - admin/policyManagement/list.do | - . | - - - + + @@ -175,6 +172,5 @@ - - + Index: lams_admin/web/policies/policies.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/policies/policies.jsp (.../policies.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/policies/policies.jsp (.../policies.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,21 @@ + <%@ include file="/taglibs.jsp"%> + +<%-- Build breadcrumb --%> +admin/appadminstart.do | + + + policyManagement/list.do | + . | + + + + + . | + + + - @@ -28,11 +43,7 @@ - - - - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - - - policyManagement/list.do | - . | - - - - - . | - - - - - - - +
<%@ include file="policyTable.jsp"%>
@@ -108,6 +98,5 @@ - - + Index: lams_admin/web/policies/userConsents.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/policies/userConsents.jsp (.../userConsents.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/policies/userConsents.jsp (.../userConsents.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,6 @@ + <%@ include file="/taglibs.jsp"%> - @@ -17,7 +17,6 @@ - - - +

:

- - - + \ No newline at end of file Index: lams_admin/web/remove.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/remove.jsp (.../remove.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/remove.jsp (.../remove.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,23 @@ - <%@ include file="/taglibs.jsp"%> +<%-- Build breadcrumb --%> + + admin/appadminstart.do | + +${breadcrumbItems}, admin/usersearch.do | + + + ${breadcrumbItems}, . | + + + + ${breadcrumbItems}, . | + + @@ -14,28 +31,8 @@ - - - <%-- Build breadcrumb --%> - - admin/appadminstart.do | - - ${breadcrumbItems}, admin/usersearch.do | - - - ${breadcrumbItems}, . | - - - - ${breadcrumbItems}, . | - - - + @@ -102,10 +99,5 @@ - - + - - Index: lams_admin/web/signupmanagement/add.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/signupmanagement/add.jsp (.../add.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/signupmanagement/add.jsp (.../add.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,12 @@ <%@ include file="/taglibs.jsp"%> - + +<%-- Build breadcrumb --%> +admin/appadminstart.do | +admin/signupManagement/start.do | +. | + + @@ -13,19 +19,8 @@ - - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - admin/signupManagement/start.do | - . | - - - - - + @@ -98,7 +93,5 @@ - - + - Index: lams_admin/web/signupmanagement/list.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/signupmanagement/list.jsp (.../list.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/signupmanagement/list.jsp (.../list.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,8 +1,14 @@ - <%@ page import="org.lamsfoundation.lams.signup.model.SignupOrganisation" %> <%@ include file="/taglibs.jsp"%> + + +<%-- Build breadcrumb --%> +admin/appadminstart.do | +. | + + @@ -23,17 +29,8 @@ }); - - - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - . | - - - + @@ -104,7 +101,5 @@ - - - + Index: lams_admin/web/statistics.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/statistics.jsp (.../statistics.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/statistics.jsp (.../statistics.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,8 @@ - <%@ include file="/taglibs.jsp"%> +<%-- Build breadcrumb --%> +admin/appadminstart.do | +${breadcrumbItems}, . | @@ -32,13 +34,8 @@ } - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - ${breadcrumbItems}, . | - +
@@ -123,11 +120,5 @@
- - + - - - - - Index: lams_admin/web/themeManagement.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/themeManagement.jsp (.../themeManagement.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_admin/web/themeManagement.jsp (.../themeManagement.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,8 @@ - <%@ include file="/taglibs.jsp"%> +<%-- Build breadcrumb --%> +admin/appadminstart.do | +${breadcrumbItems}, . | @@ -13,7 +15,6 @@ - - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - ${breadcrumbItems}, . | - - - + @@ -183,6 +176,5 @@ - - + Index: lams_admin/web/toolcontent/toolcontentlist.jsp =================================================================== diff -u -rfe323fc60e35bad33a4b16342a1117a9572e6134 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision fe323fc60e35bad33a4b16342a1117a9572e6134) +++ lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -1,6 +1,9 @@ - <%@ include file="/taglibs.jsp"%> +<%-- Build breadcrumb --%> +admin/appadminstart.do | +. | + @@ -22,15 +25,7 @@ - - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - . | - - - - +

@@ -121,7 +116,5 @@

- - - - \ No newline at end of file + + Index: lams_admin/web/user.jsp =================================================================== diff -u -re3a1990532eb6f5524cd15ec1feec08131d9b3d2 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/user.jsp (.../user.jsp) (revision e3a1990532eb6f5524cd15ec1feec08131d9b3d2) +++ lams_admin/web/user.jsp (.../user.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -2,11 +2,26 @@ <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> + <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> +<%-- Build breadcrumb --%> + + admin/appadminstart.do | + +${breadcrumbItems}, admin/orgmanage.do?org=1 | + +${breadcrumbItems}, admin/usersearch.do | + +${breadcrumbItems}, . | + @@ -176,25 +191,8 @@ - + - <%-- Build breadcrumb --%> - - admin/appadminstart.do | - - ${breadcrumbItems}, admin/orgmanage.do?org=1 | - - ${breadcrumbItems}, admin/usersearch.do | - - ${breadcrumbItems}, . | - - - -
@@ -613,6 +611,5 @@
- - - \ No newline at end of file + + Index: lams_admin/web/userChangePass.jsp =================================================================== diff -u -re3a1990532eb6f5524cd15ec1feec08131d9b3d2 -rca098d61e6eb6a97a606dc32edb14a2afa01565e --- lams_admin/web/userChangePass.jsp (.../userChangePass.jsp) (revision e3a1990532eb6f5524cd15ec1feec08131d9b3d2) +++ lams_admin/web/userChangePass.jsp (.../userChangePass.jsp) (revision ca098d61e6eb6a97a606dc32edb14a2afa01565e) @@ -3,11 +3,18 @@ <%@ taglib uri="tags-lams" prefix="lams"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> + <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> +<%-- Build breadcrumb --%> +admin/appadminstart.do | +${breadcrumbItems}, admin/orgmanage.do?org=1 | +${breadcrumbItems}, admin/usersearch.do | +${breadcrumbItems}, admin/user/edit.do?userId=${param.userId} | +${breadcrumbItems}, . | @@ -86,15 +93,7 @@ - - <%-- Build breadcrumb --%> - admin/appadminstart.do | - ${breadcrumbItems}, admin/orgmanage.do?org=1 | - ${breadcrumbItems}, admin/usersearch.do | - ${breadcrumbItems}, admin/user/edit.do?userId=${param.userId} | - ${breadcrumbItems}, . | - - + :