Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -rf4621cf27d17389c7437daf00f3c2b833290ca5a -r6712a950e89732a93a16f3a0c0433910284994aa --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision f4621cf27d17389c7437daf00f3c2b833290ca5a) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 6712a950e89732a93a16f3a0c0433910284994aa) @@ -335,4 +335,18 @@ td.progressBarLabel a { float: right; margin: 6px 5px 4px 0; +} + + +/********** BOOTSTRAP ADDITIONS **********/ + +.contributeActivityCell { + font-weight: 600; + margin-top: 10px; +} + +.contributeEntryCell { + height: 25px; + margin-left: 25px; + } \ No newline at end of file Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rdb235b7a4ae3e3195b6adf5d8d5e8ded076cd44c -r6712a950e89732a93a16f3a0c0433910284994aa --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision db235b7a4ae3e3195b6adf5d8d5e8ded076cd44c) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 6712a950e89732a93a16f3a0c0433910284994aa) @@ -22,7 +22,7 @@ learnerProgressCurrentPageNumber = 1, //auto refresh all tabs every 30 seconds - autoRefreshInterval = 30 * 1000, + autoRefreshInterval = 300 * 1000, autoRefreshIntervalObject = null, // when user is doing something, do not auto refresh autoRefreshBlocked = false, @@ -116,12 +116,14 @@ if (checked) { $('#imAvailableField').attr('disabled', null); + $('#imDiv').css('display','inline'); alert(LABELS.LESSON_PRESENCE_ENABLE_ALERT); } else { $('#imAvailableField').attr({ 'checked' : null, 'disabled' : 'disabled' }).change(); + $('#imDiv').css('display','none'); alert(LABELS.LESSON_PRESENCE_DISABLE_ALERT); } } @@ -143,9 +145,13 @@ success : function() { if (checked) { $('#openImButton').css('display', 'inline'); + $('#imButton').attr('class','btn btn-xs btn-success voffset10'); + $('#imDiv').css('display','inline'); alert(LABELS.LESSON_IM_ENABLE_ALERT); } else { $('#openImButton').css('display', 'none'); + $('#imButton').attr('class','btn btn-xs btn-default voffset10'); + $('#imDiv').css('display','none'); alert(LABELS.LESSON_IM_DISABLE_ALERT); } } @@ -178,6 +184,7 @@ { 'text' : LABELS.CANCEL_BUTTON, 'id' : 'classDialogCancelButton', + 'class' : 'btn btn-sm btn-default', 'click' : function() { $(this).dialog('close'); } @@ -312,7 +319,7 @@ /** - * Updates widgets in lesson tab according to respose sent to refreshMonitor() + * Updates widgets in lesson tab according to response sent to refreshMonitor() */ function updateLessonTab(){ $.ajax({ @@ -328,30 +335,38 @@ // update lesson state label lessonStateId = +response.lessonStateID; var label = null; + var labelColour = 'warning'; switch (lessonStateId) { case 1: label = LABELS.LESSON_STATE_CREATED; + labelColour = 'warning'; break; case 2: label = LABELS.LESSON_STATE_SCHEDULED; + labelColour = 'warning'; break; case 3: label = LABELS.LESSON_STATE_STARTED; + labelColour = 'success'; break; case 4: label = LABELS.LESSON_STATE_SUSPENDED; + labelColour = 'danger'; break; case 5: label = LABELS.LESSON_STATE_FINISHED; + labelColour = 'danger'; break; case 6: label = LABELS.LESSON_STATE_ARCHIVED; + labelColour = 'danger'; break; case 7: label = LABELS.LESSON_STATE_REMOVED; + labelColour = 'danger'; break; } - $('#lessonStateLabel').text(label); + $('#lessonStateLabel').attr('class', 'label label-' + labelColour).html(label + ' '); // update available options in change state dropdown menu var selectField = $('#lessonStateField'); @@ -377,20 +392,26 @@ } // show/remove widgets for lesson scheduling - var scheduleControls = $('#scheduleDatetimeField, #scheduleLessonButton, #startLessonButton'); + var scheduleControls = $('#scheduleDatetimeField, #scheduleLessonButton, #startLessonButton, #lessonScheduler'); var startDateField = $('#lessonStartDateSpan'); + var lessonStateChanger = $('#lessonStateChanger'); + var stateLabel = $('#lessonStateLabel'); switch (lessonStateId) { case 1: scheduleControls.css('display','inline'); startDateField.css('display','none'); + lessonStateChanger.css('display','none'); break; case 2: scheduleControls.css('display','none'); startDateField.text(response.startDate).add('#startLessonButton').css('display','inline'); + lessonStateChanger.css('display','none'); break; default: scheduleControls.css('display','none'); - startDateField.text(response.startDate).css('display','inline'); + startDateField.text(response.startDate).css('display','none'); + lessonStateChanger.css('display','inline'); + stateLabel.attr('title',response.startDate); break; } @@ -480,6 +501,8 @@ function updatePresenceAvailableCount(){ var checked = $('#presenceAvailableField').is(':checked'), counter = $('#presenceAvailableCount'); + presenceButton = $('#presenceButton'); + presenceCounter = $('#presenceCounter'); if (checked) { $.ajax({ dataType : 'text', @@ -491,11 +514,16 @@ }, success : function(result) { $('span', counter).text(result); + presenceCounter.text(result); + presenceButton.attr('class', 'btn btn-xs btn-success'); + presenceCounter.show(); counter.show(); } }); } else { + presenceCounter.hide(); + presenceButton.attr('class', 'btn btn-xs btn-default'); counter.hide(); } } @@ -514,8 +542,8 @@ if (contributeActivities) { var row = header; $.each(contributeActivities, function(){ - var cell = $('').addClass('contributeActivityCell').text(this.title); - row = $('').addClass('contributeRow').insertAfter(row).append(cell); + var cell = $('
').addClass('contributeActivityCell').text(this.title); + row = $('
').addClass('contributeRow').insertAfter(row).append(cell); $.each(this.contributeEntries, function(){ var entryContent = ''; @@ -525,18 +553,18 @@ case 9 : entryContent = LABELS.CONTRIBUTE_BRANCHING; break; case 11 : entryContent = LABELS.CONTRIBUTE_CONTENT_EDITED; break; } - entryContent += '' + LABELS.CONTRIBUTE_BUTTON + ''; - cell = $('').addClass('contributeEntryCell').html(entryContent); - row = $('').addClass('contributeRow').insertAfter(row).append(cell); + entryContent += '' + LABELS.CONTRIBUTE_BUTTON + ''; + cell = $('
').addClass('contributeEntryCell').html(entryContent); + row = row.append(cell); }); }); } if ($('.contributeRow').length == 0) { - header.hide(); + $('#requiredTasks').hide(); } else { - header.show(); + $('#requiredTasks').show(); } } @@ -604,7 +632,7 @@ { 'text' : LABELS.VIEW_LEARNER_BUTTON, 'id' : 'learnerGroupDialogViewButton', - 'class' : 'learnerGroupDialogSelectableButton', + 'class' : 'learnerGroupDialogSelectableButton btn btn-sm btn-default', 'click' : function() { var selectedLearner = $('.dialogList div.dialogListItemSelected', this); if (selectedLearner.length == 1) { @@ -616,7 +644,7 @@ { 'text' : LABELS.EMAIL_BUTTON, 'id' : 'learnerGroupDialogEmailButton', - 'class' : 'learnerGroupDialogSelectableButton', + 'class' : 'learnerGroupDialogSelectableButton btn btn-sm btn-default', 'click' : function() { var selectedLearner = $('.dialogList div.dialogListItemSelected', this); if (selectedLearner.length == 1) { @@ -627,6 +655,7 @@ { 'text' : LABELS.CLOSE_BUTTON, 'id' : 'learnerGroupDialogCloseButton', + 'class' : 'btn btn-sm btn-default', 'click' : function() { $(this).dialog('close'); } @@ -1708,10 +1737,10 @@ if (!learnerProgressCellsTemplate) { // fill the placeholder, after all required variables were initialised learnerProgressCellsTemplate = - '
;11;
'; + ';11;'; learnerProgressCellsTemplate += - '' + ' ' + LABELS.EMAIL_BUTTON + ''; } @@ -2088,7 +2117,7 @@ function colorDialogList(parent) { $('.dialogList div.dialogListItem', parent).each(function(userIndex, userDiv){ // every odd learner has different background - $(userDiv).css('background-color', userIndex % 2 ? '#dfeffc' : 'inherit'); + $(userDiv).css('background-color', userIndex % 2 ? '#f5f5f5' : 'inherit'); }); } Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -rf4621cf27d17389c7437daf00f3c2b833290ca5a -r6712a950e89732a93a16f3a0c0433910284994aa --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision f4621cf27d17389c7437daf00f3c2b833290ca5a) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 6712a950e89732a93a16f3a0c0433910284994aa) @@ -10,25 +10,32 @@ - - + + - - + + + + - + + + + + + + + - - -<%-- "loading..." screen, gets removed on page full load --%> -
- -
- -
- -
    -
  • -
  • -
  • -
+ - + <%-- "loading..." screen, gets removed on page full load --%> +
+ +
-
- - - - - - - - - - - - - - - - - - - - + +

+ +
+ +

+ + +
+
+ + +
+ +
+
+
+ +
+
+
+
+
+ + +
+
+
+
+ + + + + + + + + +
+ +
+
+ + + +
+
+ +
+
:
+
+ <%=Configuration.get(ConfigurationKeys.ALLOW_DIRECT_LESSON_LAUNCH)%> + + <%=Configuration.get(ConfigurationKeys.SERVER_URL)%> + + ${serverURL}/ + +
+
+ + +
+
+ + +
:
+
+
+ + + + + +
+
+ + +
Instant messaging:
+
+
+ +
+
+ style="display: none" + + + style="display: inline" + + > + +
+
+
+
+ + +
+
+
Overall Completion +
+
60% + +
+
+
+
- <%=Configuration.get(ConfigurationKeys.SERVER_URL)%> - - ${serverURL}/ - - <%=Configuration.get(ConfigurationKeys.ALLOW_DIRECT_LESSON_LAUNCH)%> - - - - - - + +
+
+ +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - + +
+ + + + + +
+
+
+ - - + - -
- - - -
- - - -
- -
- -
- - - - - -
- - - -
- -
- - - - + + + + + + + + + + + + + + + + + + + + + + + +
+ + + checked="checked" + + /> + + (0 + ) + +
+ + disabled="disabled" + + + checked="checked" + + /> + +
+ +
+ +
+ + + + + + + + + + + + + + +
+ + +
- - - - - - -
- - - - - - - - - - -
- - - checked="checked" - - /> - - (0 - ) - -
- - disabled="disabled" - - - checked="checked" - - /> - -
- -
- -
- - - - - - - - - - - - - - -
-
- -
-
- - - - - - - - - - - - - - -
-
-
- -
- - -
- -
- - - - - - - - - -
-
- -
- + + - - - -
- -
- - - - - - -
- -
-
+
+
+
+ +
+ + +
+ +
+ + + + + + + + + +
+
+ +
+ + + + +
+ +
+ + + + + + +
+ +
+
+
+
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + +
+
+
+ +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+ +
 
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
- - - -
- - - - - - - - - - - - - - - - - - -
- - - - - -
-
-
- -
- - - - - -
- - - - - - - - - - - - - - - - - - - - -
- -
- - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - -
- -
 
-
-
-
-
- -
- -
- -
- -
- -
- -
-
\ No newline at end of file