Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r3e5d6e63b9642bb289e1fb248a7c9384bcc5abe6 -reb459d1edd7a91f2bb5b1baf83bcaca05e4b4ea2 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 3e5d6e63b9642bb289e1fb248a7c9384bcc5abe6) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision eb459d1edd7a91f2bb5b1baf83bcaca05e4b4ea2) @@ -42,6 +42,8 @@ hasDialog = false, sequenceTabShowInfo = ${sequenceTabShowInfo eq true}, tourInProgress = false, + isTBLSequence = ${isTBLSequence}, + forceRegularMonitor = ${not empty param.forceRegularMonitor and param.forceRegularMonitor}, LAMS_URL = '', csrfToken = ' : ', csrfTokenName = '', @@ -240,12 +242,16 @@ }); $(document).ready(function(){ - initLessonTab(); - initSequenceTab(); - initLearnersTab(); - initGradebookTab(); - refreshMonitor(); - + if (isTBLSequence && !forceRegularMonitor) { + switchToTblMonitor(); + } else { + initLessonTab(); + initSequenceTab(); + initLearnersTab(); + initGradebookTab(); + refreshMonitor(); + } + // remove "loading..." screen $('#loadingOverlay').remove(); }); @@ -297,364 +303,366 @@ - - - " - onclick="javascript:switchToTblMonitor();" id="tbl-monitor-control"> - - - - - - - - - - + + + + " + onclick="javascript:switchToTblMonitor();" id="tbl-monitor-control"> + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - : - - - - : - - - - - - - - - - - - - - - - - - - + - - - - - + : + + + + : + + + + + - - - - btn-success + + + + + + + + + + + - "> - - - + - - - - : - - - - btn-success - - "> - - 0 - + + + + + + + - - btn-success - - " - - style="display: none" - - > - - - - - style="display: none" - - > - - - - - - - : - - - - - - - - - - - - - - - - - - + + btn-success + + "> + + + + - - - + + + : + + + + btn-success + + "> + + 0 + + + + btn-success + + " + + style="display: none" + + > + + + + + style="display: none" + + > + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - + - - - - + + + + + + + + + + + + + + + + - - + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + +
- - - - - - -
+ + + + + + +