Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v diff -u -r1.12.2.14 -r1.12.2.15 --- lams_gradebook/web/gradebookMonitor.jsp 10 May 2017 07:14:33 -0000 1.12.2.14 +++ lams_gradebook/web/gradebookMonitor.jsp 11 May 2017 05:54:01 -0000 1.12.2.15 @@ -88,9 +88,13 @@ if (marksReleased) { document.getElementById("marksReleased").style.display="inline"; document.getElementById("marksNotReleased").style.display="none"; + document.getElementById("padlockUnlocked").style.display="inline"; + document.getElementById("padlockLocked").style.display="none"; } else { document.getElementById("marksReleased").style.display="none"; document.getElementById("marksNotReleased").style.display="inline"; + document.getElementById("padlockUnlocked").style.display="none"; + document.getElementById("padlockLocked").style.display="inline"; } } @@ -483,11 +487,11 @@ }).navGrid("#activityViewPager", {edit:false,add:false,del:false,search:false}); // enable refresh button $("#export-grades-button").click(function() { - var areaToBlock = "export-link-area"; var exportExcelUrl = "/gradebookMonitoring.do?dispatch=exportExcelLessonGradebook&lessonID=${lessonDetails.lessonID}"; var languageLabelWait = ""; - blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait); + // if exportSpan is hidden then icon only mode, use small font. + blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait, $("#exportSpan:hidden").length > 0); return false; }); @@ -511,8 +515,75 @@ + + + + + + + + + + +
+
+ " > + + +
+ +
+ + + ${isInTabs?"lockLabel":""} + +
+ + +
+ + + + +
+ + +
+ + + + <%-- replacement for Page type admin --%>
@@ -527,77 +598,63 @@ - - - +
+ ${chartButtonCode} + ${tourDatesCode} + + +
- -