Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rc82d171dbdd8918839e396f2851d6e11b68bb9e8 -r38958996ae395c115f19f42747bdcddfc9e7c1ad
--- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision c82d171dbdd8918839e396f2851d6e11b68bb9e8)
+++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -8,6 +8,7 @@
+
Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 -r38958996ae395c115f19f42747bdcddfc9e7c1ad
--- lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9)
+++ lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -5,6 +5,8 @@
<fmt:message key="authoring.fla.page.svg.generator.title" />
+
+
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -rad1ff0d36bbc9744c0e0e61aec07c9360faee906 -r38958996ae395c115f19f42747bdcddfc9e7c1ad
--- lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision ad1ff0d36bbc9744c0e0e61aec07c9360faee906)
+++ lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -535,96 +535,12 @@
width: 99%;
}
-/**** Canvas styles ****/
-
#canvas {
overflow: auto;
vertical-align: top;
background: $canvas-dot-background;
}
-
-#canvas .tool-activity-border {
- fill: none;
- stroke: black;
- stroke-width: 1;
-}
-
-#canvas .tool-activity-border-require-grouping {
- fill: none;
- stroke: red;
- stroke-width: 3;
-}
-
-#canvas .tool-activity-background {
- stroke: none;
- fill: white;
-}
-
-#canvas .tool-activity-category-1 {
- stroke: none;
- fill: #caddfb;
-}
-
-#canvas .tool-activity-category-2 {
- stroke: none;
- fill: #ffffbb;
-}
-
-#canvas .tool-activity-category-3 {
- stroke: none;
- fill: #ece9f7;
-}
-
-#canvas .tool-activity-category-4 {
- stroke: none;
- fill: #fdf1d3;
-}
-
-#canvas .tool-activity-category-5 {
- stroke: none;
- fill: #caddfb;
-}
-
-#canvas .tool-activity-category-6 {
- stroke: none;
- fill: #e9f9c0;
-}
-
-#canvas .branching {
- stroke-width: 3;
- fill: white;
-}
-
-#canvas .branching-start {
- stroke: green;
-}
-
-#canvas .branching-end {
- stroke: red;
-}
-
-#canvas .branching-match {
- stroke: blue;
-}
-
-#canvas .transition {
- stroke-width: 1;
- stroke: rgb(119,126,157);
- fill: none;
-}
-
-#canvas .transition-element {
- stroke: rgb(119,126,157);
- fill: rgb(119,126,157);
-}
-
-#canvas .transition-draw {
- stroke-width: 2;
- stroke: rgb(119,126,157);
- stroke-dasharray: 5,3;
-}
-
/**** Template styles */
#templateErrorMessages {
Index: lams_central/web/css/authoring-svg.css
===================================================================
diff -u
--- lams_central/web/css/authoring-svg.css (revision 0)
+++ lams_central/web/css/authoring-svg.css (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -0,0 +1,80 @@
+.svg-tool-activity-border {
+ fill: none;
+ stroke: black;
+ stroke-width: 1;
+}
+
+.svg-tool-activity-border-require-grouping {
+ fill: none;
+ stroke: red;
+ stroke-width: 3;
+}
+
+.svg-tool-activity-background {
+ stroke: none;
+ fill: white;
+}
+
+.svg-tool-activity-category-1 {
+ stroke: none;
+ fill: #caddfb;
+}
+
+.svg-tool-activity-category-2 {
+ stroke: none;
+ fill: #ffffbb;
+}
+
+.svg-tool-activity-category-3 {
+ stroke: none;
+ fill: #ece9f7;
+}
+
+.svg-tool-activity-category-4 {
+ stroke: none;
+ fill: #fdf1d3;
+}
+
+.svg-tool-activity-category-5 {
+ stroke: none;
+ fill: #caddfb;
+}
+
+.svg-tool-activity-category-6 {
+ stroke: none;
+ fill: #e9f9c0;
+}
+
+.svg-branching {
+ stroke-width: 3;
+ fill: white;
+}
+
+.svg-branching-start {
+ stroke: green;
+}
+
+.svg-branching-end {
+ stroke: red;
+}
+
+.svg-branching-match {
+ stroke: blue;
+}
+
+.svg-transition {
+ stroke-width: 1;
+ stroke: rgb(119, 126, 157);
+ fill: none;
+}
+
+.svg-transition-element {
+ stroke: rgb(119, 126, 157);
+ fill: rgb(119, 126, 157);
+}
+
+.svg-transition-draw {
+ stroke-width: 2;
+ stroke: rgb(119, 126, 157);
+ stroke-dasharray: 5, 3;
+}
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3 -r38958996ae395c115f19f42747bdcddfc9e7c1ad
--- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -383,7 +383,7 @@
// create activity SVG elements
var shape = paper.circle(x, y, 20)
- .addClass('branching branching-' + (this.isStart ? 'start' : 'end'));
+ .addClass('svg-branching svg-branching-' + (this.isStart ? 'start' : 'end'));
this.items = paper.g(shape);
if (this.readOnly && !isReadOnlyMode) {
@@ -681,9 +681,9 @@
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)
- .addClass('tool-activity-background'),
+ .addClass('svg-tool-activity-background'),
shapeBorder = paper.path(shapePath)
- .addClass('tool-activity-border' + (this.requireGrouping ? '-require-grouping' : '')),
+ .addClass('svg-tool-activity-border' + (this.requireGrouping ? '-require-grouping' : '')),
// check for icon in the library
imageData = null, // ActivityIcons[this.learningLibraryID],
icon = imageData ? paper.image(imageData, x + 5, y + 3, 20, 20) : null,
@@ -697,7 +697,7 @@
bannerPath += ' h ' + bannerWidth + ' v ' + height + ' z';
var banner = paper.path(bannerPath)
- .addClass('tool-activity-category-' + layout.toolMetadata[this.learningLibraryID].activityCategoryID);
+ .addClass('svg-tool-activity-category-' + layout.toolMetadata[this.learningLibraryID].activityCategoryID);
this.items = paper.g(shape, banner, shapeBorder, label);
if (icon) {
@@ -780,13 +780,13 @@
path += Snap.format(' L {endX} {endY}', points);
}
- this.items.shape = paper.path(path).addClass('transition');
+ this.items.shape = paper.path(path).addClass('svg-transition');
this.items.append(this.items.shape);
- var dot = paper.circle(points.startX, points.startY, layout.transition.dotRadius).addClass('transition-element'),
+ var dot = paper.circle(points.startX, points.startY, layout.transition.dotRadius).addClass('svg-transition-element'),
side = layout.transition.arrowLength,
triangle = paper.polygon(0, 0, side, 2 * side, -side, 2 * side)
- .addClass('transition-element')
+ .addClass('svg-transition-element')
.transform(Snap.format('translate({endX} {endY}) rotate({arrowAngle})', points));
this.items.append(dot);
this.items.append(triangle);
@@ -937,7 +937,7 @@
activityBox.width,
activityBox.height,
5, 5)
- .addClass('tool-activity-border');
+ .addClass('svg-tool-activity-border');
activity.items.prepend(activity.items.groupingEffect);
Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
diff -u -r13656a17eca2fd32f6c39afa912bb01336582258 -r38958996ae395c115f19f42747bdcddfc9e7c1ad
--- lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision 13656a17eca2fd32f6c39afa912bb01336582258)
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -409,8 +409,8 @@
startItems = branchingActivity.start.items,
endItems = branchingActivity.end.items;
if (!startItems.isDragged && !endItems.isDragged) {
- startItems.shape.addClass('branching-match');
- endItems.shape.addClass('branching-match');
+ startItems.shape.addClass('svg-branching-match');
+ endItems.shape.addClass('svg-branching-match');
}
},
@@ -424,8 +424,8 @@
endItems = branchingActivity.end.items;
if (!startItems.isDragged && !endItems.isDragged) {
- startItems.shape.removeClass('branching-match');
- endItems.shape.removeClass('branching-match');
+ startItems.shape.removeClass('svg-branching-match');
+ endItems.shape.removeClass('svg-branching-match');
}
}
},
@@ -721,7 +721,7 @@
'endX' : endX,
'endY' : endY
}))
- .addClass('transition-draw')
+ .addClass('svg-transition-draw')
);
},
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r09831591952e208b90ca0df0bdaa98d670017e04 -r38958996ae395c115f19f42747bdcddfc9e7c1ad
--- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 09831591952e208b90ca0df0bdaa98d670017e04)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 38958996ae395c115f19f42747bdcddfc9e7c1ad)
@@ -292,6 +292,19 @@
// reset any cursor=pointer styles
$('*[style*="cursor"]', svg).css('cursor', 'default');
+ // append SVG CSS straight into SVG file
+ $.ajax({
+ 'url' : LAMS_URL + 'css/authoring-svg.css',
+ 'dataType': 'text',
+ 'async' : false,
+ 'success' : function(css) {
+ let styleElement = document.createElement("style"),
+ styleContent = document.createTextNode(css);
+ styleElement.appendChild(styleContent);
+ svg.appendChild(styleElement);
+ }
+ });
+
return crop.canvasClone.html();
},