Index: lams_central/web/css/_authoring_base.scss =================================================================== diff -u -rca9b0a623a0482a1a9144a3f4309622c37c6fc65 -r9b5693ed6b00ee01c45c30b872d2277e4d85e42d --- lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision ca9b0a623a0482a1a9144a3f4309622c37c6fc65) +++ lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision 9b5693ed6b00ee01c45c30b872d2277e4d85e42d) @@ -592,18 +592,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 -r56793ebe8b7fa9e4eb2d961b13a9f2b8984fb389 -r9b5693ed6b00ee01c45c30b872d2277e4d85e42d --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 56793ebe8b7fa9e4eb2d961b13a9f2b8984fb389) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 9b5693ed6b00ee01c45c30b872d2277e4d85e42d) @@ -386,21 +386,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); } @@ -810,7 +801,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);