Index: lams_central/web/addLesson.jsp =================================================================== diff -u -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) +++ lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -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 -rd8a9b02823db3a975b6b07a04717b5b3c57bc835 -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision d8a9b02823db3a975b6b07a04717b5b3c57bc835) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -274,6 +274,11 @@ + <%-- "loading..." screen, gets removed on page full load --%> +
+ +
+
Index: lams_central/web/css/addLesson.css =================================================================== diff -u -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_central/web/css/addLesson.css (.../addLesson.css) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) +++ lams_central/web/css/addLesson.css (.../addLesson.css) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -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 -r9c2dc3614ef2db8ce3865ad65ed1ffc7367741d8 -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_central/web/css/authoring.css (.../authoring.css) (revision 9c2dc3614ef2db8ce3865ad65ed1ffc7367741d8) +++ lams_central/web/css/authoring.css (.../authoring.css) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -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; @@ -37,7 +50,6 @@ } - div.propertiesDialogContainer .ui-dialog-titlebar { padding: 0 0 0 5px; } Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r356c6299ef6bab0bccd292e6afae57f66ed9758e -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 356c6299ef6bab0bccd292e6afae57f66ed9758e) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -24,6 +24,9 @@ if (initLearningDesignID) { GeneralLib.openLearningDesign(+initLearningDesignID); } + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -r927cd8d0d3f34e4efbfdcaa36779240244a041b1 -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 927cd8d0d3f34e4efbfdcaa36779240244a041b1) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -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 -r927cd8d0d3f34e4efbfdcaa36779240244a041b1 -rfa2ad14fcf969120bc068f9b22e1fcebf62ce39d --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 927cd8d0d3f34e4efbfdcaa36779240244a041b1) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision fa2ad14fcf969120bc068f9b22e1fcebf62ce39d) @@ -169,12 +169,21 @@ initSequenceTab(); initLearnersTab(); refreshMonitor(); + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); + +<%-- "loading..." screen, gets removed on page full load --%> +
+ +
+