Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java =================================================================== diff -u -r173b2cd2375bd1d02d41f55461d7948a41b680c1 -rcd031f542f0bc641e1e5cf48ca7efd0a4a5819e3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3) @@ -23,6 +23,7 @@ package org.lamsfoundation.lams.admin.web.controller; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.List; import javax.servlet.ServletException; @@ -109,6 +110,7 @@ : userManagementService.getUsersFromOrganisation(orgId).size(); String key = org == rootOrganisation ? "label.users.in.system" : "label.users.in.group"; request.setAttribute("numUsers", messageService.getMessage(key, new String[] { String.valueOf(numUsers) })); + request.setAttribute("totalUsers", numUsers); // Set OrgManageForm if (orgManageForm == null) { @@ -218,4 +220,4 @@ res.setContentType("application/json;charset=utf-8"); return responseJSON.toString(); } -} \ No newline at end of file +} Index: lams_admin/web/WEB-INF/tags/Page.tag =================================================================== diff -u -rd9b778972278f38d31db9bff83b29aec34ce12f5 -rcd031f542f0bc641e1e5cf48ca7efd0a4a5819e3 --- lams_admin/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d9b778972278f38d31db9bff83b29aec34ce12f5) +++ lams_admin/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3) @@ -410,7 +410,9 @@ -
+
+ + Skip to main content Index: lams_admin/web/WEB-INF/tags/Widget.tag =================================================================== diff -u --- lams_admin/web/WEB-INF/tags/Widget.tag (revision 0) +++ lams_admin/web/WEB-INF/tags/Widget.tag (revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3) @@ -0,0 +1,61 @@ +<%@ 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" %> + +<%@ attribute name="type" required="true" rtexprvalue="true"%> +<%@ attribute name="style" required="false" rtexprvalue="true"%> +<%@ attribute name="shadow" required="false" rtexprvalue="true"%> +<%@ attribute name="title" required="false" rtexprvalue="true"%> +<%@ attribute name="titleAlignment" required="false" rtexprvalue="true"%> +<%@ attribute name="titleFontSize" required="false" rtexprvalue="true"%> +<%@ attribute name="bodyText" required="false" rtexprvalue="true"%> +<%@ attribute name="bodyTextAlignment" required="false" rtexprvalue="true"%> +<%@ attribute name="bodyTextFontSize" required="false" rtexprvalue="true"%> + +<%@ attribute name="icon" required="false" rtexprvalue="true"%> +<%@ attribute name="iconLink" required="false" rtexprvalue="true"%> +<%@ attribute name="footerText" required="false" rtexprvalue="true"%> + + + + info + + + + text-left + + + + inherit + + + + text-left + + + + inherit + + + + shadow-none + + +
+
+
+ +
+
+
+
${title}
+
+
+ + + +
+
+
\ No newline at end of file Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rcd031f542f0bc641e1e5cf48ca7efd0a4a5819e3 --- lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f) +++ lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3) @@ -347,7 +347,11 @@ errors /WEB-INF/tags/Errors.tag - + + + Widget + /WEB-INF/tags/Widget.tag + textarea org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag Index: lams_admin/web/organisation/list.jsp =================================================================== diff -u -r173b2cd2375bd1d02d41f55461d7948a41b680c1 -rcd031f542f0bc641e1e5cf48ca7efd0a4a5819e3 --- lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 173b2cd2375bd1d02d41f55461d7948a41b680c1) +++ lams_admin/web/organisation/list.jsp (.../list.jsp) (revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3) @@ -29,6 +29,8 @@ + + @@ -38,9 +40,8 @@ $(".tablesorter").tablesorter({ theme: 'bootstrap', headerTemplate : '{content} {icon}', - dateFormat : "mmddyyyy", widgets: ["uitheme","zebra", "filter"], - headers: { 0: { filter: false }, 2: { filter: false }, 3: { filter: false, dateFormat: "ddmmyyyy" } }, + headers: { 0: { filter: false }, 2: { filter: false }, 3: { filter: false} }, widgetOptions : { // include column filters filter_columnFilters: true, @@ -73,6 +74,8 @@ for (i = 0; i < data.rows.length; i++){ var orgData = data.rows[i]; + + var formattedDate = new Date(orgData["createDate"]); rows += ''; @@ -90,8 +93,8 @@ rows += orgData["code"]; rows += ''; - rows += ''; - rows += orgData["createDate"]; + rows += ''; + rows += formattedDate rows += ''; rows += ''; @@ -170,124 +173,272 @@ - -
-
- - + -
- - " 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 -
-
+ + " class="badge badge-success py-2 px-2 pull-right text-uppercase">Active + +

+ + + +
+
+ + + + + +
+
+ + + + +
+
+ + + + +
+
+ + + +
+
+
+
+

+   Course settings +

+

+ Course managers can: +

+

+ Add new users + + + + + + + + + +
+ Browse all users + + + + + + + + +
+ Change course status + + + + + + + + +

+
-
-
-
-
-
9.823
-
Members online
-
- -
-
- -
-
-
-
3
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
:
:
:
:
:
:
:
-
-
-
- - - - - " onclick=javascript:document.location='' /> +
+ + + + +
+
+
+ +
+
+
+
+ +
+
- - - - " /> -   - - - - -   - : - + +
+ +
+ +

+ + " /> +   + + + + +   + + + +
+
+
+
+ + -
+ " class="badge badge-success py-2 px-2 pull-right text-uppercase">Active + +

+ + + +
+
+ + + + + +
+
+ + + + +
+
+ + + + +
+
+ + + +
+
+
+
+

+   Course settings +

+

+ Course managers can: +

+

+ Add new users + + + + + + + + + +
+ Browse all users + + + + + + + + +
+ Change course status + + + + + + + + +

+ +
+
+
+ +
+ + + + +
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
@@ -351,7 +502,7 @@ -
+
Id @@ -362,7 +513,7 @@ - +