Index: lams_admin/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_admin/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_admin/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_central/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_central/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_central/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_central/web/includes/javascript/progressBar.js =================================================================== diff -u -rd0d618418de773c9610948d9f6c2be816ffa9f88 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_central/web/includes/javascript/progressBar.js (.../progressBar.js) (revision d0d618418de773c9610948d9f6c2be816ffa9f88) +++ lams_central/web/includes/javascript/progressBar.js (.../progressBar.js) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -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 =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_learning/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_learning/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_monitoring/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_monitoring/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_monitoring/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_tool_assessment/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_tool_assessment/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_tool_bbb/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_tool_bbb/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_chat/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_tool_chat/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_tool_chat/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); } Index: lams_tool_daco/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1c254cdb23e07d238a56bb87b88a72835d8ce867 -rd1553120376eba803ee0a3c0b142bc985586488c --- lams_tool_daco/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1c254cdb23e07d238a56bb87b88a72835d8ce867) +++ lams_tool_daco/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d1553120376eba803ee0a3c0b142bc985586488c) @@ -127,6 +127,7 @@ } function hideSlideMenu() { + hideProgressBars(); $("nav.sidebar").removeClass("expandmenu"); }