Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 30 more files in changeset.
LDEV-5454 fix JSP formatting

LDEV-5424 boostrap5 Daco's monitoring

    • -44
    • +115
    ./monitoring/editactivity.jsp
    • -25
    • +27
    ./monitoring/questionSummaries.jsp
  1. … 5 more files in changeset.
LDEV-5454 fix JSP formatting

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

    • -2
    • +2
    ./learning/listRecordsHorizontalPart.jsp
  1. … 50 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 28 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5397 remove autofocus

When someone using an screen readers access a page, by forcing the user to focus on a field form, then all the instructions and page structure is skipped which can be quite confusing

  1. … 4 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 514 more files in changeset.
LDEV-5397 make sure all buttons have proper "type" attribute

  1. … 24 more files in changeset.
LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

  1. … 15 more files in changeset.
LDEV-5397 Reintroduce websocket library to Page tag

    • -217
    • +207
    ./learning/questionSummaries.jsp
  1. … 34 more files in changeset.
Merge v4.7 into LDEV-5397

  1. … 77 more files in changeset.
LDEV-5397 bootstrap5 Daco tool's learning

    • -248
    • +222
    ./learning/listRecords.jsp
    • -172
    • +122
    ./learning/listRecordsHorizontalPart.jsp
    • -205
    • +194
    ./learning/questionSummaries.jsp
  1. … 4 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

  1. … 95 more files in changeset.
LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

    • -14
    • +37
    ./learning/listRecordsHorizontalPart.jsp
  1. … 101 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Leader selection

- Data collection

  1. … 15 more files in changeset.
LDEV-5397 remove obsolete jsps

  1. … 10 more files in changeset.
LDEV-5397 further bootstrap 5 related changes

Also

* change bootstrap classes from col-*-offset-* to offset-*-

* deprecated form-group

* .hidden-xs to .d-none .d-sm-block

* .pull-left to .float-start

* .pull-right to .float-end

* add class="activity-bottom-buttons"

    • -1
    • +1
    ./learning/listRecordsHorizontalPart.jsp
  1. … 112 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

    • -1
    • +1
    ./learning/listRecordsHorizontalPart.jsp
  1. … 55 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

    • -1
    • +1
    ./learning/listRecordsHorizontalPart.jsp
  1. … 55 more files in changeset.
LDEV-5294: minor UI improvements

LDEV-5257 Get rid of obsolete prototype.js

  1. … 2 more files in changeset.
LDEV-5219 Use versioned JS import for gate check JS file

  1. … 54 more files in changeset.
LDEV-5219 Check gate after Daco activity

LDEV-5213 Replace volatile JS imports with their non-cached version

    • -1
    • +1
    ./learning/listRecordsHorizontalPart.jsp
  1. … 89 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 81 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

  1. … 52 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 197 more files in changeset.