Index: lams_central/web/includes/javascript/addLesson.js =================================================================== diff -u -rc170caa7ecfea6453eaa4daed629608d84882ca9 -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_central/web/includes/javascript/addLesson.js (.../addLesson.js) (revision c170caa7ecfea6453eaa4daed629608d84882ca9) +++ lams_central/web/includes/javascript/addLesson.js (.../addLesson.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -454,8 +454,8 @@ $('#ldScreenshotAuthor').html(response); $('#ldScreenshotAuthor').css('display', 'block').css('width', 'auto').css('height', 'auto'); - originalThumbnailWidth = $('svg.learningDesignSvg','#ldScreenshotAuthor').attr('width'); - originalThumbnailHeight = $('svg.learningDesignSvg','#ldScreenshotAuthor').attr('height'); + originalThumbnailWidth = $('svg.svg-learning-design','#ldScreenshotAuthor').attr('width'); + originalThumbnailHeight = $('svg.svg-learning-design','#ldScreenshotAuthor').attr('height'); // resize if needed var resized = resizeSequenceThumbnail(); @@ -504,7 +504,7 @@ function resizeSequenceThumbnail(reset) { var returnValue = false; - var svg = $('svg.learningDesignSvg','#ldScreenshotAuthor'); + var svg = $('svg.svg-learning-design','#ldScreenshotAuthor'); if ( svg ) { if ( reset ) { svg.attr('width',originalThumbnailWidth); Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -r150519889a1a5d9ea15737e89195674a1773a983 -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 150519889a1a5d9ea15737e89195674a1773a983) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -343,6 +343,7 @@ this.items.remove(); } + // make the icon more centred x = GeneralLib.snapToGrid(x) + layout.snapToGrid.offset * 2; y = GeneralLib.snapToGrid(y); @@ -363,7 +364,7 @@ this.items.attr('filter', layout.conf.readOnlyFilter); } if (this.isStart) { - // uiid is needed in Monitoring + // these are needed in monitoring this.items.attr({ 'uiid' : this.branchingActivity.uiid, 'data-x' : x, @@ -416,13 +417,11 @@ this.drawContainer(x, y, box.x2 + layout.conf.containerActivityPadding, - box.y2 + layout.conf.containerActivityPadding, - layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5); + box.y2 + layout.conf.containerActivityPadding); } else { this.drawContainer(x, y, x + layout.conf.containerActivityEmptyWidth, - y + layout.conf.containerActivityEmptyHeight, - layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5); + y + layout.conf.containerActivityEmptyHeight); } this.items.data('parentObject', this); @@ -444,6 +443,7 @@ } x = GeneralLib.snapToGrid(x); + // make the icon more centred y = GeneralLib.snapToGrid(y) - layout.snapToGrid.offset * 2; // create activity SVG elements @@ -460,7 +460,7 @@ if (this.readOnly && !isReadOnlyMode) { this.items.attr('filter', layout.conf.readOnlyFilter); } - // uiid is needed in Monitoring + // these are needed in monitoring this.items.attr({ 'uiid' : this.uiid, 'data-x' : x, @@ -594,6 +594,7 @@ this.items.data('parentObject', this); this.items.addClass('svg-activity svg-activity-optional svg-shadow'); + // these are needed in monitoring this.items.attr({ 'uiid' : this.uiid, 'data-x' : x, @@ -661,6 +662,7 @@ this.items.data('parentObject', this); this.items.addClass('svg-activity svg-activity-parallel svg-shadow'); + // these are needed in monitoring this.items.attr({ 'uiid' : this.uiid, 'data-x' : x, @@ -696,6 +698,8 @@ height = layout.activity.height, bannerPath = 'M ' + (x + curve) + ' ' + (y + height) + ' q ' + -curve + ' 0 ' + -curve + ' ' + -curve + ' v ' + (-height + 2 * curve) + ' q 0 ' + -curve + ' ' + curve + ' ' + -curve, + // by default the wide banner is displayed, + // but when there are learners in monitoring, the narrow one is shown instead bannerWidePath = bannerPath + ' h ' + layout.activity.bannerWideWidth + ' v ' + height + ' z', bannerNarrowPath = bannerPath + ' h ' + layout.activity.bannerNarrowWidth + ' v ' + height + ' z', bannerWide = paper.path(bannerWidePath) @@ -727,7 +731,7 @@ if (this.readOnly && !isReadOnlyMode) { this.items.attr('filter', layout.conf.readOnlyFilter); } - // uiid is needed in Monitoring + // these are needed in monitoring this.items.attr({ 'uiid' : this.uiid, 'data-x' : x, @@ -1770,7 +1774,7 @@ // different effects for different types of objects if (object instanceof DecorationDefs.Region) { object.items.shape.attr({ - 'stroke' : layout.colors.activityBorder, + 'stroke' : 'black', 'stroke-dasharray' : null }); object.items.fitButton.attr('display','none'); Index: lams_central/web/includes/javascript/authoring/authoringDecoration.js =================================================================== diff -u -r6d4ea52f24e34bfa5b177e125026c5e2b736216a -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_central/web/includes/javascript/authoring/authoringDecoration.js (.../authoringDecoration.js) (revision 6d4ea52f24e34bfa5b177e125026c5e2b736216a) +++ lams_central/web/includes/javascript/authoring/authoringDecoration.js (.../authoringDecoration.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -36,7 +36,7 @@ this.loadPropertiesDialogContent = PropertyDefs.labelProperties; } - this.draw(x, y, color || layout.colors.activityText, size || layout.conf.labelDefaultSize); + this.draw(x, y, color || 'black', size || layout.conf.labelDefaultSize); }, Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r90b354d2a285493b5d364aa749e2ef3dda1821ee -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 90b354d2a285493b5d364aa749e2ef3dda1821ee) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -113,7 +113,6 @@ }, 'colors' : { - 'activityBorder' : 'black', // default region colour 'annotation' : '#CCFF99', // region colours to choose from @@ -123,12 +122,6 @@ // when mouse hovers over rubbish bin 'binSelect' : 'red', - - 'gate' : 'red', - 'gateBorder' : '#801515', - 'gateText' : 'white', - 'grouping' : '#caddfb', - 'groupingBorder' : '#00007f', // dashed border around a selected activity 'selectEffect' : 'black', // highlight TBL activities which should be grouped Index: lams_central/web/includes/javascript/authoring/authoringMenu.js =================================================================== diff -u -rc170caa7ecfea6453eaa4daed629608d84882ca9 -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision c170caa7ecfea6453eaa4daed629608d84882ca9) +++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -288,7 +288,7 @@ svg.setAttribute('preserveAspectRatio', 'xMinYMin slice'); svg.setAttribute('width', width); svg.setAttribute('height', height); - $(svg).addClass('learningDesignSvg'); + $(svg).addClass('svg-learning-design'); // reset any cursor=pointer styles $('*[style*="cursor"]', svg).css('cursor', 'default'); Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -rce46e7236188aeb13a7b1d70e5a9cb2b42b4d967 -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_central/web/includes/javascript/main.js (.../main.js) (revision ce46e7236188aeb13a7b1d70e5a9cb2b42b4d967) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -330,6 +330,7 @@ var iframe = $('iframe', this)[0], win = iframe.contentWindow || iframe.contentDocument; if (win.resizeSequenceCanvas) { + // find out the size of content area in the monitoring modal var body = $(this).find('.modal-body'); win.resizeSequenceCanvas(body.width(), body.height()); } Index: lams_monitoring/web/css/_monitorLesson_base.scss =================================================================== diff -u -rce46e7236188aeb13a7b1d70e5a9cb2b42b4d967 -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision ce46e7236188aeb13a7b1d70e5a9cb2b42b4d967) +++ lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -369,12 +369,12 @@ } -div#sequenceCanvas svg.learningDesignSvg { +div#sequenceCanvas svg.svg-learning-design { display: block; overflow: visible; } -div#sequenceCanvas svg.learningDesignSvg g.gate svg { +div#sequenceCanvas svg.svg-learning-design g.gate svg { display: none; } Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r56209f294891d58820dfb5022daafdc7bdac4cbb -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 56209f294891d58820dfb5022daafdc7bdac4cbb) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -1578,16 +1578,8 @@ return; } - /* - activity.requiresAttention = true; - if (activity.learners) { - activity.learners = [...activity.learners,...activity.learners,...activity.learners,...activity.learners,...activity.learners,...activity.learners,...activity.learners,...activity.learners] - activity.learnerCount = activity.learners.length; - } - */ - // add group of users icon - var learningDesignSvg = $('svg.learningDesignSvg', sequenceCanvas), + var learningDesignSvg = $('svg.svg-learning-design', sequenceCanvas), isTool = activity.type == 1, isGrouping = activity.type == 2, // branching and gates require extra adjustments @@ -2133,7 +2125,7 @@ * Adjusts sequence canvas (SVG) based on space available in the dialog. */ function resizeSequenceCanvas(width, height){ - var svg = $('svg.learningDesignSvg', sequenceCanvas), + var svg = $('svg.svg-learning-design', sequenceCanvas), viewBoxParts = svg.attr('viewBox').split(' '), svgHeight = +viewBoxParts[3], sequenceCanvasHeight = learningDesignSvgFitScreen ? height - 140 : Math.max(svgHeight + 10, height - 140); Index: lams_monitoring/web/tblmonitor/sequence.jsp =================================================================== diff -u -r56209f294891d58820dfb5022daafdc7bdac4cbb -r54613e14332031bce49e424b8e0ebc3700a2ccd7 --- lams_monitoring/web/tblmonitor/sequence.jsp (.../sequence.jsp) (revision 56209f294891d58820dfb5022daafdc7bdac4cbb) +++ lams_monitoring/web/tblmonitor/sequence.jsp (.../sequence.jsp) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7) @@ -199,7 +199,7 @@ // assigne svg 'auto' width and height if (sequenceCanvas) { - var svg = $('svg.learningDesignSvg','#sequenceCanvas'); + var svg = $('svg.svg-learning-design','#sequenceCanvas'); if ( svg ) { var svgWidth = svg.attr('width'), svgHeight = svg.attr('height');