Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.487 -r1.488
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.121 -r1.122
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	23 Nov 2015 11:34:30 -0000	1.121
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	9 Mar 2016 00:26:38 -0000	1.122
@@ -1918,7 +1918,7 @@
      */
     @Override
     @SuppressWarnings("unchecked")
-    public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID,
+    public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, Long learningLibraryID,
 	    String contentFolderID, Integer organisationID) {
 	Integer userID = AuthoringService.getUserId();
 	User user = (User) baseDAO.find(User.class, userID);
@@ -1954,7 +1954,7 @@
 	learningDesign.setWorkspaceFolder(folder);
 	learningDesignDAO.insert(learningDesign);
 
-	ToolActivity templateActivity = (ToolActivity) activityDAO.getTemplateActivityByLibraryID(toolID);
+	ToolActivity templateActivity = (ToolActivity) activityDAO.getTemplateActivityByLibraryID(learningLibraryID);
 	ToolActivity activity = (ToolActivity) templateActivity.createCopy(1);
 	activity.setLearningDesign(learningDesign);
 	activity.setToolContentId(toolContentID);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java,v
diff -u -r1.47 -r1.48
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java	4 Sep 2015 14:47:42 -0000	1.47
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java	9 Mar 2016 00:26:39 -0000	1.48
@@ -364,7 +364,7 @@
 
     public String getToolAuthorUrl(Long toolID, Long toolContentID, String contentFolderID);
 
-    public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID,
+    public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, Long learningLibraryID,
 	    String contentFolderID, Integer organisationID);
 
     public List<LearningDesignAccess> updateLearningDesignAccessByUser(Integer userId);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java,v
diff -u -r1.59 -r1.60
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	4 Sep 2015 14:47:42 -0000	1.59
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	9 Mar 2016 00:26:38 -0000	1.60
@@ -457,7 +457,8 @@
 	IAuthoringService authoringService = getAuthoringService();
 	Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID);
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
-	String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+        Long learningLibraryID = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNING_LIBRARY_ID);
+        String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	Integer userID = getUserId();
 
@@ -473,7 +474,7 @@
 	ToolContentManager toolManager = (ToolContentManager) wac.getBean(tool.getServiceName());
 	String title = toolManager.getToolContentTitle(toolContentID);
 	// create the LD and put it in Run Sequences folder in the given organisation
-	Long learningDesignID = authoringService.insertSingleActivityLearningDesign(title, toolID, toolContentID,
+	Long learningDesignID = authoringService.insertSingleActivityLearningDesign(title, toolID, toolContentID, learningLibraryID,
 		contentFolderID, organisationID);
 	if (learningDesignID != null) {
 	    User user = (User) getUserManagementService().findById(User.class, userID);
Index: lams_central/web/groupHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/groupHeader.jsp,v
diff -u -r1.10 -r1.11
--- lams_central/web/groupHeader.jsp	2 May 2015 08:13:44 -0000	1.10
+++ lams_central/web/groupHeader.jsp	9 Mar 2016 00:26:53 -0000	1.11
@@ -43,7 +43,7 @@
 				<ul>
 					<span><fmt:message key="index.single.activity.lesson.desc" /></span>
 					<c:forEach var="tool" items="${tools}">
-						<li onClick="javascript:showAddSingleActivityLessonDialog(${org.id}, ${tool.toolId})">
+						<li onClick="javascript:showAddSingleActivityLessonDialog(${org.id}, ${tool.toolId}, ${tool.learningLibraryId})">
 							<c:out value="${tool.toolDisplayName}" />
 						</li>
 					</c:forEach>
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/groupDisplay.js,v
diff -u -r1.47 -r1.48
--- lams_central/web/includes/javascript/groupDisplay.js	14 Oct 2015 18:51:18 -0000	1.47
+++ lams_central/web/includes/javascript/groupDisplay.js	9 Mar 2016 00:26:53 -0000	1.48
@@ -227,10 +227,11 @@
 	}, true);
 }
 
-function showAddSingleActivityLessonDialog(orgID, toolID) {
+function showAddSingleActivityLessonDialog(orgID, toolID, learningLibraryID) {
 	showDialog("dialogAddSingleActivityLesson", {
 		'orgID' : orgID,
 		'toolID' : toolID,
+		'learningLibraryID' : learningLibraryID,
 		'height' : 600,
 		'width' : 850,
 		'modal' : true,
@@ -416,7 +417,8 @@
 				'organisationID'  : dialog.dialog('option', 'orgID'),
 				'toolID' : dialog.dialog('option', 'toolID'),
 				'toolContentID' : dialog.dialog('option', 'toolContentID'),
-				'contentFolderID' : dialog.dialog('option', 'contentFolderID')
+				'contentFolderID' : dialog.dialog('option', 'contentFolderID'),
+				'learningLibraryID' : dialog.dialog('option', 'learningLibraryID')
 			}
 		});
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v
diff -u -r1.38 -r1.39
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	5 Jan 2016 16:05:38 -0000	1.38
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	9 Mar 2016 00:27:03 -0000	1.39
@@ -47,6 +47,7 @@
     public static final String PARAM_TOOL_ID = "toolID";
     public static final String PARAM_TOOL_CONTENT_ID = "toolContentID";
     public static final String PARAM_TOOL_SESSION_ID = "toolSessionID";
+    public static final String PARAM_LEARNING_LIBRARY_ID = "learningLibraryID";
     public static final String PARAM_CURRENT_ACTIVITY_ID = "currentActivityID";
     public static final String PARAM_DEST_ACTIVITY_ID = "destActivityID";
     public static final String PARAM_ACTIVITY_ID = "activityID";