Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -rd7ed1173946998f754a2efef09d68c9e3bfe307f --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision d7ed1173946998f754a2efef09d68c9e3bfe307f) @@ -216,8 +216,8 @@ refreshMonitor(); $('#description').readmore({ - speed: 500, - collapsedHeight: 85 + speed: 500, + collapsedHeight: 85 }); @@ -226,30 +226,38 @@ }); function doSelectTab(tabId) { - if ( tourInProgress ) { - alert(LABELS.TOUR_DISABLED_ELEMENT); - return; - } - actualDoSelectTab(tabId); + if ( tourInProgress ) { + alert(LABELS.TOUR_DISABLED_ELEMENT); + return; + } + actualDoSelectTab(tabId); } function actualDoSelectTab(tabId) { - selectTab(tabId); + selectTab(tabId); var sequenceInfoDialog = $('#sequenceInfoDialog'); - if ( tabId == '2' ) { + if ( tabId == '2' ) { if (sequenceTabShowInfo) { sequenceInfoDialog.modal("show"); sequenceTabShowInfo = false; // only show it once } } else { sequenceInfoDialog.modal("hide"); } - if ( tabId == '4' ) { - updateGradebookTab(); - } + if ( tabId == '4' ) { + updateGradebookTab(); + } } - + function switchToTblMonitor() { + $("#content").load( + "", + { + lessonID: ${lesson.lessonID} + } + ); + } + <%@ include file="monitorTour.jsp" %> @@ -266,7 +274,14 @@ - + + + " + onclick="javascript:switchToTblMonitor();" id="tbl-monitor-control"> + + + +