Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.19 -r1.20 --- lams_central/web/addLesson.jsp 9 Jun 2015 20:14:20 -0000 1.19 +++ lams_central/web/addLesson.jsp 5 Feb 2016 09:45:12 -0000 1.20 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v diff -u -r1.22 -r1.23 --- lams_central/web/authoring/authoring.jsp 9 Sep 2015 12:27:09 -0000 1.22 +++ lams_central/web/authoring/authoring.jsp 5 Feb 2016 09:45:12 -0000 1.23 @@ -274,6 +274,11 @@ + <%-- "loading..." screen, gets removed on page full load --%> +
+ +
+
Index: lams_central/web/css/addLesson.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/addLesson.css,v diff -u -r1.4 -r1.5 --- lams_central/web/css/addLesson.css 9 Jun 2015 20:14:20 -0000 1.4 +++ lams_central/web/css/addLesson.css 5 Feb 2016 09:45:12 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v diff -u -r1.34 -r1.35 --- lams_central/web/css/authoring.css 28 Jan 2016 07:45:28 -0000 1.34 +++ lams_central/web/css/authoring.css 5 Feb 2016 09:45:12 -0000 1.35 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v diff -u -r1.74 -r1.75 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js 11 Oct 2015 14:29:19 -0000 1.74 +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js 5 Feb 2016 09:45:12 -0000 1.75 @@ -24,6 +24,9 @@ if (initLearningDesignID) { GeneralLib.openLearningDesign(+initLearningDesignID); } + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); Index: lams_monitoring/web/monitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v diff -u -r1.47 -r1.48 --- lams_monitoring/web/monitor.jsp 1 Dec 2015 11:10:26 -0000 1.47 +++ lams_monitoring/web/monitor.jsp 5 Feb 2016 09:45:13 -0000 1.48 @@ -169,12 +169,21 @@ initSequenceTab(); initLearnersTab(); refreshMonitor(); + + // remove "loading..." screen + $('#loadingOverlay').remove(); }); + +<%-- "loading..." screen, gets removed on page full load --%> +
+ +
+
    Index: lams_monitoring/web/css/monitorLesson.css =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/css/monitorLesson.css,v diff -u -r1.23 -r1.24 --- lams_monitoring/web/css/monitorLesson.css 1 Dec 2015 11:10:26 -0000 1.23 +++ lams_monitoring/web/css/monitorLesson.css 5 Feb 2016 09:45:13 -0000 1.24 @@ -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;