Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -2,6 +2,7 @@
<%@ taglib uri="tags-core" prefix="c"%>
<%@ taglib uri="tags-fmt" prefix="fmt"%>
<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
<%@ attribute name="type" required="true" rtexprvalue="true"%>
<%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -11,6 +12,7 @@
<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
<%@ tag import="org.lamsfoundation.lams.util.Configuration"%>
<%@ tag import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -424,7 +426,58 @@
+
+ <%-- 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:
+
+
+
+
+ --%>
+
+
+
+
+
+
+
+
+
+
+
+
+ ${fn:trim(fn:split(item,'|')[0])}
+ ${fn:trim(fn:split(item,'|')[1])}
+
+
+
+ ${bLabel}
+
+
+ ${bLabel}
+
+
+
+
+
+
+
+
+
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
+++ lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -18,17 +18,15 @@
-
-
-
-
-
-
-
-
-
+ <%-- Build the breadcrumb --%>
+ admin/sysadminstart.do |
+ . |
+
+
+
+
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/disabledusers.jsp (.../disabledusers.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/disabledusers.jsp (.../disabledusers.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -15,8 +15,13 @@
${title}:
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ ${breadcrumbItems}, . |
+
+
+
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -55,17 +55,15 @@
-
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ . |
+
+
+
+
+
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -57,17 +57,14 @@
-
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ . |
+
+
+
+
Index: lams_admin/web/integration/ltiConsumer.jsp
===================================================================
diff -u -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/integration/ltiConsumer.jsp (.../ltiConsumer.jsp) (revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
+++ lams_admin/web/integration/ltiConsumer.jsp (.../ltiConsumer.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -41,20 +41,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ admin/ltiConsumerManagement/start.do |
+ . |
+
+
+
+
Index: lams_admin/web/integration/ltiConsumerList.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/integration/ltiConsumerList.jsp (.../ltiConsumerList.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/integration/ltiConsumerList.jsp (.../ltiConsumerList.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -20,16 +20,13 @@
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ . |
+
+
+
Index: lams_admin/web/integration/serverlist.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/integration/serverlist.jsp (.../serverlist.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/integration/serverlist.jsp (.../serverlist.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -19,17 +19,13 @@
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ . |
+
+
Index: lams_admin/web/integration/servermaintain.jsp
===================================================================
diff -u -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/integration/servermaintain.jsp (.../servermaintain.jsp) (revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
+++ lams_admin/web/integration/servermaintain.jsp (.../servermaintain.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -59,20 +59,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ admin/extserver/serverlist.do|
+ . |
+
+
+
+
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -rd9b778972278f38d31db9bff83b29aec34ce12f5
--- lams_admin/web/logevent.jsp (.../logevent.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/logevent.jsp (.../logevent.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5)
@@ -231,17 +231,13 @@
-
-
-
-
-
-
-
-
-
-
+ <%-- Build breadcrumb --%>
+ admin/sysadminstart.do |
+ ${breadcrumbItems}, . |
+
+
+