Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.138.2.9 -r1.138.2.10
--- lams_central/conf/language/lams/ApplicationResources.properties 9 Jun 2015 20:20:02 -0000 1.138.2.9
+++ lams_central/conf/language/lams/ApplicationResources.properties 30 Jun 2015 09:12:30 -0000 1.138.2.10
@@ -516,6 +516,7 @@
authoring.fla.paste.error =Sorry, you can not paste this type of activity
authoring.fla.preview.error =Error while initialising lesson for preview
authoring.fla.cross.branching.error =Cross-branching transitions are not allowed
+authoring.fla.support.transition.error =Support activities can not be connected to any other activity
authoring.fla.end.match.error =: a branch that ends in this branching does not start in it
authoring.fla.ok.button =OK
authoring.fla.cancel.button =Cancel
Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.6.2.13 -r1.6.2.14
--- lams_central/web/authoring/authoring.jsp 26 Jun 2015 08:37:52 -0000 1.6.2.13
+++ lams_central/web/authoring/authoring.jsp 30 Jun 2015 09:12:30 -0000 1.6.2.14
@@ -182,6 +182,8 @@
PREVIEW_ERROR : decoderDiv.html('').text(),
CROSS_BRANCHING_ERROR : decoderDiv.html('').text(),
+
+ SUPPORT_TRANSITION_ERROR : decoderDiv.html('').text(),
END_MATCH_ERROR : decoderDiv.html('').text(),
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v
diff -u -r1.38.2.13 -r1.38.2.14
--- lams_central/web/includes/javascript/authoring/authoringActivity.js 26 Jun 2015 08:37:52 -0000 1.38.2.13
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js 30 Jun 2015 09:12:30 -0000 1.38.2.14
@@ -882,6 +882,7 @@
// no transitions to/from support activities
if (toActivity instanceof ActivityDefs.FloatingActivity
|| fromActivity instanceof ActivityDefs.FloatingActivity){
+ alert(LABELS.SUPPORT_TRANSITION_ERROR);
return;
}