Index: lams_central/web/css/_authoring_base.scss =================================================================== diff -u -r4bea78d244f7b7699ee333a1f19f4a31e3b2bb74 -rad1ff0d36bbc9744c0e0e61aec07c9360faee906 --- lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision 4bea78d244f7b7699ee333a1f19f4a31e3b2bb74) +++ lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision ad1ff0d36bbc9744c0e0e61aec07c9360faee906) @@ -591,18 +591,21 @@ fill: #e9f9c0; } +#canvas .branching { + stroke-width: 3; + fill: white; +} + #canvas .branching-start { - stroke: black; - fill: green; + stroke: green; } #canvas .branching-end { - stroke: black; - fill: red; + stroke: red; } #canvas .branching-match { - fill: blue; + stroke: blue; } #canvas .transition { Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -r7a19ceb8e410d05b61f130d3416ee06e36be5dd1 -rad1ff0d36bbc9744c0e0e61aec07c9360faee906 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 7a19ceb8e410d05b61f130d3416ee06e36be5dd1) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision ad1ff0d36bbc9744c0e0e61aec07c9360faee906) @@ -380,21 +380,12 @@ x = GeneralLib.snapToGrid(x); y = GeneralLib.snapToGrid(y); - + // create activity SVG elements - var shape = paper.path(Snap.format('M {x} {y} a 8 8 0 1 0 16 0 a 8 8 0 1 0 -16 0', - { - 'x' : x, - 'y' : y + 8 - }) - ) - .addClass('branching-' + (this.isStart ? 'start' : 'end')), - title = this.branchingActivity.title, - label = paper.text(x + 8, y + 27, title + ' ' + (this.isStart ? LABELS.BRANCHING_START_SUFFIX - : LABELS.BRANCHING_END_SUFFIX)) - .attr(layout.defaultTextAttributes); + var shape = paper.circle(x, y, 20) + .addClass('branching branching-' + (this.isStart ? 'start' : 'end')); - this.items = paper.g(shape, label); + this.items = paper.g(shape); if (this.readOnly && !isReadOnlyMode) { this.items.attr('filter', layout.conf.readOnlyFilter); } @@ -804,7 +795,6 @@ this.items.attr('uiid', this.uiid); if (this.title) { - console.log(points.arrowAngle); // adjust X & Y, so the label does not overlap with the transition; var label = paper.text(points.middleX, points.middleY, this.title) .attr(layout.defaultTextAttributes);