Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -r07b056c293f01953393020b340c932d99c4a0a0b -r465292cd8075b0bdae2673ea9d095b5a0ede2562 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 07b056c293f01953393020b340c932d99c4a0a0b) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 465292cd8075b0bdae2673ea9d095b5a0ede2562) @@ -419,7 +419,8 @@ }) ) .attr({ - 'stroke' : layout.colors.activityBorder, + 'stroke' : layout.colors.gateBorder, + 'stroke-width' : '0.5', 'fill' : layout.colors.gate }), label = paper.text(x + 17, y + 20, LABELS.GATE_ACTIVITY_LABEL) @@ -439,7 +440,7 @@ /** - * Draws a Gropuing activity + * Draws a Grouping activity */ grouping : function(x, y) { if (x == undefined || y == undefined) { @@ -460,7 +461,8 @@ }) ) .attr({ - 'stroke' : layout.colors.activityBorder, + 'stroke' : layout.colors.groupingBorder, + 'stroke-width' : '0.5', 'fill' : layout.colors.grouping }), icon = paper.image(ActivityIcons.grouping, x + 47, y - 3, 32, 45), @@ -608,7 +610,9 @@ })) // activity colour depends on its category ID .attr({ - 'stroke' : layout.colors.activityBorder, + 'stroke' : layout.colors.toolActivityBorder[layout.toolMetadata[this.learningLibraryID].activityCategoryID], + 'stroke-width' : '0.5', + 'stroke-linejoin' : 'round', 'fill' : layout.colors.activity[layout.toolMetadata[this.learningLibraryID].activityCategoryID] }), // check for icon in the library @@ -1641,4 +1645,4 @@ branchingActivity.longestBranchLength = longestBranchLength; } -}; \ No newline at end of file +}; Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r9e33d20d9a3e759ecded45737d22d429b7dfccb6 -r465292cd8075b0bdae2673ea9d095b5a0ede2562 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 9e33d20d9a3e759ecded45737d22d429b7dfccb6) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 465292cd8075b0bdae2673ea9d095b5a0ede2562) @@ -94,9 +94,10 @@ }, 'colors' : { - 'activityBorder' : 'black', + 'activityBorder' : 'black', + 'toolActivityBorder' : ['','#808699','#ff0000','#625F67','#ffa500','#808080','#7aa712'], // each activity type has its own colour - 'activity' : ['','#d0defd','#fffccb','#ece9f7','#fdf1d3','#FFFFFF','#e9f9c0'], + 'activity' : ['','#d0defd','#fffccb','#ece9f7','#fdf1d3','#ffffff','#e9f9c0'], 'activityText' : 'black', // default region colour 'annotation' : '#FFFF00', @@ -113,11 +114,13 @@ // highlight branching edges on mouse hover 'branchingEdgeMatch' : 'blue', 'gate' : 'red', + 'gateBorder' : '#801515', 'gateText' : 'white', - 'grouping' : '#A9C8FD', + 'grouping' : '#A9C8FD', + 'groupingBorder' : '#485067', 'optionalActivity' : 'rgb(194,213,254)', // dashed border around a selected activity - 'selectEffect' : 'blue', + 'selectEffect' : 'black', 'transition' : 'rgb(119,126,157)' }, @@ -2736,4 +2739,4 @@ }); } } -}; \ No newline at end of file +};