Index: lams_central/web/css/components.css =================================================================== diff -u -r88c7c55238081db780f07da8a950a47d201b05a2 -rff9f51378eb2ac41ff5c96ba9263f1d51b37a075 --- lams_central/web/css/components.css (.../components.css) (revision 88c7c55238081db780f07da8a950a47d201b05a2) +++ lams_central/web/css/components.css (.../components.css) (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -274,6 +274,7 @@ flex-direction: column; transition: all .3s ease; transform: translateX(-7rem); + z-index: 1; } .component-sidebar.active { Index: lams_central/web/css/vertical-timeline.css =================================================================== diff -u --- lams_central/web/css/vertical-timeline.css (revision 0) +++ lams_central/web/css/vertical-timeline.css (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -0,0 +1,183 @@ +/* +Based on +https://www.bootdey.com/snippets/view/tickets-timeline +*/ + +.vertical-timeline { + position: relative; + margin-bottom: 30px; +} +.vertical-timeline.timeline-sm .timeline-entry { + margin-bottom: 20px !important; +} +.vertical-timeline.timeline-sm .timeline-entry .timeline-entry-inner .timeline-label { + padding: 1em; +} +.vertical-timeline:before, +.vertical-timeline:after { + content: " "; + display: table; +} +.vertical-timeline:after { + clear: both; +} +.vertical-timeline:before { + content: ''; + position: absolute; + display: block; + width: 7px; + background: #ffffff; + left: 50%; + top: 20px; + bottom: 20px; + margin-left: -4px; +} + +.vertical-timeline .timeline-entry { + position: relative; + width: 50%; + float: right; + margin-bottom: 70px; + clear: both; +} +.vertical-timeline .timeline-entry:before, +.vertical-timeline .timeline-entry:after { + content: " "; + display: table; +} +.vertical-timeline .timeline-entry:after { + clear: both; +} +.vertical-timeline .timeline-entry.begin { + margin-bottom: 0; +} +.vertical-timeline .timeline-entry.left-aligned { + float: left; +} +.vertical-timeline .timeline-entry.left-aligned .timeline-entry-inner { + margin-left: 0; + margin-right: -28px; +} +.vertical-timeline .timeline-entry.left-aligned .timeline-entry-inner .timeline-time { + left: auto; + right: -115px; + text-align: left; +} +.vertical-timeline .timeline-entry.left-aligned .timeline-entry-inner .timeline-icon { + float: right; +} +.vertical-timeline .timeline-entry.left-aligned .timeline-entry-inner .timeline-label { + margin-left: 0; + margin-right: 85px; +} +.vertical-timeline .timeline-entry.left-aligned .timeline-entry-inner .timeline-label:after { + left: auto; + right: 0; + margin-left: 0; + margin-right: -9px; + -moz-transform: rotate(180deg); + -o-transform: rotate(180deg); + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.vertical-timeline .timeline-entry .timeline-entry-inner { + position: relative; + margin-left: -31px; +} +.vertical-timeline .timeline-entry .timeline-entry-inner:before, +.vertical-timeline .timeline-entry .timeline-entry-inner:after { + content: " "; + display: table; +} +.vertical-timeline .timeline-entry .timeline-entry-inner:after { + clear: both; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-time { + position: absolute; + left: -115px; + text-align: right; + padding: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-time > span { + display: block; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-time > span:first-child { + font-size: 18px; + font-weight: bold; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-time > span:last-child { + font-size: 12px; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon { + background: #fff; + color: #999999; + display: block; + width: 60px; + height: 60px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; + border-radius: 50%; + text-align: center; + border: 7px solid #ffffff; + line-height: 45px; + font-size: 15px; + float: left; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-label { + position: relative; + background: #ffffff; + padding: 1.7em; + margin-left: 85px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-label:after { + content: ''; + display: block; + position: absolute; + width: 0; + height: 0; + border-style: solid; + border-width: 9px 9px 9px 0; + border-color: transparent #ffffff transparent transparent; + left: 0; + top: 20px; + margin-left: -9px; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-label p .timeline-img { + margin: 5px 10px 0 0; +} +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-label p .timeline-img.pull-right { + margin: 5px 0 0 10px; +} + +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.bg-success ~ .timeline-label:after { + margin-left: -13px; + border-color: transparent var(--bs-success) transparent transparent; +} + +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.bg-success ~ .timeline-label{ + border-left: thick solid var(--bs-success); +} + +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.bg-primary ~ .timeline-label:after { + margin-left: -13px; + border-color: transparent var(--bs-primary) transparent transparent; +} + +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.bg-primary ~ .timeline-label{ + border-left: thick solid var(--bs-primary); +} + +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon img { + width: 25px; +} \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java =================================================================== diff -u -r2027920d8ebc25042b825f7ba175a93f725f15dc -rff9f51378eb2ac41ff5c96ba9263f1d51b37a075 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java (.../LearnerController.java) (revision 2027920d8ebc25042b825f7ba175a93f725f15dc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java (.../LearnerController.java) (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learning.presence.PresenceWebsocketServer; @@ -404,6 +405,12 @@ } activityJSON.put("type", type); + // temporary code for monitoring UI upgrade + Activity activityObject = (Activity) userManagementService.findById(Activity.class, activity.getActivityId()); + if (StringUtils.isNotBlank(activityObject.getLibraryActivityUiImage())) { + activityJSON.put("iconURL", activityObject.getLibraryActivityUiImage()); + } + if (activity.getChildActivities() != null) { for (ActivityURL childActivity : activity.getChildActivities()) { activityJSON.withArray("childActivities") Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -r8b539226552978ff77efe129fff621ec8b660f59 -rff9f51378eb2ac41ff5c96ba9263f1d51b37a075 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 8b539226552978ff77efe129fff621ec8b660f59) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -1131,4 +1131,8 @@ #canvas-container .popover-content-with-portrait { min-height: 220px; min-width: 220px; +} + +.vertical-timeline { + transform: translateX(-40%); } \ No newline at end of file Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -r8b539226552978ff77efe129fff621ec8b660f59 -rff9f51378eb2ac41ff5c96ba9263f1d51b37a075 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 8b539226552978ff77efe129fff621ec8b660f59) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -140,13 +140,13 @@ $('#openImButton').click(openChatWindow); -/* + //turn to inline mode for x-editable.js $.fn.editable.defaults.mode = 'inline'; // do not cancel on clicking outside of box $.fn.editable.defaults.onblur = 'ignore'; //enable renaming of lesson title - $('#lesson-name-strong').editable({ + $('#lesson-name').editable({ type: 'text', pk: lessonId, url: LAMS_URL + 'monitoring/monitoring/renameLesson.do?' + $("#csrf-form", window.parent.document).serialize(), @@ -169,7 +169,7 @@ }).on('hidden', function(e, reason) { $(this).nextAll('i.fa-pencil').show(); }); - */ + // sets up calendar for schedule date choice $('#scheduleDatetimeField').datetimepicker({ 'minDate' : 0 Index: lams_monitoring/web/monitor-learners-tab.jsp =================================================================== diff -u -r8b539226552978ff77efe129fff621ec8b660f59 -rff9f51378eb2ac41ff5c96ba9263f1d51b37a075 --- lams_monitoring/web/monitor-learners-tab.jsp (.../monitor-learners-tab.jsp) (revision 8b539226552978ff77efe129fff621ec8b660f59) +++ lams_monitoring/web/monitor-learners-tab.jsp (.../monitor-learners-tab.jsp) (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -1 +1,95 @@ + +<%@ include file="/taglibs.jsp"%> + + +
+
+
+ +
+ +
+
+

New Project

+ +

Tolerably earnestly middleton extremely distrusts she boy now + not. Add and offered prepare how cordial.

+
+
+
+
+
+ +
+ +
+
+

Job Meeting

+ +

Caulie dandelion maize lentil collard greens radish arugula + sweet pepper water spinach kombu courgette.

+
+
+
+
+
+ +
+ +
+
+

Daily Feeds

+ +

+ Parsley amaranth tigernut + silver beet maize fennel spinach ricebean black-eyed. Tolerably + earnestly middleton extremely distrusts she boy now not. Add and + offered prepare how cordial. +

+
+
+
+
+ +
+
+
+
Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r88c7c55238081db780f07da8a950a47d201b05a2 -rff9f51378eb2ac41ff5c96ba9263f1d51b37a075 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 88c7c55238081db780f07da8a950a47d201b05a2) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision ff9f51378eb2ac41ff5c96ba9263f1d51b37a075) @@ -10,6 +10,7 @@ +