Index: lams_admin/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.8 -r1.1.2.9 --- lams_admin/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:41:22 -0000 1.1.2.8 +++ lams_admin/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:17:15 -0000 1.1.2.9 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_central/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.13 -r1.1.2.14 --- lams_central/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:42:36 -0000 1.1.2.13 +++ lams_central/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:16:19 -0000 1.1.2.14 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_central/web/includes/javascript/progressBar.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/progressBar.js,v diff -u -r1.13.2.10 -r1.13.2.11 --- lams_central/web/includes/javascript/progressBar.js 8 Aug 2016 11:42:16 -0000 1.13.2.10 +++ lams_central/web/includes/javascript/progressBar.js 9 Aug 2016 00:16:19 -0000 1.13.2.11 @@ -594,6 +594,13 @@ }); }, + // hide all Optional Activities instantly - used when the control bar shrinks + hideComplexContentInstantly : function() { + $('div.optionalActivity').each(function(index, contentDiv) { + $(contentDiv).hide(); + }); + }, + // draw box with inner activities showComplexContent : function(activity) { if (activity.isComplex) { @@ -611,9 +618,9 @@ activity.optionalContent = $('
').attr('id', containerName).addClass('optionalActivity').css({ // a little higher than activity, to cover it - 'top' : $(activity.shape.node).offset().top - 8, + 'top' : $(activity.shape.node).offset().top - $('#progressBarDiv').offset().top + 30, 'left' : $(activity.shape.node).offset().left - 65, - 'height' : 27 * activity.childActivities.length - 1 + 'height' : 29 * activity.childActivities.length - 1 }).appendTo('#' + activity.bar.containerId); var optionalContentTable = $('') @@ -990,6 +997,9 @@ } } +function hideProgressBars() { + ActivityUtils.hideComplexContentInstantly(); +} // refresh progress bar on first/next activity load function fillProgressBar(barId) { var bar = bars[barId]; Index: lams_learning/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.9 -r1.1.2.10 --- lams_learning/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:43:08 -0000 1.1.2.9 +++ lams_learning/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:20:27 -0000 1.1.2.10 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_monitoring/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.8 -r1.1.2.9 --- lams_monitoring/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:43:10 -0000 1.1.2.8 +++ lams_monitoring/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:20:30 -0000 1.1.2.9 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.10 -r1.1.2.11 --- lams_tool_assessment/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:43:11 -0000 1.1.2.10 +++ lams_tool_assessment/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:20:28 -0000 1.1.2.11 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.11 -r1.1.2.12 --- lams_tool_bbb/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:43:07 -0000 1.1.2.11 +++ lams_tool_bbb/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:20:25 -0000 1.1.2.12 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_chat/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.11 -r1.1.2.12 --- lams_tool_chat/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:43:09 -0000 1.1.2.11 +++ lams_tool_chat/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:20:26 -0000 1.1.2.12 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_daco/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.10 -r1.1.2.11 --- lams_tool_daco/web/WEB-INF/tags/Page.tag 8 Aug 2016 11:43:06 -0000 1.1.2.10 +++ lams_tool_daco/web/WEB-INF/tags/Page.tag 9 Aug 2016 00:20:29 -0000 1.1.2.11 @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); }