Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -rc12abbda09a033492a8f2343e260127685f872b5 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision c12abbda09a033492a8f2343e260127685f872b5)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -8,7 +8,6 @@
         <archive path="/lams_build/lib/autopatch/autopatch-1.4.2-lams.jar"/>
         <archive path="/lams_build/lib/autopatch/discovery-1.0.5-lams.jar"/>
         <archive javadoc="http://ws.apache.org/axis/java/apiDocs/" path="/lams_build/lib/axis/axis.jar"/>
-        <archive path="/lams_build/lib/batik/batik-1.7.jar" source="/3rdParty_sources/batik"/>
         <archive path="/lams_build/lib/cglib/cglib_jboss404GA.jar"/>
         <archive path="/lams_build/lib/jakarta-commons/commons-fileupload.jar"/>
         <archive path="/lams_build/lib/jakarta-commons/commons-validator.jar"/>
Index: lams_build/build.xml
===================================================================
diff -u -rc12abbda09a033492a8f2343e260127685f872b5 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_build/build.xml	(.../build.xml)	(revision c12abbda09a033492a8f2343e260127685f872b5)
+++ lams_build/build.xml	(.../build.xml)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -448,19 +448,9 @@
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/axis/main/module.xml"
 			  file="lib/axis/axis.module.xml" overwrite="true" verbose="true" />
+
 		
 		
-		
-		<copy todir="${server.home}/modules/system/layers/base/org/apache/batik/main" overwrite="true" verbose="true">
-			<fileset dir="lib/batik">
-				<include name="batik-*.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/apache/batik/main/module.xml"
-			  file="lib/batik/batik.module.xml" overwrite="true" verbose="true" />
-		
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/net/sf/cglib/main" overwrite="true" verbose="true">
 			<fileset dir="lib/cglib">
 				<include name="cglib_*.jar" />
Index: lams_build/lib/batik/batik-1.7.jar
===================================================================
diff -u -r19ce8ed8c4540f6ee4da179b3cdec9715cdd860b -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
Binary files differ
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_build/lib/batik/batik.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -497,7 +497,11 @@
 	    if (AuthoringAction.log.isDebugEnabled()) {
 		AuthoringAction.log.debug("Created a single activity lesson with ID: " + lesson.getLessonId());
 	    }
+	    
+	    response.setContentType("text/plain;charset=utf-8");
+	    response.getWriter().write(learningDesignID.toString());
 	}
+	
 	return null;
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(.../CentralConstants.java)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(.../CentralConstants.java)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -59,8 +59,6 @@
 
     public static final String PARAM_METHOD = "method";
     
-    public static final String PARAM_SVG_FORMAT = "svgFormat";
-
     public static final String PARAM_MODE = "mode";
 
     public static final String PARAM_FILEPATH = "filePath";
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -39,7 +39,6 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.batik.transcoder.TranscoderException;
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -53,6 +52,7 @@
 import org.lamsfoundation.lams.learningdesign.GroupUser;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO;
 import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.learningdesign.service.LearningDesignService;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
@@ -70,7 +70,6 @@
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.svg.SVGGenerator;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService;
@@ -186,12 +185,6 @@
 		if (lesson.isDisplayDesignImage()) {
 		    Long learningDesignId = lesson.getLearningDesign().getLearningDesignId();
 		    req.setAttribute(AttributeNames.PARAM_LEARNINGDESIGN_ID, learningDesignId);
-
-		    if (lesson.getLearnerProgresses().isEmpty()) {
-			// create svg, png files on the server
-			getLearningDesignService().createLearningDesignSVG(learningDesignId,
-				SVGGenerator.OUTPUT_FORMAT_SVG);
-		    }
 		}
 		return mapping.findForward("lessonIntro");
 	    }
@@ -410,20 +403,10 @@
 	return null;
     }
 
-    public ActionForward createLearningDesignThumbnail(ActionMapping mapping, ActionForm form, HttpServletRequest req,
-	    HttpServletResponse res) throws JDOMException, IOException, TranscoderException {
+    public ActionForward getLearningDesignThumbnail(ActionMapping mapping, ActionForm form, HttpServletRequest req,
+	    HttpServletResponse res) throws JDOMException, IOException {
 	Long learningDesignId = WebUtil.readLongParam(req, CentralConstants.PARAM_LEARNING_DESIGN_ID);
-	Integer format = WebUtil.readIntParam(req, CentralConstants.PARAM_SVG_FORMAT, true);
-	format = format == null ? SVGGenerator.OUTPUT_FORMAT_SVG : format;
-	Long branchingActivityId = WebUtil.readLongParam(req, "branchingActivityID", true);
 	boolean download = WebUtil.readBooleanParam(req, "download", false);
-	String imagePath = null;
-	if (branchingActivityId == null) {
-	    imagePath = getLearningDesignService().createLearningDesignSVG(learningDesignId, format);
-	} else {
-	    imagePath = getLearningDesignService().createBranchingSVG(branchingActivityId, format);
-	}
-
 	// should the image be downloaded or a part of page?
 	if (download) {
 	    String name = getLearningDesignService()
@@ -435,8 +418,10 @@
 	} else {
 	    res.setContentType("image/svg+xml");
 	}
-	OutputStream output = res.getOutputStream();
+
+	String imagePath = LearningDesignService.getLearningDesignSVGPath(learningDesignId);
 	FileInputStream input = new FileInputStream(imagePath);
+	OutputStream output = res.getOutputStream();
 	IOUtils.copy(input, output);
 	IOUtils.closeQuietly(input);
 	IOUtils.closeQuietly(output);
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rae02cc75ca6d4d08c0e45aa9f36b33d646c893b1 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ae02cc75ca6d4d08c0e45aa9f36b33d646c893b1)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -412,13 +412,6 @@
 	</servlet>
 
 	<servlet>
-		<servlet-name>LearningDesignSVG</servlet-name>
-		<servlet-class>
-			org.lamsfoundation.lams.webservice.LearningDesignSVGServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet>
 		<servlet-name>LessonManager</servlet-name>
 		<servlet-class>
 			org.lamsfoundation.lams.webservice.xml.LessonManagerServlet
@@ -521,11 +514,6 @@
 	</servlet-mapping>
 
 	<servlet-mapping>
-		<servlet-name>LearningDesignSVG</servlet-name>
-		<url-pattern>/services/LearningDesignSVG/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
 		<servlet-name>LessonManager</servlet-name>
 		<url-pattern>/services/xml/LessonManager/*</url-pattern>
 	</servlet-mapping>
@@ -770,7 +758,6 @@
 			<url-pattern>/LoginRequest</url-pattern>
 			<url-pattern>/services/xml/LessonManager/*</url-pattern>
 			<url-pattern>/services/xml/LearningDesignRepository/*</url-pattern>
-			<url-pattern>/services/LearningDesignSVG/*</url-pattern>
 			<url-pattern>/services/Gradebook</url-pattern>
 			<url-pattern>/services/xml/LessonJoin/*</url-pattern>
 			<url-pattern>/services/CourseGroupManager</url-pattern>
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -28,7 +28,7 @@
 			users = ${users},
 			
 			LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&svgFormat=1&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=getLearningDesignThumbnail&ldId=',
 			
 			CANVAS_RESIZE_OPTION_NONE = 0,
 			CANVAS_RESIZE_OPTION_FIT = 1,
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -39,7 +39,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/canvg/canvg.js"></script> 
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=getLearningDesignThumbnail&ldId=',
 
 			decoderDiv = $('<div />'),
 			LABELS = {
Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -re1a18b4e000fe475d25e77d53b0560c1872a472b -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision e1a18b4e000fe475d25e77d53b0560c1872a472b)
+++ lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -17,6 +17,10 @@
 	<c:if test="${param.selectable}">
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringHandler.js"></script>
 	</c:if>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringMenu.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/canvg/rgbcolor.js"></script> 
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/canvg/StackBlur.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/canvg/canvg.js"></script> 
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			LABELS = {
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -1461,7 +1461,7 @@
 				paper.clear();
 			} else {
 				// need to set size right away for Chrome
-				paper = Snap(canvas.width() - 5, canvas.height() - 5);
+				paper = Snap(Math.max(0, canvas.width() - 5), Math.max(0, canvas.height() - 5));
 				canvas.append(paper.node);
 			}
 			// initialise filter for read-only activities in Live Edit
@@ -2083,8 +2083,8 @@
 		
 		// -20 so Chrome does not create unnecessary scrollbars when dropping a tool template to canvas
 		// +50 so there is space for rubbish bin
-		width = Math.max(width, canvas.width()) - 20;
-		height = Math.max(height + (isReadOnlyMode ? 20 : 50), canvas.height()) - 20;
+		width = Math.max(0, width, canvas.width()) - 20;
+		height = Math.max(0, height + (isReadOnlyMode ? 20 : 50), canvas.height()) - 20;
 		
 		paper.attr({
 			'width'  : width, 
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r211cca2ab0e53c188fccc034cd3cedf4cacc32a1 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 211cca2ab0e53c188fccc034cd3cedf4cacc32a1)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -363,18 +363,11 @@
 			imageCode = crop.workspace.toDataURL("image/png");
 		}
 		if (download) {
-			var anchor = $('a', layout.exportImageDialog);
-			if (layout.conf.supportsDownloadAttribute) {
-				anchor.attr({
-					'href'	   : imageCode,
-					'download' : (layout.ld.title ? layout.ld.title : 'Untitled') + '.png'
-				});
-			} else {
-				anchor.attr({
-					'href'	   : LD_THUMBNAIL_URL_BASE + layout.ld.learningDesignID 
-								 + '&svgFormat=2&download=true&_=' + new Date().getTime()
-				});
-			}
+			$('a', layout.exportImageDialog).attr({
+				'href'	   : imageCode,
+				'download' : (layout.ld.title ? layout.ld.title : 'Untitled') + '.png'
+			});
+
 			layout.exportImageDialog.dialog('open');
 		} else {
 			return imageCode;
@@ -468,7 +461,7 @@
 			} else {
 				anchor.attr({
 					'href'	   : LD_THUMBNAIL_URL_BASE + layout.ld.learningDesignID
-								 + '&svgFormat=1&download=true&_=' + new Date().getTime()
+								 + '&download=true&_=' + new Date().getTime()
 				});
 			}
 			layout.exportImageDialog.dialog('open');
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -rea231a45729efcb6be2bc42a626ccad73b260c57 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision ea231a45729efcb6be2bc42a626ccad73b260c57)
+++ lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -43,8 +43,8 @@
 
 	$(".ui-button", container).button();
 	$(".split-ui-button", container).each(function(){
-		var buttonContainer = $(this);
-		var buttons = buttonContainer.children();
+		var buttonContainer = $(this),
+			buttons = buttonContainer.children();
 		
 		buttons.first().button()
 			   .next().button({
@@ -423,10 +423,32 @@
 				'toolID' : dialog.dialog('option', 'toolID'),
 				'toolContentID' : dialog.dialog('option', 'toolContentID'),
 				'contentFolderID' : dialog.dialog('option', 'contentFolderID')
+			},
+			// create LD SVG
+			success : function(learningDesignID) {
+				// check if the LD was created successfully
+				if (learningDesignID) {
+					var frame = $('iframe', dialog);
+					// disable previous onload handler, set in showAddSingleActivityLessonDialog()
+					frame.off('load').load(function(){
+						// disable current onload handler as closing the dialog reloads the iframe
+						frame.off('load');
+						
+						// call svgGenerator.jsp code to store LD SVG on the server
+						var win = frame[0].contentWindow || frame[0].contentDocument;
+						win.GeneralLib.saveLearningDesignImage();
+						
+						closeDialog(id, true);
+					});
+					// load svgGenerator.jsp to render LD SVG
+					frame.attr('src', LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID='
+											   + learningDesignID);
+				}
 			}
 		});
+	} else {
+		closeDialog(id, false);
 	}
-	closeDialog(id, save);
 }
 
 
@@ -480,7 +502,7 @@
 				async : false,
 				url : LAMS_URL + "monitoring/monitoring.do",
 				data : "method=removeLesson&lessonID=" + lessonID,
-				type : "post",
+				type : "POST",
 				success : function(json) {
 					if (json.removeLesson == true) {
 						loadOrgTab(null, true);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r6e3946a17bf2fd04420eba2c46bfeb0fdb3db145 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 6e3946a17bf2fd04420eba2c46bfeb0fdb3db145)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -127,7 +127,6 @@
 import org.lamsfoundation.lams.util.FileUtilException;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.VersionUtil;
-import org.lamsfoundation.lams.util.svg.SVGGenerator;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 import org.springframework.beans.BeansException;
@@ -487,14 +486,10 @@
 
 	    //generate SVG image
 	    String destinationPath = FileUtil.getFullPath(contentDir, ExportToolContentService.SVG_IMAGE_FILE_NAME);
-	    String svgPath = service.createLearningDesignSVG(learningDesignId,
-		    SVGGenerator.OUTPUT_FORMAT_SVG_LAMS_COMMUNITY);
+	    String svgPath = LearningDesignService.getLearningDesignSVGPath(learningDesignId);
 	    File svgFile = new File(svgPath);
 	    if (svgFile.canRead()) {
 		FileUtils.copyFile(svgFile, new File(destinationPath));
-		// remove the file as its icons refer to LAMS Community server instead of local resources
-		// and should not be used in Monitoring
-		svgFile.delete();
 	    }
 
 	    log.debug("Learning design xml export success");
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
===================================================================
diff -u -rff01a6c237cefc4a5186889bf46041152cfc37ae -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(.../ILearningDesignService.java)	(revision ff01a6c237cefc4a5186889bf46041152cfc37ae)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(.../ILearningDesignService.java)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -29,8 +29,6 @@
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.batik.transcoder.TranscoderException;
-import org.jdom.JDOMException;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup;
@@ -83,14 +81,14 @@
 	    throws IOException;
 
     public LearningLibrary getLearningLibrary(Long learningLibraryId);
-    
+
     /**
      * Gets all existing learning library groups.
      */
     public List<LearningLibraryGroup> getLearningLibraryGroups();
-    
+
     public void saveLearningLibraryGroups(Collection<LearningLibraryGroup> groups);
-    
+
     /**
      * Set valid flag to learning library.
      * 
@@ -99,21 +97,5 @@
      */
     public void setValid(Long learningLibraryId, boolean valid);
 
-    /**
-     * Creates learning design SVG/PNG file. Also stores it into the file system for caching.
-     * 
-     * @param learningDesignId
-     *            source learning design for the outcome image
-     * @param imageFormat
-     *            it can be either SVGGenerator.OUTPUT_FORMAT_SVG or SVGGenerator.OUTPUT_FORMAT_PNG
-     * @return
-     * @throws JDOMException
-     * @throws IOException
-     * @throws TranscoderException
-     */
-    String createLearningDesignSVG(Long learningDesignId, int imageFormat) throws IOException;
-
-    String createBranchingSVG(Long branchingActivityId, int imageFormat) throws IOException;
-    
     public List<ToolDTO> getToolDTOs(boolean includeParallel, String userName) throws IOException;
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
diff -u -r5ec61f9b44e6aeb94bcfcbdb05aa9f1078e32f43 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision 5ec61f9b44e6aeb94bcfcbdb05aa9f1078e32f43)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -23,9 +23,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.learningdesign.service;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,10 +33,8 @@
 import java.util.Locale;
 import java.util.Vector;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.learningdesign.BranchingActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup;
@@ -60,7 +55,6 @@
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.ILoadedMessageSourceService;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.svg.SVGGenerator;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 
@@ -87,6 +81,8 @@
     protected ILearningLibraryDAO learningLibraryDAO;
     protected ILoadedMessageSourceService toolActMessageService;
 
+    private static final String LD_SVG_DIR = "lams-www.war\\secure\\learning-design-images";
+
     /*
      * Default constructor
      * 
@@ -303,19 +299,6 @@
 	return tools;
     }
 
-    @Override
-    public String createBranchingSVG(Long branchingActivityId, int imageFormat) throws IOException {
-	BranchingActivity branchingActivity = (BranchingActivity) activityDAO
-		.getActivityByActivityId(branchingActivityId);
-	Long learningDesignId = branchingActivity.getLearningDesign().getLearningDesignId();
-	return createDesignSVG(learningDesignId, branchingActivityId, imageFormat);
-    }
-
-    @Override
-    public String createLearningDesignSVG(Long learningDesignId, int imageFormat) throws IOException {
-	return createDesignSVG(learningDesignId, null, imageFormat);
-    }
-
     private void internationaliseActivities(Collection<LibraryActivityDTO> activities) {
 	Iterator<LibraryActivityDTO> iter = activities.iterator();
 	Locale locale = LocaleContextHolder.getLocale();
@@ -366,59 +349,12 @@
 	}
     }
 
-    private String createDesignSVG(Long learningDesignId, Long branchingActivityId, int imageFormat)
-	    throws IOException, FileNotFoundException {
-	String fileNameWithoutExtension = learningDesignId.toString();
-	if (branchingActivityId != null) {
-	    fileNameWithoutExtension += "_branching" + branchingActivityId;
-	}
-
-	// construct absolute filePath to SVG
-	String earFolder = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR);
-	if (StringUtils.isBlank(earFolder)) {
-	    log.error(
-		    "Unable to get path to the LAMS Server URL from the configuration table. SVG image creation failed");
-	    return null;
-	}
-	String directoryToStoreFile = FileUtil.getFullPath(earFolder, "lams-www.war\\secure\\learning-design-images");
-
-	// Check whether this dir exists
-	File svgPngDirectory = new File(directoryToStoreFile);
-	if (!svgPngDirectory.exists()) {
-	    svgPngDirectory.mkdirs();
-	}
-
-	String fileExtension;
-	if (imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG) {
-	    fileExtension = ".svg";
-	} else if (imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG_LAMS_COMMUNITY) {
-	    // mark it as a special version of SVG as it contains icons that refer to LAMS Community server
-	    fileExtension = ".export.svg";
-	} else {
-	    fileExtension = ".png";
-	}
-	String absoluteFilePath = FileUtil.getFullPath(directoryToStoreFile, fileNameWithoutExtension + fileExtension);
-	File file = new File(absoluteFilePath);
-
-	// check if SVG exists and up-to-date
-	LearningDesign learningDesign = learningDesignDAO.getLearningDesignById(learningDesignId);
-	boolean isSvgOutdated = (((file.lastModified() / 1000) + 1)
-		- (learningDesign.getLastModifiedDateTime().getTime() / 1000)) < 0;
-	if (!file.exists() || isSvgOutdated) {
-	    // generate new SVG image and save it to the file system
-	    SVGGenerator svgGenerator = new SVGGenerator();
-	    LearningDesignDTO ldDto = this.getLearningDesignDTO(learningDesignId, "");
-
-	    if (branchingActivityId == null) {
-		svgGenerator.generateLearningDesignDOM(ldDto, imageFormat);
-	    } else {
-		svgGenerator.generateBranchingDOM(ldDto, branchingActivityId, imageFormat);
-	    }
-
-	    FileOutputStream fileOutputStream = new FileOutputStream(file);
-	    svgGenerator.streamOutDocument(fileOutputStream);
-	}
-	return absoluteFilePath;
+    /**
+     * Gets LD SVG file path.
+     */
+    public static String getLearningDesignSVGPath(long learningDesignId) {
+	String earDirPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR);
+	String svgDirPath = FileUtil.getFullPath(earDirPath, LearningDesignService.LD_SVG_DIR);
+	return FileUtil.getFullPath(svgDirPath, learningDesignId + ".svg");
     }
-
 }
\ No newline at end of file
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/svg/ActivityTreeNode.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGConstants.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f295ad79de8fe9d221c166fa90587d0be2fdda5b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -259,8 +259,6 @@
 button.live.edit  =Live Edit
 button.live.edit.tooltip  =Edit the current design for this lesson
 button.live.edit.confirm  =Live Edit allows you to modify the design of your lesson while the learners are attempting it. If you continue, your design will appear in Authoring for you to modify. Once you have done your changes you MUST "Apply changes" to the design so learners can progress. If these changes are not applied, the learners will NOT be able to continue with the lesson. Do you want to continue?
-button.close.branching  =Close Branching
-button.close.branching.tooltip  =Close the currently open branching activity and come back to the top sequence
 button.journal.entries  =Journal Entries
 button.journal.entries.tooltip  =View all Journal Entries saved by Learners
 tab.lesson  =Lesson
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -7,8 +7,6 @@
 // DIV container for lesson/branching SVG
 // it gets accessed so many times it's worth to cache it here
 	sequenceCanvas = null,
-// ID of currently shown branching activity; if NULL, the whole lesson is shown
-	sequenceBranchingId = null,
 // info box show timeout
 	sequenceInfoTimeout = 10000,
 // which learner was selected in the search box
@@ -771,10 +769,8 @@
 			async : false,
 			cache : false,
 			data : {
-				'method'    : 'createLearningDesignThumbnail',
-				'svgFormat' : 1,
-				'ldId'      : ldId,
-				'branchingActivityID' : sequenceBranchingId
+				'method'    : 'getLearningDesignThumbnail',
+				'ldId'      : ldId
 			},
 			success : function(response) {
 				sequenceCanvasFirstFetch = true;
@@ -786,11 +782,8 @@
 				sequenceCanvas = $('#sequenceCanvas')
 					// remove previously set padding and dimensions, if any
 					.removeAttr('style')
-					.html(originalSequenceCanvas)
-					// if it was faded out by showBranchingSequence()
-					.fadeIn(function(){
-						resizeSequenceCanvas(width, height);
-					});
+					.html(originalSequenceCanvas);
+				resizeSequenceCanvas(width, height);
 			}
 		});
 	}
@@ -812,7 +805,6 @@
 		data : {
 			'method'    : 'getLessonProgress',
 			'lessonID'  : lessonId,
-			'branchingActivityID' : sequenceBranchingId,
 			'searchedLearnerId' : sequenceSearchedLearner
 		},		
 		success : function(response) {
@@ -883,21 +875,13 @@
 			$.each(response.activities, function(activityIndex, activity){
 				addActivityIconsHandlers(activity);
 				
-				var isBranching = [10,11,12,13].indexOf(activity.type) > -1;
 				if (activity.url || (isBranching && !flaFormat)) {
-					var activityGroup = $('g[id="' + activity.id + '"]'),
-						dblClickFunction = 
-							// different behaviour for regular/branching activities
-							isBranching ? 
-							function(){ showBranchingSequence(activity.id); }
-							:
-							function(){  
-								// double click on activity shape to open Monitoring for this activity
-								openPopUp(LAMS_URL + activity.url, "MonitorActivity", 720, 900, true, true);
-							};
-					
+					var activityGroup = $('g[id="' + activity.id + '"]');
 					activityGroup.css('cursor', 'pointer');
-					dblTap(activityGroup, dblClickFunction);
+					dblTap(activityGroup, function(){  
+						// double click on activity shape to open Monitoring for this activity
+						openPopUp(LAMS_URL + activity.url, "MonitorActivity", 720, 900, true, true);
+					});
 				}
 			});	
 			
@@ -1540,31 +1524,7 @@
 	}
 }
 
-
 /**
- * Replaces canvas with the given branchin activity contents
- */
-function showBranchingSequence(branchingActivityId){
-	sequenceBranchingId = branchingActivityId;
-	originalSequenceCanvas = null;
-	branchingEntered = true;
-	$('#closeBranchingButton').show();
-	sequenceCanvas.fadeOut(function(){
-		sequenceCanvas.html(null);
-		updateSequenceTab();
-	});
-}
-
-
-/**
- * Shows Learning Design in canvas.
- */
-function closeBranchingSequence(){
-	showBranchingSequence(null);
-	$('#closeBranchingButton').hide();
-}
-
-/**
  * Adjusts sequence canvas (SVG) based on space available in the dialog.
  */
 function resizeSequenceCanvas(width, height){
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf295ad79de8fe9d221c166fa90587d0be2fdda5b
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision f295ad79de8fe9d221c166fa90587d0be2fdda5b)
@@ -412,12 +412,6 @@
 					<fmt:message key='button.live.edit'/>
 				</a>
 			</c:if>
-			<a class="button" title="<fmt:message key='button.close.branching.tooltip'/>"
-			  id="closeBranchingButton"
-			  href="#"
-			  onClick="javascript:closeBranchingSequence()">
-				<fmt:message key='button.close.branching'/>
-			</a>
 			<span id="sequenceSearchPhraseClear"
 				 class="ui-icon ui-icon-circle-close"
 				 onClick="javascript:sequenceClearSearchPhrase(true)"