Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -133,6 +133,7 @@ // display parent org breadcrumb link request.setAttribute("parentGroupName", pOrg.getName()); + request.setAttribute("parentCode", pOrg.getCode()); request.setAttribute("parentGroupId", pOrg.getOrganisationId()); } else { request.setAttribute("orgManageForm", orgManageForm); Index: lams_admin/web/organisation/createOrEdit.jsp =================================================================== diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63) +++ lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -36,138 +36,158 @@ - + + <%-- Build breadcrumb --%> + admin/orgmanage.do?org=1" | + + + ${breadcrumbItems}, admin/orgmanage.do?org=${organisationForm.parentId}" | + + + + ${breadcrumbItems}, admin/orgmanage.do?org=${organisationForm.orgId} | + + ${breadcrumbItems}, . | + + + + - - - - - -

- + + + + + +

+ +    + + + + + - : " class="btn btn-default"> + - - - : " class="btn btn-default"> - -

+ +

+ + + + + +
+  * + + + + + + + + -

- -    - - - - - - - - - -

+ - + + + + + - +
+ + +
+ +
- - - - - - - - - - - - - - - - - -
*
- - - - - -
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + +
+ + +
+ +
+ + +
+ + - -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- - -
- -
+
+ + +  . +
-
- -
+ - -
- - -  . -
- - -
- - " /> -
+
+ + " /> +
+ +
+ Index: lams_admin/web/organisation/list.jsp =================================================================== diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884) +++ lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -16,23 +16,16 @@ - - + + @@ -45,12 +38,19 @@ $(".tablesorter").tablesorter({ theme: 'bootstrap', headerTemplate : '{content} {icon}', + dateFormat : "mmddyyyy", widgets: ["uitheme","zebra", "filter"], - headers: { 0: { filter: false }, 2: { filter: false }, 3: { filter: false } }, + headers: { 0: { filter: false }, 2: { filter: false }, 3: { filter: false, dateFormat: "ddmmyyyy" } }, widgetOptions : { // include column filters filter_columnFilters: true, filter_placeholder: { search : 'Search...' }, + filter_cssFilter: [ + 'form-control form-control-sm', + 'form-control form-control-sm', + 'form-control form-control-sm', + 'form-control form-control-sm' + ] }, widthFixed: true, sortInitialOrder: 'desc', @@ -81,7 +81,7 @@ rows += ''; rows += ''; - rows += ''; + rows += ''; rows += orgData["name"]; rows += ''; rows += ''; @@ -120,25 +120,39 @@ - + <%-- Build the breadcrumb --%> + + .| + + + admin/orgmanage.do?org=1 | + ${breadcrumbItems}, . | : + + + admin/orgmanage.do?org=1 | + ${breadcrumbItems}, admin/orgmanage.do?org= | : + ${breadcrumbItems}, . | : + + +
-
+
- - + + - "> + "> - "> + ">

@@ -147,7 +161,7 @@   - + @@ -156,28 +170,62 @@ - -

- -
-
-
- - -
- - " id="editCourse" class="btn btn-default"> - - " id="manageUsers" class="btn btn-default"> - - - " class="btn btn-default"> - " class="btn btn-default"> - + +
+
+ + + +
+ + " id="editCourse" class="btn btn-outline-secondary btn-sm"> + + " id="manageUsers" class="btn btn-outline-secondary btn-sm"> + + + " class="btn btn-outline-secondary btn-sm"> + " class="btn btn-outline-secondary btn-sm"> + +
+
+
+
+
+
+
+ Active +
+
+
+
+
+
9.823
+
Members online
+
+
+ +
ActionAnother actionSomething else here
+
+
+
+ +
+
+
+
3
-
+ + @@ -194,7 +242,7 @@ - + @@ -238,33 +286,32 @@ -

- - : " class="btn btn-default"> -

-  " onclick=javascript:document.location='organisation/edit.do?orgId=' /> + " onclick=javascript:document.location='organisation/edit.do?orgId=' /> - " onclick=javascript:document.location='usermanage.do?org=' /> + " onclick=javascript:document.location='usermanage.do?org=' /> - " onclick="javascript:document.location='clone/start.do?groupId=';"> - " class="btn btn-default"> + " onclick="javascript:document.location='clone/start.do?groupId=';"> + " class="btn btn-outline-secondary btn-sm">
-
:
:
+
+ - - + + + @@ -279,7 +326,7 @@ - + @@ -291,11 +338,12 @@ - + +
:: +
:
:
:
:HH
Index: lams_admin/web/sessionmaintain.jsp =================================================================== diff -u -rd9b778972278f38d31db9bff83b29aec34ce12f5 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/sessionmaintain.jsp (.../sessionmaintain.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5) +++ lams_admin/web/sessionmaintain.jsp (.../sessionmaintain.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -31,10 +31,10 @@ <%-- Build breadcrumb --%> - admin/sysadminstart.do | - . | ${title} - + admin/sysadminstart.do | + ${breadcrumbItems}, . | ${title} +
${fn:length(sessions)} 
Index: lams_admin/web/timezoneManagement.jsp =================================================================== diff -u -rd9b778972278f38d31db9bff83b29aec34ce12f5 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5) +++ lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -47,9 +47,9 @@ <%-- Build breadcrumb --%> - admin/sysadminstart.do | - . | - + admin/sysadminstart.do | + ${breadcrumbItems}, . | + Index: lams_admin/web/userlist.jsp =================================================================== diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 3e64defe6b8c56c0d3fd42203218e112e3745884) +++ lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -53,17 +53,23 @@ - - + <%-- Build breadcrumb --%> + /admin/orgmanage.do?org=1| + + + ${breadcrumbItems}, admin/orgmanage.do?org=${userManageForm.orgId} | + + + ${breadcrumbItems}, admin/orgmanage.do?org=${pOrgId} | + ${breadcrumbItems}, admin/orgmanage.do?org=${userManageForm.orgId} | + + + ${breadcrumbItems}, . | + + +

Index: lams_admin/web/userrole.jsp =================================================================== diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/userrole.jsp (.../userrole.jsp) (revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b) +++ lams_admin/web/userrole.jsp (.../userrole.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -15,8 +15,29 @@ ${title}: - + <%-- Build breadcrumb --%> + admin/orgmanage.do?org=1 | + + + ${breadcrumbItems}, admin/orgmanage.do?org=${pOrgId} | + ${breadcrumbItems}, admin/usermanage.do?org=${userRolesForm.orgId} | + + + + ${breadcrumbItems}, admin/orgmanage.do?org=${userRolesForm.orgId} | + + + ${breadcrumbItems}, admin/usermanage.do?org=${userRolesForm.orgId} | + + + + + ${breadcrumbItems}, . | + + + + @@ -43,15 +64,15 @@ -

+
:
-
+
:
-
+
@@ -72,8 +93,7 @@
- " class="btn btn-default"> - " /> + " class="btn btn-outline-secondary"> " />
Index: lams_admin/web/usersearchlist.jsp =================================================================== diff -u -rd9b778972278f38d31db9bff83b29aec34ce12f5 -r173b2cd2375bd1d02d41f55461d7948a41b680c1 --- lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision d9b778972278f38d31db9bff83b29aec34ce12f5) +++ lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) @@ -141,10 +141,9 @@ <%-- Build the breadcrumb --%> - admin/sysadminstart.do | - admin/orgmanage.do?org=1 | - . | ${title} - + admin/sysadminstart.do | + ${breadcrumbItems}, admin/orgmanage.do?org=1 | + ${breadcrumbItems},. | ${title}