Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.16.2.4 -r1.16.2.5 --- lams_central/web/addLesson.jsp 4 Sep 2015 07:50:03 -0000 1.16.2.4 +++ lams_central/web/addLesson.jsp 5 Feb 2016 09:53:04 -0000 1.16.2.5 @@ -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.6.2.19 -r1.6.2.20 --- lams_central/web/authoring/authoring.jsp 8 Nov 2015 08:52:32 -0000 1.6.2.19 +++ lams_central/web/authoring/authoring.jsp 5 Feb 2016 09:53:04 -0000 1.6.2.20 @@ -289,6 +289,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.3.2.1 -r1.3.2.2 --- lams_central/web/css/addLesson.css 9 Jun 2015 20:20:02 -0000 1.3.2.1 +++ lams_central/web/css/addLesson.css 5 Feb 2016 09:53:04 -0000 1.3.2.2 @@ -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.30.2.5 -r1.30.2.6 --- lams_central/web/css/authoring.css 28 Jan 2016 07:33:04 -0000 1.30.2.5 +++ lams_central/web/css/authoring.css 5 Feb 2016 09:53:04 -0000 1.30.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v diff -u -r1.51.2.26 -r1.51.2.27 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js 31 Jan 2016 11:44:41 -0000 1.51.2.26 +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js 5 Feb 2016 09:53:04 -0000 1.51.2.27 @@ -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.27.2.18 -r1.27.2.19 --- lams_monitoring/web/monitor.jsp 1 Dec 2015 11:14:30 -0000 1.27.2.18 +++ lams_monitoring/web/monitor.jsp 5 Feb 2016 09:53:03 -0000 1.27.2.19 @@ -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)"> - + - - + + + +
    - -
     
    -
    -
    Index: lams_monitoring/web/css/monitorLesson.css =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/css/monitorLesson.css,v diff -u -r1.15.2.8 -r1.15.2.9 --- lams_monitoring/web/css/monitorLesson.css 1 Dec 2015 11:14:30 -0000 1.15.2.8 +++ lams_monitoring/web/css/monitorLesson.css 5 Feb 2016 09:53:03 -0000 1.15.2.9 @@ -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;