Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r44f25ff763552baf103b1bb4ed7d1d2466a937dc --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc) @@ -53,6 +53,10 @@ createDateTimeStr = '${lesson.createDateTimeStr}', lessonStartDate = '${lesson.scheduleStartDate}', lessonEndDate = '${lesson.scheduleEndDate}', + liveEditEnabled = ${enableLiveEdit && lesson.liveEditEnabled}, + lockedForEdit = '${lesson.lockedForEdit}', + lockedForEditUserId = '${lesson.lockedForEditUserId}', + lockedForEditUsername = '${lesson.lockedForEditUsername}', // settings for progress bar isHorizontalBar = true, hasContentFrame = false, @@ -212,7 +216,13 @@ RESCHEDULE : decoderDiv.html('').text(), - LESSON_ERROR_START_END_DATE : decoderDiv.html('').text() + LESSON_ERROR_START_END_DATE : decoderDiv.html('').text(), + + LIVE_EDIT_BUTTON: '', + + LIVE_EDIT_TOOLTIP: '', + + LIVE_EDIT_WARNING: '' } $(document).ready(function(){ @@ -558,6 +568,8 @@ + + @@ -566,13 +578,10 @@ href="#" onClick="javascript:refreshMonitor('sequence')"> - - - - - + + +