Index: lams_central/web/css/components.css =================================================================== diff -u -rc921b1651e4291290d929f20e22be28fd4b38c20 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_central/web/css/components.css (.../components.css) (revision c921b1651e4291290d929f20e22be28fd4b38c20) +++ lams_central/web/css/components.css (.../components.css) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -346,7 +346,7 @@ } .component-page-wrapper .hamburger-box p { - font-family: mont-semibold, sans-serif; + font-family: mont-bold, sans-serif; font-size: 2rem; margin: 0; line-height: 1; Index: lams_central/web/includes/fonts/mont-semibold.ttf =================================================================== diff -u -r3212cc9d3d44d485a7fb6971a82327db71d7cec9 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f Binary files differ Index: lams_central/web/includes/javascript/dialog5.js =================================================================== diff -u -rf932b797330099220514e4c2acef885899567207 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_central/web/includes/javascript/dialog5.js (.../dialog5.js) (revision f932b797330099220514e4c2acef885899567207) +++ lams_central/web/includes/javascript/dialog5.js (.../dialog5.js) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -56,7 +56,6 @@ // use the input attributes or fall back to default ones initParams = $.extend({ 'autoOpen' : true, - 'modal' : false, 'draggable' : true, 'resizable' : extraButtons == true, 'startMaximized' : false, @@ -93,7 +92,10 @@ var draggable = initParams.draggable && ! /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); if (draggable) { modalDialog.draggable({ - 'cancel' : '.modal-body, button.close' + 'cancel' : '.modal-body, button.close', + 'revert' : function() { + return modalDialog.offset().top < -5; + } }); } dialog.data("isDraggable", draggable); @@ -103,98 +105,19 @@ dialog.data(initParams.data); } - dialog.on('show.bs.modal', initParams.modal ? initParams.open : function(event){ - - // skip hiding dialog if it's already shown, as bootstrap doesn't fire 'shown.bs.modal' event second time if dialog is already open - if (!dialog.data('shown')) { - dialog.css('visibility', 'hidden'); - } - - if (initParams.open) { - initParams.open.call(dialog, event); - } - - }); + dialog.on('show.bs.modal', initParams.open); dialog.on('hide.bs.modal', initParams.beforeClose); dialog.on('hidden.bs.modal', initParams.close); dialog.modal({ 'keyboard' : false, - 'backdrop' : initParams.modal ? 'static' : false + 'backdrop' : 'static' }); if (initParams.autoOpen) { dialog.modal('show'); } - if (!initParams.modal) { - // make the dialog non-modal - dialog.on('shown.bs.modal', function(){ - - // store 'shown.bs.modal' event was fired - dialog.data({ - 'shown' : true - }); - - // the main modal div is maximised, we need to shrink it - modalDialog.css({ - 'margin' : 0 - }); - dialog.width(modalDialog.outerWidth(true) + 15); - dialog.height(modalDialog.outerHeight(true) + 15); - // remove overlay - dialog.siblings('.modal-backdrop').remove(); - dialog.css('visibility', 'visible'); - - // center the dialog or put it into previously defined position - var position = dialog.data('position'); - if (position !== false) { - position = position || - (dialog.data('isCreateInParentWindow') ? - { - 'my' : 'center center', - 'at' : 'center center', - 'of' : targetWindow - } - : - { - 'my' : 'top', - 'at' : 'top+15px', - 'of' : window - } - ); - dialog.position(position); - } - - if (draggable) { - modalDialog.on('drag', function(event, ui){ - // pass the event to the dialog, not its internal element - dialog.offset({ - 'top' : Math.min(window.innerHeight - 30, Math.max(0, ui.offset.top + 5)), - 'left' : Math.min(window.innerWidth - 200, Math.max(0, ui.offset.left + 5)) - }); - modalDialog.css({ - 'position' : 'static' - }); - }); - } - - if (initParams.resizable) { - modalContent.on('resize', function(event, ui){ - dialog.width(ui.size.width + 15); - dialog.height(ui.size.height + 15); - }).on('resizestart', function(){ - // disable iframe as a target - // so it does not consume mouse movement when shrinking the dialog - $('iframe', this).css('pointer-events', 'none'); - }).on('resizestop', function(){ - $('iframe', this).css('pointer-events', 'auto'); - dialog.modal('handleUpdate'); - }); - } - }); - } - if (extraButtons) { var maximizeButton = $('.dialogMaximise', dialog).click(function(){ var icon = $('i', this), @@ -206,10 +129,6 @@ // restore dialog var oldWidth = dialog.data('oldWidth'), oldHeight = dialog.data('oldHeight'); - if (!initParams.modal) { - dialog.width(oldWidth + 15); - dialog.height(oldHeight + 15); - } internalDialog.width(oldWidth); internalContent.width(oldWidth); internalContent.height(oldHeight); @@ -222,12 +141,6 @@ 'oldWidth' : internalContent.width(), 'oldHeight': internalContent.height() }); - if (!initParams.modal) { - dialog.css({ - 'width' : '100%', - 'height': '100%' - }); - } internalDialog.css({ 'width' : '100%', 'height': '100%' @@ -239,7 +152,7 @@ $('.ui-resizable-handle', dialog).hide(); } // center the dialog - (initParams.modal ? internalDialog : dialog).position( + internalDialog.position( dialog.data('isCreateInParentWindow') ? { 'my' : 'center center', Index: lams_gradebook/web/releaseLessonMarks5.jsp =================================================================== diff -u -r2e7df6de960d7ad381ddc986759b44918ec9b565 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_gradebook/web/releaseLessonMarks5.jsp (.../releaseLessonMarks5.jsp) (revision 2e7df6de960d7ad381ddc986759b44918ec9b565) +++ lams_gradebook/web/releaseLessonMarks5.jsp (.../releaseLessonMarks5.jsp) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -360,13 +360,13 @@
-
+
 
-
+

 

Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -r27708872e7df43fe07cd093b785b4d4cbf35fa64 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 27708872e7df43fe07cd093b785b4d4cbf35fa64) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -1,9 +1,4 @@ @font-face { - font-family: mont-semibold; - src: url(/lams/includes/fonts/mont-semibold.ttf); -} - -@font-face { font-family: mont-bold; src: url(/lams/includes/fonts/FontsFree-Net-Mont-Bold.ttf); } @@ -124,11 +119,19 @@ opacity: 0; } +.component-sidebar .lesson-properties #lessonDetails > * { + display: none; +} + .component-sidebar .lesson-properties.active #lessonDetails { opacity: 1; transition: opacity .3s ease .3s; } +.component-sidebar .lesson-properties.active #lessonDetails > * { + display: initial; +} + .component-sidebar .lesson-properties #lessonDetails .btn, .component-sidebar .lesson-properties #lessonDetails select, .component-sidebar .lesson-properties #lessonDetails input[type="text"] { @@ -154,6 +157,8 @@ .monitoring-page-wrapper #sequence-tab-content .sequence-tab-layout-column { margin-bottom: 2rem; + padding-right: 0; + padding-left: var(--bs-gutter-x); } .monitoring-page-content .graph-grades { @@ -840,6 +845,7 @@ .monitoring-page-wrapper #sequenceSearchPhraseContainer { width: 20rem; + margin-left: 1rem; } .monitoring-page-wrapper #sequenceSearchPhrase { @@ -848,6 +854,7 @@ .monitoring-page-wrapper #sequenceSearchPhraseButton { border: none; + height: 3.1rem; } .monitoring-page-wrapper #sequenceSearchPhraseClearIcon { @@ -1233,6 +1240,10 @@ margin-right: 10px; } +#learners-accordion .learners-accordion-email a { + text-decoration: none; +} + #learners-accordion .learners-accordion-portrait > div { border-radius: 10px; } Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -r4c966906b909a2da4be5ccbee4512c2bbd273701 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 4c966906b909a2da4be5ccbee4512c2bbd273701) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -274,7 +274,6 @@ var forceBackwardsDialogContents = $('#forceBackwardsDialogContents'); showDialog('forceBackwardsDialog', { 'autoOpen' : false, - 'modal' : true, 'resizable' : true, 'height' : 300, 'width' : 400, @@ -1099,7 +1098,6 @@ 'autoOpen' : true, 'height' : Math.max(380, Math.min(700, dialogWindow.height() - 30)), 'width' : Math.max(380, Math.min(700, dialogWindow.width() - 60)), - 'modal' : true, 'resizable' : true, 'title' : LABELS.EMAIL_TITLE, //dialog needs to be added to a top level window to avoid boundary limitations of the interim iframe @@ -1249,9 +1247,11 @@ cache : false, data : data, success : function( dateObj ) { - dateCheckbox.closest('.dialogListItem') - .attr('dateid', dateObj.id) - .find('label').text(dateFormatter(new Date(dateObj.id))); + if (dateObj.id) { + dateCheckbox.closest('.dialogListItem') + .attr('dateid', dateObj.id) + .find('label').text(dateFormatter(new Date(dateObj.id))); + } } }); } @@ -1433,7 +1433,6 @@ showDialog("dialogGate", { 'autoOpen' : true, 'height' : 820, - 'modal' : false, 'resizable' : false, 'title' : LABELS.CONTRIBUTE_OPEN_GATE_BUTTON, 'open' : function(){ @@ -2458,9 +2457,12 @@ .prepend(portraitSmall); $('.learners-accordion-name', item).text(learner.firstName + ' ' + learner.lastName); $('.learners-accordion-login', item).html('' + learner.login); - $('.learners-accordion-email', item).html('' + learner.email); + $('.learners-accordion-email', item).html('' + + learner.email + ''); if (portraitLarge) { $('.learners-accordion-portrait', item).append(portraitLarge); + } else { + $('.learners-accordion-portrait', item).remove(); } $('.accordion-collapse', item).attr('id', itemCollapseId).attr('data-bs-parent', '#learners-accordion') Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r4c8da94b007cf5b41f25ab55e75d3bc9b97ebcbd -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 4c8da94b007cf5b41f25ab55e75d3bc9b97ebcbd) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -773,15 +773,15 @@ @@ -791,14 +791,14 @@ @@ -839,15 +839,15 @@ @@ -857,14 +857,14 @@ Index: lams_monitoring/web/timeLimit5.jsp =================================================================== diff -u -r56003dc7b87af7983c137daf04e402404932aeaa -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_monitoring/web/timeLimit5.jsp (.../timeLimit5.jsp) (revision 56003dc7b87af7983c137daf04e402404932aeaa) +++ lams_monitoring/web/timeLimit5.jsp (.../timeLimit5.jsp) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -540,7 +540,7 @@ - @@ -550,7 +550,7 @@ - @@ -592,7 +592,7 @@ - @@ -602,7 +602,7 @@ - Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r5563dc18a8b8d19478fb804c8beef31e63bd249b -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5563dc18a8b8d19478fb804c8beef31e63bd249b) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -429,3 +429,4 @@ label.learning.matching.pairs.chosen = Chosen: label.learning.disclose.tip = When you finish the activity the teacher may disclose your answers to other students. label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score. +label.monitoring.student.choices.none = No students have answered questions yet Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp =================================================================== diff -u -rac5039692e638736c0652cf6ce44bb4121f87bd6 -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp (.../assessmentStudentChoices5.jsp) (revision ac5039692e638736c0652cf6ce44bb4121f87bd6) +++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp (.../assessmentStudentChoices5.jsp) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -103,8 +103,10 @@
-
-

No students have answered questions yet

+
+

+ +

Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp =================================================================== diff -u -r5c2f6c774eb3124bacc62da88521a995cdeb608a -r742be95aa7c3cc930231fe4299e28942bb6aaf7f --- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp (.../iraAssessmentStudentChoices5.jsp) (revision 5c2f6c774eb3124bacc62da88521a995cdeb608a) +++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp (.../iraAssessmentStudentChoices5.jsp) (revision 742be95aa7c3cc930231fe4299e28942bb6aaf7f) @@ -112,8 +112,10 @@
-
-

No students have answered questions yet

+
+

+ +