Index: lams_central/web/author2.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/author2.jsp,v
diff -u -r1.8 -r1.9
--- lams_central/web/author2.jsp	11 Nov 2013 18:48:10 -0000	1.8
+++ lams_central/web/author2.jsp	14 Nov 2013 13:11:43 -0000	1.9
@@ -61,6 +61,12 @@
 		<div class="ui-button" onClick="javascript:MenuLib.arrangeActivities()">
 			Arrange
 		</div>
+		<div class="ui-button" onClick="javascript:MenuLib.copyActivity()">
+			Copy
+		</div>
+		<div class="ui-button" onClick="javascript:MenuLib.pasteActivity()">
+			Paste
+		</div>
 	</div>
 	<table id="authoringTable">
 		<tr>
@@ -82,50 +88,65 @@
 		</tr>
 	</table>
 	
-	<div id="openLearningDesignDialog" class="dialogContainer">
-		<div class="dialogTitle">Open sequence</div>
+	
+	<div id="ldStoreDialog" class="dialogContainer">
+		<div class="ldStoreDialogTitle">Open sequence</div>
 		<table>
 			<tr>
-				<td id="learningDesignTreeCell">
-					<div id="learningDesignTree"></div>
+				<td id="ldStoreDialogTreeCell">
+					<div id="ldStoreDialogTree"></div>
 				</td>
-				<td id="canvasCell" rowspan="2">
-					<div id="canvasDiv">
+				<td id="ldStoreDialogCanvasCell" rowspan="2">
+					<div id="ldStoreDialogCanvasDiv">
 			    		<img id="ldScreenshotAuthor" class="ldChoiceDependentCanvasElement" />
-		    			<img id="ldScreenshotLoading" class="ldChoiceDependentCanvasElement" src="<lams:LAMSURL/>images/ajax-loader-big.gif" />
+		    			<img id="ldScreenshotLoading" class="ldChoiceDependentCanvasElement"
+		    			     src="<lams:LAMSURL/>images/ajax-loader-big.gif" />
 			    	</div>
 				</td>
 			</tr>
 			<tr>
-				<td id="recentlyUsedCell" >
+				<td id="ldStoreDialogRecentlyUsedCell" >
 					Recently used sequences
 				</td>
 			</tr>
 		</table>
 	</div>
 	
-	<div id="infoDialog" class="dialogContainer">
-	</div>
 	
-	
 	<div id="propertiesContentTool" class="dialogContainer">
 		<table>
 			<tr>
 				<td>
 					Title:
 				</td>
 				<td>
-					 <input class="title" type="text"></input>
+					 <input class="propertiesContentFieldTitle" type="text"></input>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					Grouping:
 				</td>
 				<td>
-					  <select class="grouping"></select>
+					  <select class="propertiesContentFieldGrouping"></select>
 				</td>
 			</tr>
+			<tr>
+				<td>
+					Offline Activity:
+				</td>
+				<td>
+					  <input type="checkbox" class="propertiesContentFieldOffline" /> 
+				</td>
+			</tr>
+			<tr>
+				<td>
+					Define in Monitor:
+				</td>
+				<td>
+					  <input type="checkbox" class="propertiesContentFieldDefineMonitor" />
+				</td>
+			</tr>
 		</table>
 	</div>
 	
@@ -136,11 +157,36 @@
 					Title:
 				</td>
 				<td>
-					 <input class="title" type="text"></input>
+					 <input class="propertiesContentFieldTitle" type="text"></input>
 				</td>
 			</tr>
 		</table>
 	</div>
 	
+	<div id="propertiesContentGate" class="dialogContainer">
+		<table>
+			<tr>
+				<td>
+					Title:
+				</td>
+				<td>
+					 <input class="propertiesContentFieldTitle" type="text"></input>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					Title:
+				</td>
+				<td>
+					 <select class="propertiesContentFieldGateType">
+					 	<option value="condition">Condition</option>
+					 	<option value="sync">Synchronise</option>
+					 	<option value="schedule">Schedule</option>
+					 	<option value="permission">Permission</option>
+					 </select>
+				</td>
+			</tr>
+		</table>
+	</div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/css/authoring.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v
diff -u -r1.5 -r1.6
--- lams_central/web/css/authoring.css	8 Nov 2013 13:57:43 -0000	1.5
+++ lams_central/web/css/authoring.css	14 Nov 2013 13:11:43 -0000	1.6
@@ -1,3 +1,5 @@
+/**** Global styles ****/
+
 .ygtv-highlight1, .ygtv-highlight1 .ygtvlabel {
 	background-color: #dfeffc;
 }
@@ -6,6 +8,10 @@
 	border-bottom: none;
 }
 
+
+
+/**** Dialog styles ****/
+
 .ui-dialog {
 	font-size: 12px;
 }
@@ -15,35 +21,44 @@
 	display: none;
 }
 
-#infoDialog {
-	font-weight: bold;
-}
-
 div.dialogTitle {
 	padding: 5px 0px 5px 0px;
 	font-weight: bold;
 	text-align: center;
 }
 
-div#openLearningDesignDialog > table {
+
+
+div.propertiesDialogContainer .ui-dialog-titlebar {
+	padding: 0 0 0 5px;
+}
+
+
+div#infoDialog {
+	font-weight: bold;
+	display: none;
+}
+
+
+div#ldStoreDialog > table {
 	width: 100%;
 	height: 684px;
 	table-layout: fixed;
 	border-top: thin dotted #2E6E9E;
 }
 
-div#openLearningDesignDialog td#learningDesignTreeCell {
+div#ldStoreDialog td#ldStoreDialogTreeCell {
 	padding: 2px 2px 0px 5px;
 	vertical-align: top;
 	width: 200px;
 	border-right: thin dotted #2E6E9E;
 }
 
-div#openLearningDesignDialog div#learningDesignTree {
+div#ldStoreDialog div#ldStoreDialogTree {
 	overflow: auto;
 }
 
-div#openLearningDesignDialog #recentlyUsedCell {
+div#ldStoreDialog #ldStoreDialogRecentlyUsedCell {
 	height: 200px;
 	vertical-align: top;
 	border-top: thin dotted #2E6E9E;
@@ -54,21 +69,25 @@
 	text-align: center;
 }
 
-div#openLearningDesignDialog td#canvasCell {
+div#ldStoreDialog td#ldStoreDialogCanvasCell {
 	text-align: center;
 	padding: 10px 0px 0px 10px;
 	vertical-align: middle;
 }
 
-div#openLearningDesignDialog div#canvasDiv {
+div#ldStoreDialog div#ldStoreDialogCanvasDiv {
 	overflow: auto;
 	height: 665px;
 }
 
-div#openLearningDesignDialog img#ldScreenshotLoading  {
+div#ldStoreDialog img#ldScreenshotLoading  {
 	padding-top: 200px;
 }
 
+
+/**** Main authoring styles ****/
+
+
 div#toolbar {
 	padding: 3px;
 	height: 27px;
@@ -140,12 +159,4 @@
 	width: 100%;
 	height: 745px;
 	vertical-align: top;
-}
-
-div.propertiesDialog {
-	font-size: 12px;
-}
-
-div.propertiesDialog .ui-dialog-titlebar {
-	padding: 0 0 0 5px;
 }
\ No newline at end of file
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.3 -r1.4
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	11 Nov 2013 18:48:10 -0000	1.3
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	14 Nov 2013 13:11:43 -0000	1.4
@@ -44,14 +44,17 @@
 	/**
 	 * Constructor for a Gate Activity.
 	 */
-	GateActivity : function(id, x, y) {
+	GateActivity : function(id, x, y, gateType) {
 		this.id = id;
 		this.type = 'gate';
+		this.gateType = gateType || 'permission';
 		this.transitions = {
 			'from' : [],
 			'to'   : []
 		};
 		
+		this.loadPropertiesDialogContent = ActivityLib.loadPropertiesDialogContent.gate;
+
 		this.draw = ActivityLib.draw.gate;
 		this.draw(x, y);
 	},
@@ -96,8 +99,9 @@
 	/**
 	 * Represents a subsequence of activities. It is not displayed on canvas.
 	 */
-	BranchActivity : function(id, branchingActivity, transitionFrom) {
+	BranchActivity : function(id, title, branchingActivity, transitionFrom) {
 		this.id = id;
+		this.title = title;
 		this.transitionFrom = transitionFrom;
 		this.branchingActivity = branchingActivity;
 	},
@@ -121,10 +125,13 @@
 			paper.setStart();
 			var shape = paper.path(Raphael.format('M {0} {1}' + layout.defs.activity, x, y))
 							 .attr({
-								'fill' : layout.colors.activity
+								'fill' : this.offline ? layout.colors.offlineActivity : layout.colors.activity
 							 });
 			paper.image(layout.toolIcons[this.toolID], x + 47, y + 2, 30, 30);
-			paper.text(x + 62, y + 40, ActivityLib.shortenActivityTitle(this.title));
+			paper.text(x + 62, y + 40, ActivityLib.shortenActivityTitle(this.title))
+				 .attr({
+					 'fill' : this.offline ? layout.colors.offlineActivityText : layout.colors.activityText
+				 });
 			
 			this.items = paper.setFinish();
 			this.items.shape = shape;
@@ -176,12 +183,12 @@
 			
 			// create activity SVG elements
 			paper.setStart();
-			var shape = paper.path(Raphael.format('M {0} {1}' + layout.defs.gate, x, y))
+			var shape = paper.path(Raphael.format('M {0} {1}' + layout.defs.gate, x + 8, y))
 							 .attr({
 								 'fill' : layout.colors.gate
 							 });
 			
-			paper.text(x + 7, y + 14, 'STOP')
+			paper.text(x + 15, y + 14, 'STOP')
 			     .attr({
 					'font-size' : 9,
 					'font' : 'sans-serif',
@@ -240,20 +247,25 @@
 			if (!content) {
 				// first run, create the content
 				content = activity.propertiesContent = $('#propertiesContentTool').clone().show();
-				$('.title', content).val(activity.title);
+				$('.propertiesContentFieldTitle', content).val(activity.title);
 				
 				$('input, select', content).change(function(){
 					// extract changed properties and redraw the activity
-					activity.title = $('.title', activity.propertiesContent).val();
-					activity.grouping = $('.grouping option:selected', activity.propertiesContent)
+					activity.title = $('.propertiesContentFieldTitle', activity.propertiesContent).val();
+					activity.grouping = $('.propertiesContentFieldGrouping option:selected', activity.propertiesContent)
 										.data('grouping');
+					activity.offline = $('.propertiesContentFieldOffline', activity.propertiesContent)
+										.is(':checked');
+					activity.defineInMonitor = $('.propertiesContentFieldDefineMonitor', activity.propertiesContent)
+												.is(':checked');
+					
 					activity.draw();
 				});
 			}
 			
 			// find all groupings on canvas and fill dropdown menu with their titles
 			var emptyOption = $('<option />'),
-				groupingDropdown = $('.grouping', content).empty().append(emptyOption);
+				groupingDropdown = $('.propertiesContentFieldGrouping', content).empty().append(emptyOption);
 			$.each(layout.activities, function(){
 				if (this.type == 'grouping') {
 					var option = $('<option />').text(this.title)
@@ -272,20 +284,40 @@
 		},
 		
 		
-		grouping : function(title) {
+		grouping : function() {
 			var activity = this;
 			var content = activity.propertiesContent;
 			if (!content) {
 				// first run, create the content
 				content = activity.propertiesContent = $('#propertiesContentGrouping').clone().show();
-				$('.title', content).val(activity.title);
+				$('.propertiesContentFieldTitle', content).val(activity.title);
 
 				$('input, select', content).change(function(){
 					// extract changed properties and redraw the activity
-					activity.title = $('.title', activity.propertiesContent).val();
+					activity.title = $('.propertiesContentFieldTitle', activity.propertiesContent).val();
 					activity.draw();
 				});
 			}
+		},
+		
+		
+		gate : function() {
+			var activity = this;
+			var content = activity.propertiesContent;
+			if (!content) {
+				// first run, create the content
+				content = activity.propertiesContent = $('#propertiesContentGate').clone().show();
+				$('.propertiesContentFieldTitle', content).val(activity.title);
+
+				$('input, select', content).change(function(){
+					// extract changed properties and redraw the activity
+					activity.title = $('.propertiesContentFieldTitle', activity.propertiesContent).val();
+					activity.gateType = $('.propertiesContentFieldGateType', activity.propertiesContent).val();
+					activity.draw();
+				});
+			}
+			
+			$('.propertiesContentFieldGateType', activity.propertiesContent).val(activity.gateType);
 		}
 	},
 	
@@ -330,21 +362,28 @@
 		}
 		
 		// remove the transitions
+		// need to use slice() to copy the array as it gets modified in removeTransition()
 		$.each(activity.transitions.from.slice(), function() {
-			// if grouping activity is gone, remove the grouping effect
-			if (activity.type == 'grouping' && this.toActivity.items.groupingEffect) {
-				this.toActivity.items.groupingEffect.remove();
-				this.toActivity.items.groupingEffect = null;
-			}
 			ActivityLib.removeTransition(this);
 		});
-		// need to use slice() to copy the array as it gets modified in removeTransition()
 		$.each(activity.transitions.to.slice(), function() {
 			ActivityLib.removeTransition(this);
 		});
 		
 		// remove the activity from reference tables
 		layout.activities.splice(layout.activities.indexOf(activity), 1);
+		if (layout.items.copiedActivity = activity) {
+			layout.items.copiedActivity = null;
+		}
+		if (activity.type == 'grouping') {
+			$.each(layout.activities, function(){
+				if (activity == this.grouping) {
+					this.grouping = null;
+					this.draw();
+				}
+			});
+		}
+		
 		// visually remove the activity
 		activity.items.remove();
 	},
@@ -413,25 +452,21 @@
 		transition.toBack();
 		transition.mousedown(HandlerLib.transitionMousedownHandler);
 		
-		if (fromActivity.type == 'branchingEdge' && fromActivity.isStart) {
+		if (!redraw && fromActivity.type == 'branchingEdge' && fromActivity.isStart) {
 			// create a new branch
-			var branch = new ActivityLib.BranchActivity(null, fromActivity.branchingActivity, transition);
+			var branch = new ActivityLib.BranchActivity(null, null, fromActivity.branchingActivity, transition);
 			fromActivity.branchingActivity.branches.push(branch);
 			transition.data('branch', branch);
 		}
+		
+		return transition;
 	},
 	
 	
 	/**
 	 * Removes the given transition.
 	 */
 	removeTransition : function(transition) {
-		if (transition.toActivity.items.groupingEffect) {
-			// if toActivity had a grouping effect, remove it
-			transition.toActivity.items.groupingEffect.remove();
-			transition.toActivity.items.groupingEffect = null;
-		}
-		
 		// find the transition and remove it
 		var transitions = transition.fromActivity.transitions.from;
 		transitions.splice(transitions.indexOf(transition), 1);
@@ -582,23 +617,11 @@
 		var transformation = activity.items.shape.attr('transform');
 		activity.items.transform('');
 		if (transformation.length > 0) {
-			activity.items.forEach(function(elem) {
-				// some elements (rectangles) have "x", some are paths
-				if (elem.attr('x')) {
-					elem.attr({
-						'x' : elem.attr('x') + transformation[0][1],
-						'y' : elem.attr('y') + transformation[0][2]
-					});
-				} else {
-					var path = elem.attr('path');
-					elem.attr('path', Raphael.transformPath(path, transformation));
-				}
-			});
+			// find new X and Y and redraw the activity
+			var activityBox =  activity.items.shape.getBBox();
+			activity.draw(activityBox.x + transformation[0][1],
+						  activityBox.y + transformation[0][2]);
 		}
-		
-		if (activity.items.groupingEffect) {
-			activity.items.groupingEffect.toBack();
-		}
 
 		// redraw transitions
 		$.each(activity.transitions.from.slice(), function(){
@@ -706,7 +729,9 @@
 			while (activity.transitions.from.length > 0) {
 				activity = activity.transitions.from[0].toActivity;
 				// check if reached the end of branch
-				if (activity.type != 'branchingEdge') {
+				if (activity.type == 'branchingEdge') {
+					break;
+				} else {
 					branchLength++;
 				}
 			};
@@ -728,5 +753,14 @@
 			title = title.substring(0, 17) + '...';
 		}
 		return title;
+	},
+	
+	
+	/**
+	 * Get real coordinates on paper, based on event coordinates.
+	 */
+	translateEventOnCanvas : function(event) {
+		return [event.pageX + canvas.scrollLeft() - canvas.offset().left,
+		        event.pageY + canvas.scrollTop()  - canvas.offset().top];
 	}
 };
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.3 -r1.4
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	11 Nov 2013 18:48:10 -0000	1.3
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	14 Nov 2013 13:11:43 -0000	1.4
@@ -12,9 +12,14 @@
 	'items' : {
 		'bin'              : null,
 		'selectedActivity' : null,
-		'propertiesDialog' : null
+		'propertiesDialog' : null,
+		'infoDialog'       : null,
+		'copiedActivity'   : null
 	},
-	'toolIcons': {},
+	'toolIcons': {
+		'grouping' : '../images/grouping.gif',
+		'gate'     : '../images/stop.gif'
+	},
 	'conf' : {
 		'propertiesDialogDimOpacity'   : 0.3,
 		'propertiesDialogDimThreshold' : 100,
@@ -34,15 +39,18 @@
 		'branchingEdgeEnd'   : ' m -8 0 a 8 8 0 1 0 16 0 a 8 8 0 1 0 -16 0'
 	},
 	'colors' : {
-		'activity'     : '#A9C8FD',
-		'gate'         : 'red',
-		'gateText'     : 'white',
-		'transition'   : 'rgb(119,126,157)',
-		'binActive'    : 'red',
-		'selectEffect' : 'blue',
-		'branchingEdgeStart' : 'green',
-		'branchingEdgeEnd'   : 'red',
-		'branchingEdgeMatch' : 'blue'
+		'activity'     		  : '#A9C8FD',
+		'offlineActivity' 	  : 'black',
+		'activityText' 		  : 'black',
+		'offlineActivityText' : 'white',
+		'gate'         		  : 'red',
+		'gateText'     		  : 'white',
+		'transition'   		  : 'rgb(119,126,157)',
+		'binActive'    		  : 'red',
+		'selectEffect'        : 'blue',
+		'branchingEdgeStart'  : 'green',
+		'branchingEdgeEnd'    : 'red',
+		'branchingEdgeMatch'  : 'blue'
 	},
 };
 
@@ -108,11 +116,10 @@
 				$(draggable.helper).remove();
 				
 				// calculate the position and create an instance of the tool activity
-			    var toolID = draggable.draggable.attr('toolId');
-				var canvasOffset = canvas.offset();
-				var x = draggable.offset.left - canvasOffset.left;
-				var y = draggable.offset.top - canvasOffset.top;
-				var label = $('div', draggable.draggable).text();
+			    var toolID = draggable.draggable.attr('toolId'),
+			    	x = draggable.offset.left  + canvas.scrollLeft() - canvas.offset().left,
+			    	y = draggable.offset.top   + canvas.scrollTop()  - canvas.offset().top,
+			    	label = $('div', draggable.draggable).text();
 				
 				layout.activities.push(new ActivityLib.ToolActivity(null, toolID, x, y, label));
 		   }
@@ -158,6 +165,7 @@
 		});
 	});
 	
+	
 	// initialise the properties dialog singleton
 	var propertiesDialog = layout.items.propertiesDialog =
 		$('<div />')
@@ -177,13 +185,14 @@
 	propertiesDialog.lastRun = 0;
 	// remove close button, add dimming
 	propertiesDialog.container = propertiesDialog.closest('.ui-dialog');
-	propertiesDialog.container.addClass('propertiesDialog')
+	propertiesDialog.container.addClass('propertiesDialogContainer')
 							  .css('opacity', layout.conf.propertiesDialogDimOpacity)
 	 						  .mousemove(HandlerLib.approachPropertiesDialogHandler)
 	                          .find('.ui-dialog-titlebar-close').remove();
 	
+	
 	// initalise open Learning Design dialog
-	var openLDDialog = $('#openLearningDesignDialog').dialog({
+	var ldStoreDialog = $('#ldStoreDialog').dialog({
 		'autoOpen'      : false,
 		'position'      : {
 			'my' : 'left top',
@@ -221,18 +230,53 @@
 		             }
 		]
 	});
-
-	$('#ldScreenshotAuthor', openLDDialog).load(function(){
+	$('#ldScreenshotAuthor', ldStoreDialog).load(function(){
 		// hide "loading" animation
-		$('.ldChoiceDependentCanvasElement').css('display', 'none');
+		$('#ldStoreDialog .ldChoiceDependentCanvasElement').css('display', 'none');
 		// show the thumbnail
 		$(this).css('display', 'inline');
 	});
 	// there should be no focus, just highlight
 	YAHOO.widget.TreeView.FOCUS_CLASS_NAME = null;
+	var tree = new YAHOO.widget.TreeView('ldStoreDialogTree');
+	// store the tree in the dialog's data
+	ldStoreDialog.dialog('option', 'ldTree', tree);
+	// make folder contents load dynamically on open
+	tree.setDynamicLoad(function(node, callback){
+		// load subfolder contents
+		var childNodeData = MenuLib.getFolderContents(node.data.folderID);
+		if (childNodeData) {
+		$.each(childNodeData, function(){
+				// create and add a leaf
+				new YAHOO.widget.TextNode(this, node);
+			});
+		}
+		
+		// required by YUI
+		callback();
+	});
+	tree.singleNodeHighlight = true;
+	tree.subscribe('clickEvent', function(event){
+		if (!event.node.data.learningDesignId){
+			// it is a folder
+			return false;
+		}
+
+		// display "loading" animation and finally LD thumbnail
+		$('#ldStoreDialog .ldChoiceDependentCanvasElement').css('display', 'none');
+		if (event.node.highlightState == 0) {
+			$('#ldStoreDialog #ldScreenshotLoading').css('display', 'inline');
+			// get the image of the chosen LD
+			$('#ldStoreDialog #ldScreenshotAuthor').attr('src', LD_THUMBNAIL_URL_BASE + event.node.data.learningDesignId);
+			$('#ldStoreDialog #ldScreenshotAuthor').css('width', 'auto').css('height', 'auto');
+		} else {
+			// toggleCanvasResize(CANVAS_RESIZE_OPTION_NONE);
+		}
+	});
+	tree.subscribe('clickEvent',tree.onEventToggleHighlight);
+
 	
-	
-	$('#infoDialog').dialog({
+	layout.items.infoDialog = $('<div />').attr('id', 'infoDialog').dialog({
 		'autoOpen'   : false,
 		'height'     : 35,
 		'width'      : 290,
@@ -242,8 +286,8 @@
 		'hide'       : 'fold',
 		'dialogClass': 'dialog-no-title',
 		'position'   : {my: "right top",
-					   at: "right top+5px",
-					   of: '#canvas'
+					    at: "right top+5px",
+					    of: '#canvas'
 				      }
 	});
 }
@@ -268,57 +312,203 @@
 				return;
 			}
 			
+			// remove existing activities
 			MenuLib.newLearningDesign(true);
+			
+			var resizeNeeded = false,
+				arrangeNeeded = false,
+				// current paper dimensions 
+				paperWidth = paper.width,
+				paperHeight = paper.height,
+				// helper for finding last activity in a branch
+				branchToLastActivityMapping = {};
+			
 			// create visual representation of the loaded activities
 			$.each(ld.activities, function() {
 				var activityData = this,
 					activity = null;
-				
-				if (activityData.toolID) {
-					activity = new ActivityLib.ToolActivity(activityData.activityID,
-							activityData.toolID, activityData.xCoord, activityData.yCoord,
-							activityData.activityTitle);
-				} else if (activity.groupingType) {
-					activity = new ActivityLib.GroupingActivity(activityData.activityID,
-							activityData.xCoord, activityData.yCoord,
-							activityData.activityTitle);
-				} else if (activity.gateOpen) {
-					activity = new ActivityLib.GroupingActivity(activityData.activityID,
-							activityData.xCoord, activityData.yCoord);
+
+				switch(activityData.activityTypeID) {
+					// Tool Activity
+					case 1 :
+						activity = new ActivityLib.ToolActivity(activityData.activityID,
+										activityData.toolID,
+										activityData.xCoord,
+										activityData.yCoord,
+										activityData.activityTitle);
+						break;
+					
+					// Grouping Activity
+					case 2 :
+						activity = new ActivityLib.GroupingActivity(activityData.activityID,
+								activityData.xCoord,
+								activityData.yCoord,
+								activityData.activityTitle);
+						break;
+					
+					// Gate Activity
+					case 3:				
+						activity = new ActivityLib.GateActivity(activityData.activityID,
+							activityData.xCoord,
+							activityData.yCoord,
+							'sync');
+						break;
+					
+					// Gate Activity
+					case 4:
+						activity = new ActivityLib.GateActivity(activityData.activityID,
+								activityData.xCoord,
+								activityData.yCoord,
+								'schedule');
+						break;
+						
+					// Gate Activity	
+					case 5:
+						activity = new ActivityLib.GateActivity(activityData.activityID,
+							activityData.xCoord,
+							activityData.yCoord,
+							'permission');
+						break;
+						
+					// Gate Activity
+					case 14:
+						activity = new ActivityLib.GateActivity(activityData.activityID,
+							activityData.xCoord,
+							activityData.yCoord,
+							'condition');
+						break;
+					
+					// Branching Activity
+					case 10:
+					case 11:
+					case 12:
+						// draw both edge points straight away and mark the whole canvas for auto reaarange
+						arrangeNeeded = true;
+						var branchingEdge = new ActivityLib.BranchingEdgeActivity(activityData.activityID, 0, 0, null);
+						layout.activities.push(branchingEdge);
+						branchingEdge = new ActivityLib.BranchingEdgeActivity(
+								null, 0, 0, branchingEdge.branchingActivity);
+						layout.activities.push(branchingEdge);
+						break;
+					
+					// Sequence Activity, i.e. a branch
+					case 8: 
+						$.each(layout.activities, function(){
+							if (this.type == 'branchingEdge'
+								&& activityData.parentActivityID == this.branchingActivity.id) {
+								this.branchingActivity.branches.push(
+										new ActivityLib.BranchActivity(activityData.activityID,
+																	   activityData.activityTitle,
+																	   this.branchingActivity));
+								return false;
+							}
+						});
+						break;
 				}
 				
+				
+				if (!activity) {
+					// activity type not supported yet
+					return true;
+				}
 				layout.activities.push(activity);
+				
+				// find the branch the activity belongs to
+				if (activityData.parentActivityID) {
+					$.each(layout.activities, function(){
+						if (this.type == 'branchingEdge' && this.isStart) {
+							var branchingActivity = this.branchingActivity;
+							$.each(branchingActivity.branches, function(){
+								var branch = this;
+								// is this the branch?
+								if (activityData.parentActivityID == branch.id) {
+									if (activityData.orderID == 1) {
+										// this is the first activity in the branch
+										branch.transitionFrom = ActivityLib.drawTransition(
+												branchingActivity.start, activity, true);
+									}
+									
+									// check if this is the last activity in the branch
+									var branchData = branchToLastActivityMapping[branch.id];
+									if (!branchData || branchData.orderID < activityData.orderID) {
+										branchToLastActivityMapping[branch.id] = {
+											'branch'     : branch,
+											'orderID'    : activityData.orderID,
+											'activity'   : activity
+										};
+									}
+								}
+							});
+						}
+					});
+				}
+				
+				// if we do arranging afterwards, paper will be resized anyway
+				if (!arrangeNeeded) {
+					// find new dimensions of paper
+					var activityBox = activity.items.shape.getBBox(),
+						maxX = activityBox.x + activityBox.width,
+						maxY = activityBox.y + activityBox.height;
+					if (maxX > paperWidth) {
+						resizeNeeded = true;
+						paperWidth = maxX;
+					}
+					if (maxY > paperHeight) {
+						resizeNeeded = true;
+						paperHeight = maxY;
+					}
+				}
 			});
 			
-			// draw transitions
+			// draw transitions from last activities in branches to end edge point
+			$.each(branchToLastActivityMapping, function(branchID, branchData) {
+				ActivityLib.drawTransition(branchData.activity, branchData.branch.branchingActivity.end, true);
+			});
+			
+			// draw plain transitions
 			$.each(ld.transitions, function(){
 				var transition = this,
 					fromActivity = null,
 					toActivity = null;
 				
 				// find which activities the transition belongs to
 				$.each(layout.activities, function(){
-					var activity = this;
-					if (activity.id == transition.fromActivityID) {
+					var activity = this,
+						isBranching = activity.type == 'branchingEdge';
+					
+					// check if transition IDs match either a plain activity or a complex one
+					if (isBranching ? !activity.isStart && transition.fromActivityID == activity.branchingActivity.id 
+									: transition.fromActivityID == activity.id) {
 						fromActivity = activity;
-					} else if (activity.id == transition.toActivityID) {
+					} else if (isBranching ? activity.isStart && transition.toActivityID == activity.branchingActivity.id 
+										  : transition.toActivityID == activity.id) {
 						toActivity = activity;
 					}
 					
 					// found both transition ends, draw it and stop the iteration
 					if (fromActivity && toActivity) {
-						ActivityLib.drawTransition(fromActivity, toActivity);
+						ActivityLib.drawTransition(fromActivity, toActivity, true);
 						return false;
 					}
 				});
 			});
 			
-			HandlerLib.resetCanvasMode();
+			
+			if (arrangeNeeded) {
+				MenuLib.arrangeActivities();
+			} else if (resizeNeeded) {
+				ActivityLib.resizePaper(paperWidth, paperHeight);
+			} else {	
+				HandlerLib.resetCanvasMode();
+			}
 		}
 	});
 }
 
 
+/**
+ * Sets new paper dimensions and moves some static elements.
+ */
 function resizePaper(width, height) {
 	if (!paper) {
 		return;
@@ -328,6 +518,7 @@
 		width = canvas.width() - 5;
 	}
 	if (!height || (height == canvas.height() - 5)) {
+		// take into account the horizontal scrollbar
 		height = canvas.height() - 5 - (width > canvas.width() - 5 ? 20 : 0);
 	}
 	paper.setSize(width, height);
Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringHandler.js,v
diff -u -r1.3 -r1.4
--- lams_central/web/includes/javascript/authoring/authoringHandler.js	11 Nov 2013 18:48:10 -0000	1.3
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js	14 Nov 2013 13:11:43 -0000	1.4
@@ -146,8 +146,8 @@
 			return;
 		}
 		
-		var startX = x - canvas.offset().left,
-			startY = y - canvas.offset().top;
+		var startX = x  + canvas.scrollLeft() - canvas.offset().left,
+			startY = y  + canvas.scrollTop()  - canvas.offset().top;
 		
 		canvas.mousemove(function(event){
 			HandlerLib.drawTransitionMoveHandler(activity, event, startX, startY);
@@ -173,8 +173,9 @@
 			return;
 		}
 		
-		var endX = event.pageX - canvas.offset().left,
-			endY = event.pageY - canvas.offset().top;
+		var translatedEvent = ActivityLib.translateEventOnCanvas(event),
+			endX = translatedEvent[0],
+			endY = translatedEvent[1];
 		
 		// draw a temporary transition so user sees what he is doing
 		activity.tempTransition = paper.set();
@@ -315,10 +316,10 @@
 	 * Checks whether activity or transition is over rubbish bin.
 	 */
 	isElemenentBinned : function(event) {
-		var canvasX = event.pageX + canvas.scrollLeft() - canvas.offset().left,
-			canvasY = event.pageY + canvas.scrollTop()  - canvas.offset().top;
+		var translatedEvent = ActivityLib.translateEventOnCanvas(event);
 		
 		// highlight rubbish bin if dragged elements are over it
-		return Raphael.isPointInsideBBox(layout.items.bin.getBBox(), canvasX, canvasY); 
+		return Raphael.isPointInsideBBox(layout.items.bin.getBBox(),
+										 translatedEvent[0], translatedEvent[1]); 
 	}
 };
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringMenu.js,v
diff -u -r1.3 -r1.4
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	11 Nov 2013 18:48:10 -0000	1.3
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	14 Nov 2013 13:11:43 -0000	1.4
@@ -8,15 +8,16 @@
 	 * Run when branching is selected from menu. Allows placing branching and converge points on canvas.
 	 */
 	addBranching : function(){
-		var dialog = $('#infoDialog').text('Place the branching point');
+		var dialog = layout.items.infoDialog.text('Place the branching point');
 		dialog.dialog('open');
 		
 		var branchingActivity = null;
 		canvas.css('cursor', 'pointer').click(function(event){
 			// pageX and pageY tell event coordinates relative to the whole page
 			// we need relative to canvas
-			var x = event.pageX - canvas.offset().left,
-				y = event.pageY - canvas.offset().top;
+			var translatedEvent = ActivityLib.translateEventOnCanvas(event),
+				x = translatedEvent[0] + 2,
+				y = translatedEvent[1];
 			
 			// if it is start point, branchingActivity is null and constructor acts accordingly
 			var branchingEdge = new ActivityLib.BranchingEdgeActivity(null, x, y, branchingActivity);
@@ -40,13 +41,14 @@
 	 * Run when grouping is dropped on canvas. Creates a new grouping activity.
 	 */
 	addGrouping : function() {
-		canvas.css('cursor', 'url("../images/grouping.gif"), move').click(function(event){
+		canvas.css('cursor', 'url("' + layout.toolIcons.grouping + '"), move').click(function(event){
 			HandlerLib.resetCanvasMode();
 			
 			// pageX and pageY tell event coordinates relative to the whole page
 			// we need relative to canvas
-			var x = event.pageX - canvas.offset().left - 47,
-				y = event.pageY - canvas.offset().top - 2;
+			var translatedEvent = ActivityLib.translateEventOnCanvas(event),
+				x = translatedEvent[0] - 47,
+				y = translatedEvent[1] -  2;
 
 			layout.activities.push(new ActivityLib.GroupingActivity(null, x, y, 'Grouping'));
 		});
@@ -57,13 +59,14 @@
 	 * Run when gate is dropped on canvas. Creates a new gate activity.
 	 */
 	addGate : function() {
-		canvas.css('cursor', 'url("../images/stop.gif"), move').click(function(event){
+		canvas.css('cursor', 'url("' + layout.toolIcons.gate + '"), move').click(function(event){
 			HandlerLib.resetCanvasMode();
 			
 			// pageX and pageY tell event coordinates relative to the whole page
 			// we need relative to canvas
-			var x = event.pageX - canvas.offset().left,
-				y = event.pageY - canvas.offset().top;
+			var translatedEvent = ActivityLib.translateEventOnCanvas(event),
+				x = translatedEvent[0],
+				y = translatedEvent[1] + 2;
 			
 			layout.activities.push(new ActivityLib.GateActivity(null, x, y));
 		});
@@ -74,52 +77,18 @@
 	 * Opens "Open sequence" dialog where an user can choose a Learning Design to load.
 	 */
 	openLearningDesign : function(){
-		var dialog = $('#openLearningDesignDialog');
+		var dialog = $('#ldStoreDialog');
 		// remove the directory tree, if it remained for last dialog opening
-		$('#learningDesignTree', dialog).empty();
 		dialog.dialog('open');
 		
-		// get users' folders and LDs
-		var treeNodes = MenuLib.getFolderContents();
-		// genearate folder tree for the widget
-		var tree = new YAHOO.widget.TreeView('learningDesignTree', treeNodes);
-		// store the tree in the dialog's data
-		dialog.dialog('option', 'ldTree', tree);
-		// make folder contents load dynamically on open
-		tree.setDynamicLoad(function(node, callback){
-			// load subfolder contents
-			var childNodeData = MenuLib.getFolderContents(node.data.folderID);
-			if (childNodeData) {
-			$.each(childNodeData, function(){
-					// create and add a leaf
-					new YAHOO.widget.TextNode(this, node);
-				});
-			}
-			
-			// required by YUI
-			callback();
+		var tree = dialog.dialog('option', 'ldTree'),
+			rootNode = tree.getRoot();
+		// remove existing folders
+		$.each(rootNode.children, function(){
+			tree.removeNode(this);
 		});
-		
-		tree.singleNodeHighlight = true;
-		tree.subscribe('clickEvent', function(event){
-	
-			if (!event.node.data.learningDesignId){
-				// it is a folder
-				return false;
-			}
-
-			// display "loading" animation and finally LD thumbnail
-			$('.ldChoiceDependentCanvasElement').css('display', 'none');
-			if (event.node.highlightState == 0) {
-				$('#ldScreenshotLoading').css('display', 'inline');
-				// get the image of the chosen LD
-				$('#ldScreenshotAuthor').attr('src', LD_THUMBNAIL_URL_BASE + event.node.data.learningDesignId);
-				$('#ldScreenshotAuthor').css('width', 'auto').css('height', 'auto');
-			} else {
-				// toggleCanvasResize(CANVAS_RESIZE_OPTION_NONE);
-			}
-		});
-		tree.subscribe('clickEvent',tree.onEventToggleHighlight);
+		// (re)load user's folders and LDs
+		tree.buildTreeFromObject(MenuLib.getFolderContents());
 		tree.render();
 		
 		// expand the first (user) folder
@@ -264,11 +233,12 @@
 				if (activity.type == 'branchingEdge') {
 					// draw branching edges straight away and remove them from normall processing
 					branchingActivity = activity.branchingActivity;
+					row++;
 					var start = branchingActivity.start,
 						end = branchingActivity.end,
 						complexActivityEnd = end,
 						// edge points go to middle of rows with branches
-						branchingRow = row + 1 + Math.floor(branchingActivity.branches.length / 2);
+						branchingRow = row + Math.floor(branchingActivity.branches.length / 2);
 					
 					activitiesCopy.splice(activitiesCopy.indexOf(start), 1);
 					activitiesCopy.splice(activitiesCopy.indexOf(end), 1);
@@ -280,7 +250,6 @@
                                                      					 * layout.conf.arrangeHorizontalSpace + 62,
                              layout.conf.arrangeVerticalPadding + branchingRow * layout.conf.arrangeVerticalSpace + 25);
 					
-					row++;
 					if (branchingActivity.branches.length > 0) {
 						// set up branch drawing
 						branchIndex = 0;
@@ -377,5 +346,66 @@
 		}
 		
 		resizePaper();
+	},
+	
+	
+	/**
+	 * Mark an activity as ready for pasting.
+	 */
+	copyActivity : function(){
+		layout.items.copiedActivity = layout.items.selectedActivity;
+	},
+	
+	
+	/**
+	 * Make a copy of an existing activity.
+	 */
+	pasteActivity : function(){
+		var activity = layout.items.copiedActivity;
+		if (!activity) {
+			return;
+		}
+		// check if the activity was not removed
+		if (layout.activities.indexOf(activity) < 0){
+			layout.items.copiedActivity = null;
+			return;
+		}
+		// only tool activities can be copied (todo?)
+		if (activity.type != 'tool') {
+			alert('Sorry, you can not paste this type of activity');
+			return;
+		}
+		
+		// find an unqiue title for the new activity
+		var copyCount = 1, 
+			title = 'Copy of ' + activity.title;
+		while (true) {
+			var sameTitleFound = false;
+			$.each(layout.activities, function(){
+				if (title == this.title) {
+					sameTitleFound = true;
+					return false;
+				}
+			});
+			
+			if (sameTitleFound) {
+				copyCount++;
+				title = 'Copy (' + copyCount + ') of ' + activity.title;
+			} else {
+				break;
+			}
+		};
+		
+		// draw the new activity next to the existing one
+		var x = activity.items.shape.getBBox().x + 10,
+			y = activity.items.shape.getBBox().y + 10,
+			newActivity = new ActivityLib.ToolActivity(null, activity.toolID, x, y, title);
+		layout.activities.push(newActivity);
+		
+		if (activity.grouping) {
+			// add grouping effect if the existing activity had one
+			newActivity.grouping = activity.grouping;
+			newActivity.draw();
+		}
 	}
 };
\ No newline at end of file