Clone
 

andrey balan <balandrey@gmail.com> in lams-github

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

    • -58
    • +66
    /lams_monitoring/web/monitor.jsp
    • -3
    • +3
    /lams_monitoring/web/tblmonitor/teams.jsp
  1. … 16 more files in changeset.
LDEV-5424 bootstrap5 Notebook's monitoring

LDEV-5424 boostrap5 Mindmap's monitoring

LDEV-5456 fix updating image's properties directly from tool's monitoring

LDEV-5424 boostrap5 Image Gallery's monitoring

    • -14
    • +0
    /lams_tool_images/web/common/header.jsp
LDEV-5454 fix JSP formatting

LDEV-5455 fix exception on pressing "Print questions" button in monitoring

LDEV-5424 boostrap5 Share Resources' monitoring

LDEV-5455 fix exception on pressing "Print questions" button in monitoring

LDEV-5424 boostrap5 Q&A's monitoring

    • -12
    • +154
    /lams_tool_laqa/web/monitoring/Edit.jsp
LDEV-5397 Redesign page with group results to make it similar to the page where learner chooses a group

    • -35
    • +30
    /lams_learning/web/grouping/show.jsp
LDEV-5424 switch to using lams:TSTable5 tag

LDEV-5424 boostrap5 Daco's monitoring

    • -19
    • +11
    /lams_tool_daco/web/common/jqueryheader.jsp
    • -13
    • +0
    /lams_tool_daco/web/pages/learning/learning.jsp
LDEV-5454 fix JSP formatting

LDEV-5424 boostrap5 Voting's monitoring

    • -19
    • +9
    /lams_tool_vote/web/common/monitorheader.jsp
    • -2
    • +2
    /lams_tool_vote/web/monitoring/Edit.jsp
LDEV-5424 boostrap5 Submit files' monitoring

LDEV-5397 display sequencial letters a) b) c) at the same line as answers

* proper align for jqgrid's search in monitoring

LDEV-5424 boostrap5 Peerreview tool's monitoring

LDEV-5424 fix for the cases when fontawesome CSS is linked beforehand in a tag and its rules got overwritten by the later import of jqgrid

    • -0
    • +10
    /lams_central/web/css/free.ui.jqgrid.custom.scss
LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs

* Remove dots from the analytics chart as per Ernie's request

    • -4
    • +0
    /lams_central/web/css/_chart_base.scss
LDEV-5424 Fix issues. Add Scrollspy

    • -4
    • +0
    /lams_central/web/css/_chart_base.scss
LDEV-5424 introduce new variation of monitoring interface. Assessment tool

LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 12 more files in changeset.
LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

    • -12
    • +35
    /lams_admin/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_gradebook/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_learning/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_monitoring/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag
  1. … 48 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_admin/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

# lams_gradebook/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/css/components-learner.scss

# lams_monitoring/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/pages/learning/results/essay.jsp

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

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

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

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

# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

# lams_tool_task/web/WEB-INF/tags/PageLearner.tag

# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

# lams_www/web/WEB-INF/tags/PageLearner.tag

LDEV-5445 Assessment learning. Fix mode=teaher for situations when leader hasn't committed his response yet

LDEV-5397 improve Submit Files learning's UI

LDEV-5397 force card-header's text (even if it has some rich text formatting) to follow this card-header's color theme

Merge branch 'LDEV-5445' into v4.8

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

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

    • -9
    • +11
    /lams_gradebook/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_learning/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_monitoring/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
    • -34
    • +36
    /lams_tool_doku/web/pages/learning/learning.jsp
  1. … 38 more files in changeset.