Index: lams_central/web/addLesson.jsp =================================================================== diff -u -r9bb68cb1df5f57c18e966963fd308e9a82743671 -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision 9bb68cb1df5f57c18e966963fd308e9a82743671) +++ lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -49,10 +49,18 @@ initClassTab(); initAdvancedTab(); initConditionsTab(); + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); +<%-- "loading..." screen, gets removed on page full load --%> +
+ +
+
Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -red0c5bb1de25a8a6183cb1434f04bd6c5f1142ce -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision ed0c5bb1de25a8a6183cb1434f04bd6c5f1142ce) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -289,6 +289,11 @@ + <%-- "loading..." screen, gets removed on page full load --%> +
+ +
+
Index: lams_central/web/css/addLesson.css =================================================================== diff -u -r06c6921e9173ff630c99268f69463adf1a5e4834 -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_central/web/css/addLesson.css (.../addLesson.css) (revision 06c6921e9173ff630c99268f69463adf1a5e4834) +++ lams_central/web/css/addLesson.css (.../addLesson.css) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -1,3 +1,16 @@ +#loadingOverlay { + width: 100%; + height: 99%; + z-index: 2000; + position: absolute; + background-color: #FFFFFF; + text-align: center; +} + +#loadingOverlay img { + margin-top: 35%; +} + div#tabs { width: 789px; height: 574px; Index: lams_central/web/css/authoring.css =================================================================== diff -u -r0457de622f587bad4ed5e0a8861f822b1edbb125 -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_central/web/css/authoring.css (.../authoring.css) (revision 0457de622f587bad4ed5e0a8861f822b1edbb125) +++ lams_central/web/css/authoring.css (.../authoring.css) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -19,6 +19,19 @@ margin-right: 3px; } +#loadingOverlay { + width: 99%; + height: 99%; + z-index: 2000; + position: absolute; + background-color: #FFFFFF; + text-align: center; +} + +#loadingOverlay img { + margin-top: 35%; +} + div.dialogContainer, .ldChoiceDependentCanvasElement, .dialog-no-title .ui-dialog-titlebar { display: none; Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r5ec61f9b44e6aeb94bcfcbdb05aa9f1078e32f43 -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 5ec61f9b44e6aeb94bcfcbdb05aa9f1078e32f43) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -24,6 +24,9 @@ if (initLearningDesignID) { GeneralLib.openLearningDesign(+initLearningDesignID); } + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -rbef0ef947cf61ac8700dd47b9b0d5b6f767e669e -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision bef0ef947cf61ac8700dd47b9b0d5b6f767e669e) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -1,4 +1,17 @@ /********** GENERAL/DIALOG STYLES **********/ +#loadingOverlay { + width: 100%; + height: 100%; + z-index: 2000; + position: absolute; + background-color: #FFFFFF; + text-align: center; +} + +#loadingOverlay img { + margin-top: 30%; +} + div#tabs { width: 99%; overflow: hidden; Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -rbef0ef947cf61ac8700dd47b9b0d5b6f767e669e -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision bef0ef947cf61ac8700dd47b9b0d5b6f767e669e) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867) @@ -169,12 +169,21 @@ initSequenceTab(); initLearnersTab(); refreshMonitor(); + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); + +<%-- "loading..." screen, gets removed on page full load --%> +
+ +
+
    @@ -569,7 +578,7 @@ @@ -613,7 +622,7 @@ @@ -628,10 +637,10 @@
    - +
    - - + + + + @@ -657,16 +666,16 @@ title="" onClick="javascript:shiftClassList('Monitor', 10)"> - + - - + + + +
    - -
     
    -
    -