Flashless Authoring

- New +

- Open +

Import

- Save +

Save as
Export +
- Sequence LAMS

- Copy +

- Paste +

- Transition +

- Optional +

Activity
Support

- Flow +

Gate
Branch

- Group +

- Annotate +

Label
Region

- Arrange +

- Preview +

- From: To: + +

- Add +

Name:

- - + +

Name	Condition

- Click here to download the image. +

- Please wait for the download.
Close the dialog when the download is finished. +

Index: lams_central/web/authoring/svgGenerator.jsp =================================================================== diff -u -rb92a2c77d9fc93b3a4100d70f95d31a78c4b6792 -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision b92a2c77d9fc93b3a4100d70f95d31a78c4b6792) +++ lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -7,32 +7,36 @@ - SVG Generator + <fmt:message key="authoring.fla.page.svg.generator.title" /> + + + Index: lams_central/web/css/authoring.css =================================================================== diff -u -r7676f06ab1c200a434600195e4380a30a7b8264b -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/css/authoring.css (.../authoring.css) (revision 7676f06ab1c200a434600195e4380a30a7b8264b) +++ lams_central/web/css/authoring.css (.../authoring.css) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -134,14 +134,20 @@ div#ldStoreDialog div#ldStoreDialogCanvasDiv { overflow: auto; - height: 665px; + /* height: 665px; */ } div#ldStoreDialog img#ldScreenshotLoading { padding-top: 200px; } -.ldStoreDialogLoad .ldStoreDialogSaveOnly { +div#ldStoreDialog #ldStoreDialogImportPartFrame { + border: none; + width: 99%; +} + +.ldStoreDialogLoad .ldStoreDialogSaveOnly, +.ldStoreDialogImportPart .ldStoreDialogSaveOnly { display: none; } Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -rfe06d16b234341fc965d9b40494e6a2fb4cb9438 -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision fe06d16b234341fc965d9b40494e6a2fb4cb9438) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -180,7 +180,7 @@ /** * Constructor for a Parallel (double) Activity */ - ParallelActivity : function(id, uiid, learningLibraryID, x, y, title, childActivityDefs){ + ParallelActivity : function(id, uiid, learningLibraryID, x, y, title, childActivities){ DecorationDefs.Container.call(this, id, uiid, title); this.id = +id || null; @@ -190,8 +190,8 @@ 'from' : [], 'to' : [] }; - if (childActivityDefs){ - this.childActivityDefs = childActivityDefs; + if (childActivities){ + this.childActivities = childActivities; } if (!isReadOnlyMode){ @@ -299,25 +299,25 @@ /** * Draws a Floating (support) Activity container */ - floatingActivity : function(x, y, ignoredParam1, ignoredParam2, childActivityDefs) { + floatingActivity : function(x, y, ignoredParam1, ignoredParam2, childActivities) { if (x == undefined || y == undefined) { // if no new coordinates are given, just redraw the activity x = this.items.shape.getBBox().x; y = this.items.shape.getBBox().y; } // either check what children are on canvas or use the priovided parameter - if (childActivityDefs) { - this.childActivityDefs = childActivityDefs; + if (childActivities) { + this.childActivities = childActivities; } - if (this.childActivityDefs && this.childActivityDefs.length > 0) { + if (this.childActivities && this.childActivities.length > 0) { // draw one by one, horizontally var activityX = x + layout.conf.containerActivityPadding, allElements = paper.set(), floatingActivity = this, box = this.items.shape.getBBox(); - $.each(this.childActivityDefs, function(orderID){ + $.each(this.childActivities, function(orderID){ this.parentActivity = floatingActivity; this.orderID = orderID; var childBox = this.items.shape.getBBox(); @@ -409,25 +409,25 @@ /** * Draws an Optional Activity container */ - optionalActivity : function(x, y, ignoredParam1, ignoredParam2, childActivityDefs) { + optionalActivity : function(x, y, ignoredParam1, ignoredParam2, childActivities) { if (x == undefined || y == undefined) { // if no new coordinates are given, just redraw the activity x = this.items.shape.getBBox().x; y = this.items.shape.getBBox().y; } // either check what children are on canvas or use the priovided parameter - if (childActivityDefs) { - this.childActivityDefs = childActivityDefs; + if (childActivities) { + this.childActivities = childActivities; } - if (this.childActivityDefs && this.childActivityDefs.length > 0) { + if (this.childActivities && this.childActivities.length > 0) { // draw one by one, vertically var activityY = y + layout.conf.containerActivityPadding + 10, allElements = paper.set(), optionalActivity = this, box = this.items.shape.getBBox(); - $.each(this.childActivityDefs, function(orderID){ + $.each(this.childActivities, function(orderID){ this.parentActivity = optionalActivity; this.orderID = orderID + 1; var childBox = this.items.shape.getBBox(); @@ -469,12 +469,12 @@ y = this.items.shape.getBBox().y; } - if (this.childActivityDefs && this.childActivityDefs.length > 0) { + if (this.childActivities && this.childActivities.length > 0) { // draw one by one, vertically var activityY = y + layout.conf.containerActivityPadding + 10, allElements = paper.set(), optionalActivity = this; - $.each(this.childActivityDefs, function(orderID){ + $.each(this.childActivities, function(orderID){ this.parentActivity = optionalActivity; this.orderID = orderID + 1; this.draw(x + layout.conf.containerActivityPadding, activityY); @@ -606,7 +606,14 @@ activityHandlersInit : function(activity) { activity.items.data('parentObject', activity); - if (!isReadOnlyMode) { + if (isReadOnlyMode) { + if (activitiesOnlySelectable) { + activity.items.click(HandlerLib.itemClickHandler) + .attr({ + 'cursor' : 'pointer' + }); + } + } else { // set all the handlers activity.items.mousedown(HandlerActivityLib.activityMousedownHandler) .click(HandlerLib.itemClickHandler) @@ -728,11 +735,11 @@ object.items.selectEffect = true; // also select encapsulated activities - var childActivityDefs = DecorationLib.getChildActivityDefs(object.items.shape); - if (childActivityDefs.length > 0) { + var childActivities = DecorationLib.getChildActivities(object.items.shape); + if (childActivities.length > 0) { object.items.fitButton.show(); - $.each(childActivityDefs, function(){ + $.each(childActivities, function(){ if (!this.parentActivity || !(this.parentActivity instanceof DecorationDefs.Container)) { ActivityLib.addSelectEffect(this, false); } @@ -763,6 +770,33 @@ 'stroke-dasharray' : '-' }); object.items.push(object.items.selectEffect); + + // if it's "import part" select children activities + if (activitiesOnlySelectable) { + if (object instanceof ActivityDefs.BranchingEdgeActivity) { + if (object.isStart){ + ActivityLib.addSelectEffect(object.branchingActivity.end); + + $.each(object.branchingActivity.branches, function(){ + var transition = this.transitionFrom; + while (transition) { + var activity = transition.toActivity; + if (activity instanceof ActivityDefs.BranchingEdgeActivity) { + return true; + } + ActivityLib.addSelectEffect(activity); + transition = activity.transitions.from.length > 0 ? activity.transitions.from[0] : null; + } + }); + } else { + ActivityLib.addSelectEffect(object.branchingActivity.start); + } + } else if (object instanceof DecorationDefs.Container){ + $.each(object.childActivities, function(){ + ActivityLib.addSelectEffect(this); + }); + } + } } // make it officially marked? @@ -844,7 +878,6 @@ } } - if (transition) { ActivityLib.removeTransition(transition, redraw); } @@ -913,8 +946,8 @@ if (!(activity instanceof ActivityDefs.OptionalActivity || activity instanceof ActivityDefs.FloatingActivity)) { // check if it was removed from an Optional or Floating Activity if (activity.parentActivity && activity.parentActivity instanceof DecorationDefs.Container) { - var childActivityDefs = DecorationLib.getChildActivityDefs(activity.parentActivity.items.shape); - if ($.inArray(activity, childActivityDefs) == -1) { + var childActivities = DecorationLib.getChildActivities(activity.parentActivity.items.shape); + if ($.inArray(activity, childActivities) == -1) { activity.parentActivity.draw(); ActivityLib.redrawTransitions(activity.parentActivity); activity.parentActivity = null; @@ -935,7 +968,7 @@ }); } if (container) { - if ($.inArray(activity, container.childActivityDefs) == -1) { + if ($.inArray(activity, container.childActivities) == -1) { $.each(activity.transitions.from, function(){ ActivityLib.removeTransition(this); }); @@ -946,8 +979,8 @@ // for properties dialog to reload ActivityLib.removeSelectEffect(container); - container.childActivityDefs.push(activity); - container.draw(null, null, null, null, childActivityDefs); + container.childActivities.push(activity); + container.draw(null, null, null, null, childActivities); ActivityLib.redrawTransitions(container); } } @@ -1066,12 +1099,12 @@ // remove the activity from parent activity if (activity.parentActivity && activity.parentActivity instanceof DecorationDefs.Container) { - activity.parentActivity.childActivityDefs.splice(activity.parentActivity.childActivityDefs.indexOf(activity), 1); + activity.parentActivity.childActivities.splice(activity.parentActivity.childActivities.indexOf(activity), 1); } // remove child activities if (activity instanceof DecorationDefs.Container) { - $.each(activity.childActivityDefs, function(){ + $.each(activity.childActivities, function(){ ActivityLib.removeActivity(this); }); } @@ -1092,7 +1125,9 @@ } if (object) { - if (object.items.selectEffect) { + var selectEffect = object.items.selectEffect; + if (selectEffect) { + object.items.selectEffect = null; // different effects for different types of objects if (object instanceof DecorationDefs.Region) { object.items.shape.attr({ @@ -1102,21 +1137,59 @@ object.items.fitButton.hide(); object.items.resizeButton.hide(); - var childActivityDefs = DecorationLib.getChildActivityDefs(object.items.shape); - $.each(childActivityDefs, function(){ + var childActivities = DecorationLib.getChildActivities(object.items.shape); + $.each(childActivities, function(){ ActivityLib.removeSelectEffect(this); }); } else if (object instanceof ActivityDefs.Transition) { // just redraw the transition, it's easier object.draw(); } else { - object.items.selectEffect.remove(); + selectEffect.remove(); + + // if it's "import part" do special processing for branching + if (activitiesOnlySelectable) { + if (object instanceof ActivityDefs.BranchingEdgeActivity) { + if (object.isStart) { + ActivityLib.removeSelectEffect(object.branchingActivity.end); + + // deselect all children in branches + $.each(object.branchingActivity.branches, function(){ + var transition = this.transitionFrom; + while (transition) { + var activity = transition.toActivity; + if (activity instanceof ActivityDefs.BranchingEdgeActivity) { + return true; + } + ActivityLib.removeSelectEffect(activity); + transition = activity.transitions.from.length > 0 ? activity.transitions.from[0] : null; + } + }); + } else { + ActivityLib.removeSelectEffect(object.branchingActivity.start); + } + } + + // deselect Parallel Activity children + $.each(layout.activities, function(){ + if (this instanceof ActivityDefs.ParallelActivity && this.childActivities.indexOf(object) > -1){ + ActivityLib.removeSelectEffect(this); + $.each(this.childActivities, function(){ + if (this != object) { + this.items.selectEffect.remove(); + this.items.selectEffect = null; + } + }); + } + }); + } } - object.items.selectEffect = null; } - // no selected activity = no properties dialog - layout.propertiesDialog.dialog('close'); + if (layout.propertiesDialog) { + // no selected activity = no properties dialog + layout.propertiesDialog.dialog('close'); + } layout.selectedObject = null; } }, Index: lams_central/web/includes/javascript/authoring/authoringDecoration.js =================================================================== diff -u -rfe06d16b234341fc965d9b40494e6a2fb4cb9438 -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/includes/javascript/authoring/authoringDecoration.js (.../authoringDecoration.js) (revision fe06d16b234341fc965d9b40494e6a2fb4cb9438) +++ lams_central/web/includes/javascript/authoring/authoringDecoration.js (.../authoringDecoration.js) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -14,7 +14,7 @@ this.id = +id || null; this.uiid = +uiid || (layout.ld ? ++layout.ld.maxUIID : null); this.title = title; - this.childActivityDefs = []; + this.childActivities = []; this.drawContainer = DecorationDefs.methods.container.draw; this.fit = DecorationDefs.methods.container.fit; @@ -46,7 +46,7 @@ Region : function(id, uiid, x, y, x2, y2, title, color) { DecorationDefs.Container.call(this, id, uiid, title); // we don't use it for region - this.childActivityDefs = null; + this.childActivities = null; this.draw = DecorationDefs.methods.region.draw; @@ -63,9 +63,9 @@ draw : function(x, y, x2, y2, color){ // check for new coordinates or just take them from the existing shape - var box = this.items ? this.items.shape.getBBox() : null, - x = x ? x : box.x, - y = y ? y : box.y, + var box = this.items ? this.items.shape.getBBox() : null, + x = x != undefined ? x : box.x, + y = y != undefined ? y : box.y, // take into account minimal size of rectangle x2 = x2 ? Math.max(x2, x + layout.conf.regionEmptyWidth) : x + box.width, y2 = y2 ? Math.max(y2, y + layout.conf.regionEmptyHeight) : y + box.height, @@ -97,7 +97,12 @@ .toBack(); this.items.push(this.items.shape); - if (!isReadOnlyMode){ + if (isReadOnlyMode){ + if (activitiesOnlySelectable) { + this.items.shape.attr('cursor', 'pointer'); + this.items.click(HandlerLib.itemClickHandler); + } + } else { this.items.shape.attr('cursor', 'pointer'); this.items.mousedown(HandlerDecorationLib.containerMousedownHandler) .click(HandlerLib.itemClickHandler); @@ -109,15 +114,15 @@ * Adjust the annotation so it envelops its child activities and nothing more. */ fit : function() { - var childActivityDefs = DecorationLib.getChildActivityDefs(this.items.shape); - if (childActivityDefs.length == 0) { + var childActivities = DecorationLib.getChildActivities(this.items.shape); + if (childActivities.length == 0) { return; } ActivityLib.removeSelectEffect(this); var allElements = paper.set(); - $.each(childActivityDefs, function(){ + $.each(childActivities, function(){ allElements.push(this.items.shape); }); // big rectangle enveloping all child activities @@ -242,7 +247,7 @@ /** * Get activities enveloped by given container */ - getChildActivityDefs : function(shape){ + getChildActivities : function(shape){ var result = []; $.each(layout.activities, function(){ if (shape != this.items.shape) { @@ -259,7 +264,7 @@ var parentObject = shape.data('parentObject'); // store the result in the shape's object if (parentObject && !(parentObject instanceof DecorationDefs.Region)) { - parentObject.childActivityDefs = result; + parentObject.childActivities = result; } return result; }, Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r7676f06ab1c200a434600195e4380a30a7b8264b -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 7676f06ab1c200a434600195e4380a30a7b8264b) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -44,6 +44,8 @@ 'modified' : false, // list of all dialogs, so they can be easily closed all at once 'dialogs' : [], + // stores precached tool images so they can be used in exported SVG + 'iconLib' : {}, // icons for special activities 'toolMetadata': { 'gate' : { @@ -53,6 +55,7 @@ 'iconPath' : '../images/grouping.gif' } }, + // graphics contants 'conf' : { 'arrangeHorizontalSpace' : 200, @@ -151,17 +154,6 @@ 'parallelChildActivityDefs' : parallelChildActivityDefs }; - - if (/\.svg$/i.test(iconPath)){ - $.ajax({ - url : iconPath, - dataType : 'text', - success : function(response) { - layout.toolMetadata[learningLibraryID].iconCode = response.substring(response.indexOf(' 0) { + $.each(addActivities, function(){ + var activity = this; + if (activity.childActivities) { + $.each(selectedActivities, function(){ + if (this.uiid == activity.uiid) { + $.each(this.childActivities, function(){ + var childActivity = this; + $.each(addActivities, function(){ + if (this.uiid == childActivity.uiid) { + if (!activity.childActivities) { + activity.childActivities = []; + } + activity.childActivities.push(this); + // container will expand to its child activities + activity.draw(0, 0); + } + }); + }); + } + }); + } + }); + + // put UIID specific to current LD + $.each(addActivities, function(){ + if (this instanceof ActivityDefs.BranchingEdgeActivity) { + if (this.isStart) { + this.branchingActivity.uiid = ++layout.ld.maxUIID; + } + } else { + this.uiid = ++layout.ld.maxUIID; + } + }); + + // arrange just the new activities + GeneralLib.arrangeActivities(addActivities); + + layout.activities = layout.activities.concat(addActivities); + } + + dialog.dialog('close'); + } + } + ]), + 'open' : function(){ GeneralLib.showLearningDesignThumbnail(); @@ -652,17 +732,129 @@ $('.defaultFocus').focus(); $(this).dialog('option', 'copiedResource', null); + }, + + /** + * Extracts a selected activity from another LD. + */ + 'importActivity' : function(activity, addActivities) { + $.each(addActivities, function(){ + if (this.uiid == activity.uiid) { + return; + } + }); + + // activities in the another LD have different clousures, so they can not be imported directly + // they need to be recreated from a scratch with current LD being their context + var frameWindow = $('#ldStoreDialogImportPartFrame', layout.ldStoreDialog)[0].contentWindow, + frameActivities = frameWindow.layout.activities, + frameActivityDefs = frameWindow.ActivityDefs, + // the local activity + addActivity = null; + + if (activity instanceof frameActivityDefs.BranchingEdgeActivity) { + // add both branching edges right away + if (activity.isStart) { + var branchingActivity = activity.branchingActivity, + branchingEdge = addActivity = new ActivityDefs.BranchingEdgeActivity( + null, branchingActivity.uiid, 0, 0, branchingActivity.title, branchingActivity.branchingType); + + branchingEdge = new ActivityDefs.BranchingEdgeActivity( + null, null, 0, 0, null, null, branchingEdge.branchingActivity); + addActivities.push(branchingEdge); + + if (branchingActivity.branchingType == 'optional'){ + branchingEdge.branchingActivity.minOptions = branchingActivity.minOptions; + branchingEdge.branchingActivity.maxOptions = branchingActivity.maxOptions; + } + } + } else if (activity instanceof frameActivityDefs.FloatingActivity) { + if (layout.floatingActivity) { + return; + } + addActivity = new ActivityDefs.FloatingActivity(null, activity.uiid, 0, 0); + } else if (activity instanceof frameActivityDefs.GateActivity) { + addActivity = new ActivityDefs.GateActivity( + null, activity.uiid, 0, 0, activity.title, activity.description, activity.gateType, + activity.startTimeoffset, activity.gateActivityCompletionBased + ); + } else if (activity instanceof frameActivityDefs.GroupingActivity) { + addActivity = new ActivityDefs.GroupingActivity( + null, activity.uiid, 0, 0, activity.title, null, null, activity.groupingType, activity.groupDivide, + activity.groupCount, activity.learnerCount, activity.equalSizes, activity.viewLearners, null + ); + } else if (activity instanceof frameActivityDefs.OptionalActivity) { + addActivity = new ActivityDefs.OptionalActivity( + null, activity.uiid, 0, 0, activity.title, activity.minOptions, activity.maxOptions + ); + } else if (activity instanceof frameActivityDefs.ParallelActivity) { + addActivity = new ActivityDefs.ParallelActivity( + null, activity.uiid, activity.learningLibraryID, 0, 0, activity.title + ); + } else if (activity instanceof frameActivityDefs.ToolActivity) { + addActivity = new ActivityDefs.ToolActivity( + null, activity.uiid, null, activity.toolID, activity.learningLibraryID, null, 0, 0, activity.title + ); + } + + // recreate the transitions + if (addActivity) { + if (activity.transitions) { + $.each(activity.transitions.from, function(){ + var transition = this; + $.each(addActivities, function(){ + // special processing for transitions from/to branching edges + var uiid = this instanceof ActivityDefs.BranchingEdgeActivity + ? this.branchingActivity.uiid : this.uiid, + toUiid = transition.toActivity instanceof frameActivityDefs.BranchingEdgeActivity + ? transition.toActivity.branchingActivity.uiid : transition.toActivity.uiid; + // isStart can be undefined, true or false + if (uiid == toUiid && this.isStart == transition.toActivity.isStart) { + ActivityLib.addTransition(addActivity, this, true, null, null, + transition.branch ? transition.branch.title : null); + return false; + } + }); + }); + + $.each(activity.transitions.to, function(){ + var transition = this; + $.each(addActivities, function(){ + var uiid = this instanceof ActivityDefs.BranchingEdgeActivity + ? this.branchingActivity.uiid : this.uiid, + fromUiid = transition.fromActivity instanceof frameActivityDefs.BranchingEdgeActivity + ? transition.fromActivity.branchingActivity.uiid : transition.fromActivity.uiid; + if (uiid == fromUiid && this.isStart == transition.fromActivity.isStart) { + ActivityLib.addTransition(this, addActivity, true, null, null, + transition.branch ? transition.branch.title : null); + return false; + } + }); + }); + } + + addActivities.push(addActivity); + } } }); layout.dialogs.push(layout.ldStoreDialog); + $('#ldScreenshotAuthor', layout.ldStoreDialog).load(function(){ // hide "loading" animation - $('.ldChoiceDependentCanvasElement', layout.ldStoreDialog).css('display', 'none'); + $('.ldChoiceDependentCanvasElement', layout.ldStoreDialog).hide(); // show the thumbnail - $(this).css('display', 'inline'); + $(this).show(); }); + + $('#ldStoreDialogImportPartFrame').load(function() { + if (!$(this).attr('src')){ + return; + } + + $(this).css('visibility', 'visible').height(+$(this).contents().find('svg').attr('height') + 20); + }); // there should be no focus, just highlight YAHOO.widget.TreeView.FOCUS_CLASS_NAME = null; @@ -685,14 +877,14 @@ }); tree.singleNodeHighlight = true; tree.subscribe('clickEvent', function(event){ - var isSaveDialog = layout.ldStoreDialog.hasClass('ldStoreDialogSave'); + var isSaveDialog = layout.ldStoreDialog.closest('.ui-dialog').hasClass('ldStoreDialogSave'); $('.leftDialogButton') .attr('disabled', event.node.highlightState > 0 ? 'disabled' : null) .button('option', 'disabled', event.node.highlightState > 0); if (!isSaveDialog && !event.node.data.learningDesignId){ - // it is a folder in load sequence dialog, hightlight but stop processing + // it is a folder in load sequence dialog, highlight but stop processing return true; } @@ -714,13 +906,15 @@ 'hide' : 'fold', 'draggable' : false, 'dialogClass': 'dialog-no-title', - 'position' : { + 'defaultPosition' : { my: "right top", at: "right top+5px", of: '#canvas' } }); + layout.infoDialog.dialog('option', 'position', layout.infoDialog.dialog('option', 'defaultPosition')); + layout.dialogs.push(layout.infoDialog); // license widgets init @@ -774,14 +968,18 @@ /** * Sorts activities on canvas. */ - arrangeActivities : function(){ - if ((layout.regions.length > 0 || layout.labels.length > 0) - && !isReadOnlyMode && !confirm(LABELS.ARRANGE_CONFIRM)) { + arrangeActivities : function(activities){ + // when importing parts of another LD, activities get appended and only they get sorted + var append = activities, + activities = activities || layout.activities; + + if (activities.length == 0) { + // no activities, nothing to do return; } - - if (layout.activities.length == 0) { - // no activities, nothing to do + + if (!append && (layout.regions.length > 0 || layout.labels.length > 0) + && !isReadOnlyMode && !confirm(LABELS.ARRANGE_CONFIRM)) { return; } @@ -790,11 +988,20 @@ HandlerLib.resetCanvasMode(true); } + var row = 0; + if (append) { + // find the lowest existing activity and append the new activities beneath + $.each(layout.activities, function(){ + row = Math.max(row, + Math.ceil((this.items.getBBox().y2 - layout.conf.arrangeVerticalPadding) + / layout.conf.arrangeVerticalSpace)); + }); + } + // activities are arranged in a grid - var row = 0, + var column = 0, // for special cases when row needs to shifted more forceRowY = null, - column = 0, // check how many columns current paper can hold maxColumns = Math.floor((paper.width - layout.conf.arrangeHorizontalPadding) / layout.conf.arrangeHorizontalSpace), @@ -805,15 +1012,15 @@ // just to speed up processing when there are only activities with no transitions left onlyDetachedLeft = false; - $.each(layout.activities, function(){ + $.each(activities, function(){ if (!this.parentActivity || !(this.parentActivity instanceof DecorationDefs.Container)){ activitiesCopy.push(this); } }); // branches will not be broken into few rows; if they are long, paper will be resized // find the longes branch to find the new paper size - $.each(layout.activities, function(){ + $.each(activities, function(){ if (this instanceof ActivityDefs.BranchingEdgeActivity && this.isStart) { // refresh branching metadata ActivityLib.updateBranchesLength(this.branchingActivity); @@ -826,8 +1033,8 @@ }); // check how many child activities are in Floating Activity, if any - if (layout.floatingActivity && layout.floatingActivity.childActivityDefs.length > subsequenceMaxLength) { - subsequenceMaxLength = childActivityDefs.length; + if (layout.floatingActivity && layout.floatingActivity.childActivities.length > subsequenceMaxLength) { + subsequenceMaxLength = childActivities.length; } // resize paper horizontally, if needed @@ -956,7 +1163,7 @@ // learn where a tall Optional Activity has its end // and later start drawing activities lower than in the next row - if (activity instanceof DecorationDefs.Container && activity.childActivityDefs.length > 1) { + if (activity instanceof DecorationDefs.Container && activity.childActivities.length > 1) { var activityEndY = activity.items.shape.getBBox().y2; if (!forceRowY || activityEndY > forceRowY) { forceRowY = activityEndY; @@ -1043,7 +1250,7 @@ } // redraw transitions one by one - $.each(layout.activities, function(){ + $.each(activities, function(){ $.each(this.transitions.from.slice(), function(){ ActivityLib.addTransition(this.fromActivity, this.toActivity, true); }); @@ -1437,10 +1644,10 @@ if (layout.floatingActivity && layout.floatingActivity.id == activityData.parentActivityID) { // add a Tool Activity as a Floating Activity element - if (!layout.floatingActivity.childActivityDefs) { - layout.floatingActivity.childActivityDefs = []; + if (!layout.floatingActivity.childActivities) { + layout.floatingActivity.childActivities = []; } - layout.floatingActivity.childActivityDefs.push(activity); + layout.floatingActivity.childActivities.push(activity); activity.parentActivity = layout.floatingActivity; if (!arrangeNeeded){ // if no auto re-arrange will be done, just redraw the container with its child activities @@ -1455,10 +1662,10 @@ && (this instanceof ActivityDefs.ParallelActivity || this instanceof ActivityDefs.OptionalActivity)) { // add a Tool Activity as a Optional/Parallel Activity element - if (!this.childActivityDefs) { - this.childActivityDefs = []; + if (!this.childActivities) { + this.childActivities = []; } - this.childActivityDefs.push(activity); + this.childActivities.push(activity); activity.parentActivity = this; if (!arrangeNeeded) { // if no auto re-arrange will be done, just redraw the container with its child activities @@ -1614,11 +1821,11 @@ GeneralLib.updateAccess(response.access); if (!ld.validDesign && !isReadOnlyMode) { - var dialog = layout.infoDialog.html(LABELS.SEQUENCE_NOT_VALID); - dialog.dialog('open'); + layout.infoDialog.text(LABELS.SEQUENCE_NOT_VALID) + .dialog('open'); setTimeout(function(){ - dialog.text('').dialog('close'); + layout.infoDialog.text('').dialog('close'); }, 5000); } } @@ -2239,16 +2446,27 @@ */ showLearningDesignThumbnail : function(learningDesignID, title) { // display "loading" animation and finally LD thumbnail - $('.ldChoiceDependentCanvasElement').css('display', 'none'); + $('.ldChoiceDependentCanvasElement').hide(); + // the "import part" frame can't use "display:none" CSS attribute as its JS won't execute right + $('#ldStoreDialogImportPartFrame', layout.ldStoreDialog).css('visibility', 'hidden'); + if (learningDesignID) { - $('#ldScreenshotLoading', layout.ldStoreDialog).css('display', 'inline'); - // get the image of the chosen LD and prevent caching - $('#ldScreenshotAuthor', layout.ldStoreDialog) - .attr('src', LD_THUMBNAIL_URL_BASE + learningDesignID + '&_=' + new Date().getTime()) - .css({ - 'width' : 'auto', - 'height' : 'auto' - }); + if (layout.ldStoreDialog.closest('.ui-dialog').hasClass('ldStoreDialogImportPart')) { + // get read-only Authoring of the chosen LD and prevent caching + $('#ldStoreDialogImportPartFrame', layout.ldStoreDialog).attr('src', + LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=true&learningDesignID=' + + learningDesignID + '&_=' + new Date().getTime()); + } else { + $('#ldScreenshotLoading', layout.ldStoreDialog).show(); + // get the image of the chosen LD and prevent caching + $('#ldScreenshotAuthor', layout.ldStoreDialog) + .attr('src', LD_THUMBNAIL_URL_BASE + learningDesignID + '&_=' + new Date().getTime()) + .css({ + 'width' : 'auto', + 'height' : 'auto' + }); + } + if (title) { // copy title of the highligthed sequence to title field $('#ldStoreDialogNameField').val(title).focus(); @@ -2322,7 +2540,7 @@ return; } - var isSaveDialog = layout.ldStoreDialog.hasClass('ldStoreDialogSave'), + var isSaveDialog = layout.ldStoreDialog.closest('.ui-dialog').hasClass('ldStoreDialogSave'), learningDesignID = +accessEntry.attr('learningDesignId'), title = isSaveDialog ? accessEntry.text() : null; Index: lams_central/web/includes/javascript/authoring/authoringHandler.js =================================================================== diff -u -rb92a2c77d9fc93b3a4100d70f95d31a78c4b6792 -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision b92a2c77d9fc93b3a4100d70f95d31a78c4b6792) +++ lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -63,10 +63,10 @@ // hide child activities while moving the parent around if (sticky) { - $.each(parentObject.childActivityDefs, function(){ + $.each(parentObject.childActivities, function(){ this.items.hide(); - if (this.childActivityDefs) { - $.each(this.childActivityDefs, function() { + if (this.childActivities) { + $.each(this.childActivities, function() { this.items.hide(); }); } @@ -163,7 +163,15 @@ var parentObject = this.data('parentObject'); // inform that user wants to select, not drag the activity parentObject.items.clicked = true; - if (parentObject != layout.selectedObject) { + + // if it's "import part" allow multiple selection of activities + if (activitiesOnlySelectable) { + if (parentObject.items.selectEffect) { + ActivityLib.removeSelectEffect(parentObject); + } else { + ActivityLib.addSelectEffect(parentObject); + } + } else if (parentObject != layout.selectedObject) { HandlerLib.canvasClickHandler(event); ActivityLib.addSelectEffect(parentObject, true); } @@ -364,9 +372,9 @@ }); // immediatelly show which activities will be enveloped - var childActivityDefs = DecorationLib.getChildActivityDefs(data.shape); + var childActivities = DecorationLib.getChildActivities(data.shape); $.each(layout.activities, function(){ - if (!this.parentActivity && $.inArray(this, childActivityDefs) > -1){ + if (!this.parentActivity && $.inArray(this, childActivities) > -1){ ActivityLib.addSelectEffect(this, false); } else { ActivityLib.removeSelectEffect(this); Index: lams_central/web/includes/javascript/authoring/authoringMenu.js =================================================================== diff -u -rfe06d16b234341fc965d9b40494e6a2fb4cb9438 -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 --- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision fe06d16b234341fc965d9b40494e6a2fb4cb9438) +++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51) @@ -304,11 +304,10 @@ var startActivity = null, targetElement = paper.getElementByPoint(event.pageX, event.pageY); - if (targetElement) { startActivity = targetElement.data('parentObject'); if (startActivity) { - HandlerPropertyLib.approachPropertiesDialogHandler(startActivity, null, event.pageX, event.pageY); + HandlerTransitionLib.drawTransitionStartHandler(startActivity, null, event.pageX, event.pageY); } } }); @@ -396,36 +395,48 @@ } // replace image links with PNG code - var iconLibrary = {}; crop.canvasClone.find('image').each(function(){ - var attributeName = 'xlink:href', - iconLink = $(this).attr(attributeName); - if (!iconLink) { + var image = $(this), + attributeName = 'xlink:href', + iconPath = image.attr(attributeName); + if (!iconPath) { attributeName = 'href', - iconLink = $(this).attr(attributeName); + iconPath = image.attr(attributeName); } - var iconCode = iconLibrary[iconLink]; - if (!iconCode) { - $.ajax({ - url : iconLink, - async: false, - dataType : 'text', - success : function(response) { - iconCode = iconLibrary[iconLink] = response; - } - }); + var iconCode = null, + extensionIndex = iconPath.indexOf('.svg'); + + if (extensionIndex > -1) { + var pngPath = iconPath.substring(0, extensionIndex) + '.png'; + // PNG images got precached when dropping tools on canvas + iconCode = layout.iconLib[pngPath]; + + if (!iconCode) { + // no precached PNG image, generate one from SVG + $.ajax({ + url : iconPath, + async: false, + dataType : 'text', + success : function(response) { + var workspace = $('