Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r06c6921e9173ff630c99268f69463adf1a5e4834 -rf5a9424d0eebdb6b092b3edf02d9977a0e8a7f47 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 06c6921e9173ff630c99268f69463adf1a5e4834) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f5a9424d0eebdb6b092b3edf02d9977a0e8a7f47) @@ -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 =================================================================== diff -u -re1a18b4e000fe475d25e77d53b0560c1872a472b -rf5a9424d0eebdb6b092b3edf02d9977a0e8a7f47 --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision e1a18b4e000fe475d25e77d53b0560c1872a472b) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision f5a9424d0eebdb6b092b3edf02d9977a0e8a7f47) @@ -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 =================================================================== diff -u -re1a18b4e000fe475d25e77d53b0560c1872a472b -rf5a9424d0eebdb6b092b3edf02d9977a0e8a7f47 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision e1a18b4e000fe475d25e77d53b0560c1872a472b) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision f5a9424d0eebdb6b092b3edf02d9977a0e8a7f47) @@ -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; }