Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -rba0b6ca7b5ed75f69143083e65aec36449ccc175 -rfd99c71413b4f127abf737f0faada908aaabbeea --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision ba0b6ca7b5ed75f69143083e65aec36449ccc175) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision fd99c71413b4f127abf737f0faada908aaabbeea) @@ -694,9 +694,14 @@ var curve = layout.activity.borderCurve, width = layout.activity.width, height = layout.activity.height, - bannerWidth = layout.activity.bannerWidth, bannerPath = 'M ' + (x + curve) + ' ' + (y + height) + ' q ' + -curve + ' 0 ' + -curve + ' ' + -curve + ' v ' + (-height + 2 * curve) + ' q 0 ' + -curve + ' ' + curve + ' ' + -curve, + bannerWidePath = bannerPath + ' h ' + layout.activity.bannerWideWidth + ' v ' + height + ' z', + bannerNarrowPath = bannerPath + ' h ' + layout.activity.bannerNarrowWidth + ' v ' + height + ' z', + bannerWide = paper.path(bannerWidePath) + .addClass('svg-tool-banner-wide svg-tool-activity-category-' + layout.toolMetadata[this.learningLibraryID].activityCategoryID), + bannerNarrow = paper.path(bannerNarrowPath) + .addClass('svg-tool-banner-narrow svg-tool-activity-category-' + layout.toolMetadata[this.learningLibraryID].activityCategoryID), shapePath = bannerPath + ' h ' + (width - 2 * curve) + ' q ' + curve + ' 0 ' + curve + ' ' + curve + ' v ' + (height - 2 * curve) + ' q 0 ' + curve + ' ' + -curve + ' ' + curve + ' z', shape = paper.path(shapePath) @@ -705,18 +710,16 @@ .addClass('svg-tool-activity-border' + (this.requireGrouping ? '-require-grouping' : '')), label = ActivityLib.getActivityTitle(this.title, x, y), icon = ActivityLib.getActivityIcon(this.learningLibraryID); + + $(bannerNarrow.node).hide(); + this.items = paper.g(shape, bannerWide, bannerNarrow, shapeBorder, label); - bannerPath += ' h ' + bannerWidth + ' v ' + height + ' z'; - var banner = paper.path(bannerPath) - .addClass('svg-tool-activity-category-' + layout.toolMetadata[this.learningLibraryID].activityCategoryID); - this.items = paper.g(shape, banner, shapeBorder, label); - if (icon) { icon.select('svg').attr({ - 'x' : x + 20, - 'y' : y + 15, - 'width' : '50px', - 'height': '50px' + 'x' : x + 15, + 'y' : y + 20, + 'width' : '40px', + 'height': '40px' }); this.items.add(icon); } Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -rba0b6ca7b5ed75f69143083e65aec36449ccc175 -rfd99c71413b4f127abf737f0faada908aaabbeea --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision ba0b6ca7b5ed75f69143083e65aec36449ccc175) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision fd99c71413b4f127abf737f0faada908aaabbeea) @@ -101,7 +101,8 @@ 'width' : 200, 'height' : 80, 'borderCurve' : 5, - 'bannerWidth' : 10 + 'bannerNarrowWidth' : 10, + 'bannerWideWidth' : 60 }, 'transition' : { Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rce46e7236188aeb13a7b1d70e5a9cb2b42b4d967 -rfd99c71413b4f127abf737f0faada908aaabbeea --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision ce46e7236188aeb13a7b1d70e5a9cb2b42b4d967) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision fd99c71413b4f127abf737f0faada908aaabbeea) @@ -1621,6 +1621,10 @@ 'height': '30px' }); + // switch from wide banner to narrow one + $('.svg-tool-banner-narrow', activityGroup).show(); + $('.svg-tool-banner-wide', activityGroup).hide(); + $('.svg-activity-title-label', activityGroup).parent('foreignObject').remove(); $('').text(activity.title.length < 20 ? activity.title : activity.title.substring(0, 20) + '...') .attr({