lams_monitoring

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

  1. … 58 more files in changeset.
LDEV-5083 Improve table and icons colouring

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

    • -48
    • +68
    ./web/gate/openGateSingleUser.jsp
    • -104
    • +0
    ./web/gate/openGateSingleUser5.jsp
    • -23
    • +17
    ./web/gate/permissionGateContent.jsp
    • -61
    • +0
    ./web/gate/permissionGateContent5.jsp
  1. … 45 more files in changeset.
LDEV-5083 Refactor new UI CSS files

    • -1
    • +4
    ./web/css/components-monitoring-responsive.css
    • -1075
    • +157
    ./web/css/components-monitoring.css
  1. … 3 more files in changeset.
LDEV-5083 On load update sequence tab only one

LDEV-5083 Clear completed learner icons before re-adding them

LDEV-5083 Add Countdown Timer nav button opened in separate tab

LDEV-5083 Move timing limits from Lesson Completion to Required Tasks

It makes more sense to keep them there.

LDEV-5083 Update time limits on dashboard using Flux

  1. … 5 more files in changeset.
LDEV-5083 Add frontend for displaying running time limits in lesson

  1. … 1 more file in changeset.
LDEV-5083 Add backend for fetching running time limits in lesson

  1. … 6 more files in changeset.
LDEV-5083 Show Burning Question nav button only if they are enabled

  1. … 2 more files in changeset.
LDEV-5083 Add Lesson Instructions panel

LDEV-5083 Add started / total learners count to Lesson Completion panel

LDEV-5083 Fix mark editing in Gradebook

  1. … 1 more file in changeset.
LDEV-5083 Always show number of learners in tool activity

LDEV-5083 Fix disappearing searched learner icon

LDEV-5083 Remove Other button in left navigation bar

LDEV-5083 Make Student Choices the default view in RAT and AE tabs

LDEV-5083 Add i18n label for "Edit lesson name" button

LDEV-5083 Move Live Edit button Edit Lesson panel

LDEV-5083 Swap Required Tasks and Lesson Completion Chart panels

LDEV-5083 Remove Gates tab

LDEV-5083 Rename Design tab to Dashboard

LDEV-5083 Fix missing timeago library in gate status view

LDEV-5083 Improve Gates control on Sequence tab

LDEV-5083 Improve accessibility by allowing focus with TAB button

  1. … 3 more files in changeset.
LDEV-5083 Remove nav buttons labels on smaller screens

  1. … 1 more file in changeset.
LDEV-5083 Remove "Return" navigation button

LDEV-5083 Fix various layout issues

This patch covers most of issues raised the UX designer.

    • -5
    • +16
    ./web/css/components-monitoring.css
  1. … 7 more files in changeset.