Index: lams_central/web/css/free.ui.jqgrid.custom.css
===================================================================
diff -u -r0a68df1374679cd481c6063272aa80b3f0d75ddd -rf5fa910456cca31846e2c1a097bb4ab750a345ab
--- lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision 0a68df1374679cd481c6063272aa80b3f0d75ddd)
+++ lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision f5fa910456cca31846e2c1a097bb4ab750a345ab)
@@ -28,7 +28,7 @@
}
.ui-jqgrid-labels th {
- border-bottom: 2px solid #20639B !important;
+ border-bottom: 2px solid var(--bs-secondary)!important;
padding-bottom: .4rem !important;
background-color: #fff;
}
@@ -50,7 +50,7 @@
}
.ui-jqgrid-bdiv .ui-row-ltr.jqgrow td {
- border-bottom: 2px solid #C3CEDC !important;
+ border-bottom: 2px solid var(--bs-gray-300) !important;
height: initial !important;
}
@@ -156,4 +156,8 @@
.ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .btn.ui-pg-button[id^="refresh_"] {
padding: 0.9em 0 0.7em 0;
+}
+
+.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-btable .table-success {
+ background-color: rgba(0, 145, 74, 0.1);
}
\ No newline at end of file
Index: lams_monitoring/web/css/components-monitoring.css
===================================================================
diff -u -r3bea51c547c2bc26806066b683e51138ecd4e8e5 -rf5fa910456cca31846e2c1a097bb4ab750a345ab
--- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 3bea51c547c2bc26806066b683e51138ecd4e8e5)
+++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision f5fa910456cca31846e2c1a097bb4ab750a345ab)
@@ -859,8 +859,6 @@
.dialogContainer .dialogSearchPhraseClear {
visibility: hidden;
- padding-top: 11px;
- cursor: pointer;
}
.ui-front {
@@ -871,30 +869,39 @@
border-radius: 0 0 5px 5px;
}
-.dialogContainer .navCell i {
- cursor: pointer;
+.dialogContainer .pageCell {
+ vertical-align: middle;
}
.dialogContainer .dialogListItem {
- padding: 3px 0 3px 5px;
+ height: 3rem;
+ border-color: var(--bs-gray-300);
cursor: pointer;
}
+.dialogContainer .dialogListItem:hover {
+ background-color: var(--bs-gray-200);
+}
+
.dialogContainer .dialogListItem .portrait-sm {
- margin: 3px 0 -4px 0;
+ margin: 7px 0 0 7px;
}
-.dialogContainer .dialogListItem .portrait-sm-lineheight {
- margin-left: 5px;
+R.dialogContainer .dialogListItem .portrait-generic-sm {
+ margin-top: 2px;
}
-.dialogContainer .dialogListItem .portrait-sm + .portrait-sm-lineheight {
+.dialogContainer .dialogListItem .portrait-sm-lineheight {
display: inline-block;
- margin-top: 3px;
-}
+ margin-top: 2px;
+}
+
+.dialogContainer .dialogListItem .portrait-sm + .portrait-sm-lineheight {
+ margin-left: 8px;
+}
+
.dialogContainer .dialogListItem.dialogListItemSelected {
- background-color: #5898d0 !important;
- color: white !important;
+ background-color: rgba(0, 145, 74, 0.1) !important;
}
.dialogContainer .dialogTitle {
Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -r0a68df1374679cd481c6063272aa80b3f0d75ddd -rf5fa910456cca31846e2c1a097bb4ab750a345ab
--- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 0a68df1374679cd481c6063272aa80b3f0d75ddd)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision f5fa910456cca31846e2c1a097bb4ab750a345ab)
@@ -984,7 +984,7 @@
function fillEmailProgress() {
var dialog = $('#emailProgressDialog'),
table = $('#emailProgressDialogTable', dialog),
- list = $('.dialogList', table).empty(),
+ list = $('.dialogTable', table).empty(),
dates = null;
ajaxProperties = dialog.data('ajaxProperties'),
dates = null;
@@ -1011,8 +1011,6 @@
$.each(dates, function(dateIndex, date) {
addCheckbox(date, list, true);
});
-
- colorDialogList(table);
}
function addCheckbox(dateObj, list, checked) {
@@ -1074,7 +1072,6 @@
}
function addEmailProgressDate() {
- debugger;
var table = $('#emailProgressDialogTable', '#emailProgressDialog'),
list = $('.dialogList', table),
newDateMS = new tempusDominus.TempusDominus(document.getElementById('emaildatePicker')).viewDate;
@@ -1136,7 +1133,6 @@
}
}
}
- colorDialogList(table);
}
function openGateNow(activityId) {
@@ -1235,16 +1231,21 @@
$('#learnerGroupDialogCloseButton', learnerGroupDialogContents).click(function(){
$('#learnerGroupDialog').modal('hide');
});
-
+ //check whether current window is a top level one (otherwise it's an iframe or popup)
+ var isTopLevelWindow = window.top == window.self;
+ //calculate width and height based on the dimensions of the window to which dialog is added
+ var dialogWindow = isTopLevelWindow ? $(window) : $(window.parent);
// initialise lesson dialog
var learnerGroupDialog = showDialog('learnerGroupDialog',{
'autoOpen' : false,
'width' : 450,
- 'height' : 450,
+ 'height' : Math.max(450, Math.min(700, dialogWindow.height() - 30)),
'resizable' : true,
'open' : function(){
// until operator selects an user, buttons remain disabled
$('button.learnerGroupDialogSelectableButton').blur().prop('disabled', true);
+ },
+ 'close' : function(){
}
}, false);
@@ -2266,8 +2267,6 @@
})
}
});
-
- colorDialogList(table);
}
/**
@@ -2733,7 +2732,7 @@
*/
function showLearnerGroupDialog(ajaxProperties, dialogTitle, allowSearch, allowForceComplete, allowView, allowEmail) {
var learnerGroupDialog = $('#learnerGroupDialog'),
- learnerGroupList = $('.dialogList', learnerGroupDialog).empty(),
+ learnerGroupList = $('.dialogTable', learnerGroupDialog).empty(),
// no parameters provided? just work on what we saved
isRefresh = ajaxProperties == null,
learners = null,
@@ -2800,61 +2799,60 @@
var viewUrl = allowView ? LAMS_URL + 'monitoring/monitoring/getLearnerActivityURL.do?userID='
+ learner.id + '&activityID=' + ajaxProperties.data.activityID + '&lessonID=' + lessonId
: null,
- learnerDiv = $('').attr({
+ learnerRow = $('|
').attr({
'userId' : learner.id,
'viewUrl' : viewUrl
})
.addClass('dialogListItem')
.appendTo(learnerGroupList),
+ learnerCell = $(' | ').appendTo(learnerRow),
portraitDiv = $('').attr({
'id': 'user-'+learner.id,
})
.addClass('roffset5')
- .appendTo(learnerDiv);
+ .appendTo(learnerCell);
addPortrait( portraitDiv, learner.portraitId, learner.id, 'small', true, LAMS_URL );
$('').html(getLearnerDisplayName(learner))
.addClass('portrait-sm-lineheight')
- .appendTo(learnerDiv);
+ .appendTo(learnerCell);
if (allowForceComplete || allowView || allowEmail) {
- learnerDiv.click(function(event){
+ learnerRow.click(function(event){
// select the learner
- var learnerDiv = $(this),
- selectedSiblings = learnerDiv.siblings('div.dialogListItem.dialogListItemSelected');
+ var learnerRow = $(this),
+ selectedSiblings = learnerRow.siblings('tr.dialogListItem.dialogListItemSelected');
// enable buttons
$('button.learnerGroupDialogSelectableButton', learnerGroupDialog).prop('disabled', false);
if (allowForceComplete && (event.metaKey || event.ctrlKey)) {
- var isSelected = learnerDiv.hasClass('dialogListItemSelected');
+ var isSelected = learnerRow.hasClass('dialogListItemSelected');
if (isSelected) {
// do not un-select last learner
if (selectedSiblings.length > 0) {
- learnerDiv.removeClass('dialogListItemSelected')
+ learnerRow.removeClass('dialogListItemSelected')
}
} else {
- learnerDiv.addClass('dialogListItemSelected');
+ learnerRow.addClass('dialogListItemSelected');
}
if (selectedSiblings.length + (isSelected ? 0 : 1) > 1) {
// disable view button - only one learner can be viewed and multiple are selected
$('button#learnerGroupDialogViewButton', learnerGroupDialog).prop('disabled', true);
}
} else {
- learnerDiv.addClass('dialogListItemSelected');
+ learnerRow.addClass('dialogListItemSelected');
// un-select other learners
selectedSiblings.removeClass('dialogListItemSelected');
}
});
if (allowView){
- dblTap(learnerDiv, function(){
+ dblTap(learnerRow, function(){
// same as clicking View Learner button
openPopUp(viewUrl, "LearnActivity", popupHeight, popupWidth, true);
});
}
}
});
- colorDialogList(learnerGroupDialog);
-
if (!isRefresh) {
// show buttons and labels depending on parameters
$('span#learnerGroupMultiSelectLabel, button#learnerGroupDialogForceCompleteButton, button#learnerGroupDialogForceCompleteAllButton', learnerGroupDialog)
@@ -2948,16 +2946,6 @@
}
/**
- * Colours a list of users
- */
-function colorDialogList(parent) {
- $('.dialogList div.dialogListItem', parent).each(function(userIndex, userDiv){
- // every odd learner has different background
- $(userDiv).css('background-color', userIndex % 2 ? '#f5f5f5' : 'inherit');
- });
-}
-
-/**
* Change page in the group dialog.
*/
function shiftLearnerGroupList(shift) {
Index: lams_monitoring/web/monitor5.jsp
===================================================================
diff -u -r19bb74457d18c462df67f957c98c20cc70916d56 -rf5fa910456cca31846e2c1a097bb4ab750a345ab
--- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 19bb74457d18c462df67f957c98c20cc70916d56)
+++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision f5fa910456cca31846e2c1a097bb4ab750a345ab)
@@ -482,47 +482,61 @@
-
+
|
- |
-
+ |
+
+
|
-
-
+ |
+
|
|
-
-
+ |
+
|
-
-
+ |
+
|
-
-
+ |
+
|
- |
+
+
+ |
-
+
@@ -572,30 +586,30 @@
-
+
|
-
+
|
|
-
+
|
-
+
|
-
+
|