Index: lams_admin/web/WEB-INF/struts-config.xml =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -453,7 +453,7 @@ + <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem"%> <%@ include file="/taglibs.jsp"%> -

+ + + + + ${title} - - - - - + + + + + + + + + + + ${title}: + + + + + + + +

- - + + + + + + + + + <%@ include file="/config/items.jsp"%> + +
+ + + + " /> +
+ + + + + +

- + + + + + + + + + <%@ include file="/config/items.jsp"%> + +
+ + + + " /> +
+ + + + -
- - - - - - -
- + + + + + + Index: lams_admin/web/config/items.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/config/items.jsp (.../items.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/config/items.jsp (.../items.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,36 +1,39 @@ <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %> <%@ include file="/taglibs.jsp"%> - +
- + - + - +
  * - + <%= ConfigurationItem.BOOLEAN_FORMAT %> - - true - false   - + + true + false   + - +
- + + + + Index: lams_admin/web/error.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/error.jsp (.../error.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/error.jsp (.../error.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,11 +1,12 @@ + + <%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> - Index: lams_admin/web/import/importexcel.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,120 +1,230 @@ + + <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.admin.service.IImportService"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> <%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> - -<%=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)%> + + + + + ${title} -<%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> -<%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> + + + + + + - - - - - + + + + + + + + + + ${title}: + + + + + + + +

+ +

+ +

+ +

+

+

+

+
+ + : +
    +
  • + +
    • + +
    • +     + +
    • +     + +
    • +     + +
    • +     +
+ +
+

+ +

+ + + + + + + +
+ + + + value="" /> +   +
+ + + + + + +

+ +

+ +

+ +

+

+

+

+
+ + : +
    +
  • + +
    • + +
    • +     + +
    • +     + +
    • +     + +
    • +     +
+ +
+

+ +

+ + + + + + + +
+ + + + value="" /> +   +
+ + + + + -

- -

-

- -

-

-

-

-
- - : -
    -
  • - -
    • - -
    • -     - -
    • -     - -
    • -     - -
    • -     -
- -
-

- -

+ + - - - - -
- - - - - - -   -
- \ No newline at end of file Index: lams_admin/web/ldap.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/ldap.jsp (.../ldap.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/ldap.jsp (.../ldap.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,90 +1,207 @@ + + <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %> <%@ page import="org.lamsfoundation.lams.usermanagement.service.ILdapService" %> - + + + + + + + + + + ${title}: + + + + + + + +

-

+
+
+
+
+ +
+ + + <%@ include file="/config/items.jsp"%> +
+ " /> + + " /> +
+ + +
+
+ +
+
+
+
+ +
+

+

+ + +

+ + + +

+ + + + +

+
    + +
  • + +
      + +
      • +       +
    +
    • +     + +
    • +     + +
    • +     + +
    • +     + +
    • +     +
+ + + " onclick='startSync();'/> + +
+
+ + + + +

-
-
-
-
+
+
+
+
+ +
+ + + <%@ include file="/config/items.jsp"%> +
+ " /> + + " /> +
+ + +
+
+ +
+
+
+
+ +
+

+

+ + +

+ + + +

+ + + + +

+
    + +
  • + +
      + +
      • +       +
    +
    • +     + +
    • +     + +
    • +     + +
    • +     + +
    • +     +
+ + + " onclick='startSync();'/> + +
+
+ + + -
- - - - -
- - - -
- - -
-
-
-
-
-
+ + -
-

-

- - -

- - - -

- - - - -

-
    - -
  • - -
      - -
      • -       -
    -
    • -     - -
    • -     - -
    • -     - -
    • -     - -
    • -     -
- - - " onclick='startSync();'/> - -
-
+ + + Index: lams_admin/web/lti/ltiConsumer.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/lti/ltiConsumer.jsp (.../ltiConsumer.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/lti/ltiConsumer.jsp (.../ltiConsumer.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,95 +1,213 @@ + + <%@ include file="/taglibs.jsp"%> - - - - - - -

- - - + - - - -

+ + + + + + + + + ${title}: + - - - + + + + + +

+ + + + + + + +

+ + <%-- Error Messages --%> + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 *
 *
 *
:
 *
:
:${lessonFinishUrl}
:
+ +
+ + + + " /> +
+ + - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - -
 *
 *
 *
:
 *
:
:${lessonFinishUrl}
:
- -
- - - - - - -
- + +

+ + + + + + + +

+ + <%-- Error Messages --%> + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 *
 *
 *
:
 *
:
:${lessonFinishUrl}
:
+ +
+ + + + " /> +
+ + + + + + + + + + + Index: lams_admin/web/lti/ltiConsumerList.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/lti/ltiConsumerList.jsp (.../ltiConsumerList.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/lti/ltiConsumerList.jsp (.../ltiConsumerList.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,67 +1,175 @@ + + <%@ include file="/taglibs.jsp"%> -

- - - -

+ + + + + ${title} - - - - - - - - - - - + + + + + + + + + + + ${title}: + - - - - - - - - - - - -
- - - - - - - - - - - - -   - - - - - - - - - - - - -   - - - -
+ + + + + +

+ + + +

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

${fn:length(ltiConsumers)} 

+ + + + + + + + + +

+ + + +

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

${fn:length(ltiConsumers)} 

+ + -

${fn:length(ltiConsumers)} 

+ + + - + + + + + Index: lams_admin/web/organisation/cloneStart.jsp =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/organisation/cloneStart.jsp (.../cloneStart.jsp) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/web/organisation/cloneStart.jsp (.../cloneStart.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -199,8 +199,7 @@ -
- + "> @@ -308,8 +307,7 @@ - - + "> Index: lams_admin/web/organisation/courseAdminEdit.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/organisation/courseAdminEdit.jsp (.../courseAdminEdit.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/organisation/courseAdminEdit.jsp (.../courseAdminEdit.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,83 +1,206 @@ + + <%@ include file="/taglibs.jsp"%> - - - - - - - - - - -

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

+ + + + + ${title} -

- -

+ + + + + + + + + + + ${title}: + + + + + + + + + + + + + + + + + +

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

+ +

+ +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: *
:
:
: + + + + + + + +
: + + + + + +
 
+ + . +
 
+ +
+ + " /> + " /> +
+ + + + + + + + + + + + + + + + + + +

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

+ +

+ +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: *
:
:
: + + + + + + + +
: + + + + + +
 
+ + . +
 
+ +
+ + " /> + " /> +
+ + + + + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: *
:
:
: - - - - - - - -
: - - - - - -
 
- - . -
 
-
- - - -
+ + - + + + \ No newline at end of file Index: lams_admin/web/organisation/createOrEdit.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,168 +1,353 @@ + + <%@ include file="/taglibs.jsp"%> - + + + - - - - - - -

- - : " class="btn btn-default"> - + + + + + + + ${title}: + - - : " class="btn btn-default"> - -

+ + + + + + + + + + +

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

+ +

+ +    + + < + + + + + + + +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
*
+ + + + + + + +
+ + + + + +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ +
+ +
+ +
+ + +
+ + +  . +
+ + +
+ + " /> +
+ + -

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

+ + + + + + + + + +

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

+ +

+ +    + + < + + + + + + + +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
*
+ + + + + + + +
+ + + + + +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ +
+ +
+ +
+ + +
+ + +  . +
+ + +
+ + " /> +
+ + + + + + -
- + + - - - - - - - - - - - - - - - - - - - - - -
*
- - - - - - - -
- - - - - -
- - -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- - -
- -
- -
- -
- - -
- - -  . -
- - -
- - -
- Index: lams_admin/web/organisation/deleteAllLessons.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/organisation/deleteAllLessons.jsp (.../deleteAllLessons.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/organisation/deleteAllLessons.jsp (.../deleteAllLessons.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,76 +1,147 @@ + + <%@ include file="/taglibs.jsp"%> - - + - if (lessonCount == 0) { - deleteButton.prop('disabled', true); - return; - } + + + }); + } + + + + + + + ${title}: + + + + + + + +

+ + : +

+ + <%-- Error Messages --%> + + + + + + + + + +  ${lessonCount} / ${lessonCount} + + +
+ +
+ + + + + + +

+ + : +

+ + <%-- Error Messages --%> + + + + + + + + + +  ${lessonCount} / ${lessonCount} + + +
+ +
+ + + -

- - : -

- + + - ${lessonCount} / ${lessonCount} - -
- -
\ No newline at end of file Index: lams_admin/web/organisation/list.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/organisation/list.jsp (.../list.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,315 +1,565 @@ + + <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %> <%@ page import=" org.lamsfoundation.lams.util.FileUtil" %> - -<%= FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.toPattern() %> - - - + + + + + ${title} - - - - - + - $(document).ready(function(){ - - $(".tablesorter").tablesorter({ - theme: 'bootstrap', - headerTemplate : '{content} {icon}', - widgets: ["uitheme","zebra", "filter"], - headers: { 0: { filter: false }, 2: { filter: false }, 3: { filter: false } }, - widgetOptions : { - // include column filters - filter_columnFilters: true, - filter_placeholder: { search : 'Search...' }, - }, - widthFixed: true, - sortInitialOrder: 'desc', - sortList: [[1]] - }); + + <%= FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.toPattern() %> + + + + -
- - + + + + + + + + + + + ${title}: + + + + + + + + + + +
+ + - <% if (request.isUserInRole(Role.SYSADMIN)) { %> - " class="btn btn-default"> - " class="btn btn-default"> - <% } %> + + "> + + + + + + + "> +
+

+ + + + " /> +   + + + + +   + : + + + + +

+ +
+
+
+ + +
+ + " id="editCourse" class="btn btn-default"> + + " id="manageUsers" class="btn btn-default"> + + <% if (request.isUserInRole(Role.SYSADMIN)) { %> + " class="btn btn-default"> + " class="btn btn-default"> + <% } %> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
+
+
+ +
+
+ + + + + " onclick=javascript:document.location='' /> +
+
+ + + " /> +   + + + + +   + : + + + + +

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

+ +
+
+
+ +
+ +  " onclick=javascript:document.location='organisation/edit.do?orgId=' /> + + " onclick=javascript:document.location='usermanage.do?org=' /> + <% if (request.isUserInRole(Role.SYSADMIN)) { %> + " onclick="javascript:document.location='clone.do?groupId=';"> + " class="btn btn-default"> + <% } %> +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
+ +
+ + + + +
+ + + Id + + + + + + + + + + + +
+ + + + + + + + + +
+ +
+ + + + + "> + + + + + + + "> +
-
-
+

+ + + + " /> +   + + + + +   + : + + + + +

+ +
+
+
+ + +
+ + " id="editCourse" class="btn btn-default"> + + " id="manageUsers" class="btn btn-default"> + + <% if (request.isUserInRole(Role.SYSADMIN)) { %> + " class="btn btn-default"> + " class="btn btn-default"> + <% } %> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
+
+
+ +
+
+ + + + + " onclick=javascript:document.location='' /> +
+
+ + + " /> +   + + + + +   + : + + + + +

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

+ +
+
+
+ +
+ +  " onclick=javascript:document.location='organisation/edit.do?orgId=' /> + + " onclick=javascript:document.location='usermanage.do?org=' /> + <% if (request.isUserInRole(Role.SYSADMIN)) { %> + " onclick="javascript:document.location='clone.do?groupId=';"> + " class="btn btn-default"> + <% } %> +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
+ +
+ + + + +
+ + + Id + + + + + + + + + + + +
+ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
:
:
:
:
:
:
:
:
-
- - -
-
- - - - - - " onclick=javascript:document.location='' /> -
-
- - " /> -   - - - - -   - : - - + + - -

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

- -
-
-
- -
- -  " onclick=javascript:document.location='organisation.do?method=edit&orgId=' /> - - " onclick=javascript:document.location='usermanage.do?org=' /> - <% if (request.isUserInRole(Role.SYSADMIN)) { %> - " onclick="javascript:document.location='clone.do?groupId=';"> - " class="btn btn-default"> - <% } %> -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
:
:
:
:
:
:
:
:
:
- -
- - -
- - - Id - - - - - - - - - - - -
- + + Index: lams_admin/web/remove.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 --- lams_admin/web/remove.jsp (.../remove.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/remove.jsp (.../remove.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) @@ -1,64 +1,162 @@ + + <%@ include file="/taglibs.jsp"%> -
+ + + + + ${title} - - - - - - - - + + + + + + + + + + + ${title}: + + + + + + + + - -
-
- - - -
-
-

-    -    -
- -

- - - - - -
- '" /> - '" /> -
-
-
- + + + + + + + + + + +
+
+ + + +
+
+

+    +    +
+ +

+ + + + +
+ '" /> + '" /> +
+
+
+ + + +
+
+ + + +
+
+

  

+ + + + +
+ '" /> + '" /> +
+
+
+ + + +