Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r287e1d4f1242a8d584f71cab96bfd0365b6855c8 -rbd4fa408454e7389b4e60bc68f2488de88eff663
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 287e1d4f1242a8d584f71cab96bfd0365b6855c8)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision bd4fa408454e7389b4e60bc68f2488de88eff663)
@@ -34,7 +34,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringMenu.js"></script>
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=getLearningDesignThumbnail&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
 
 			decoderDiv = $('<div />'),
 			LABELS = {
@@ -124,6 +124,8 @@
 				SEQUENCE_EXISTS_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_EXISTS_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.save.error" var="SEQUENCE_SAVE_ERROR_VAR"/>
 				SEQUENCE_SAVE_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_SAVE_ERROR_VAR}" />').text(),
+				<fmt:message key="authoring.fla.readonly.forbidden" var="READONLY_FORBIDDEN_ERROR_VAR"/>
+				READONLY_FORBIDDEN_ERROR : decoderDiv.html('<c:out value="${READONLY_FORBIDDEN_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.svg.save.error" var="SVG_SAVE_ERROR_VAR"/>
 				SVG_SAVE_ERROR : decoderDiv.html('<c:out value="${SVG_SAVE_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.not.selected.error" var="SEQUENCE_NOT_SELECTED_ERROR_VAR"/>
@@ -140,9 +142,9 @@
 				WEIGHTS_NONE_FOUND_ERROR : decoderDiv.html('<c:out value="${WEIGHTS_NONE_FOUND_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.learning.design.templates" var="TEMPLATES_VAR"/>
 				TEMPLATES : decoderDiv.html('<c:out value="${TEMPLATES_VAR}" />').text(),
+				<fmt:message key="authoring.fla.page.menu.apply.changes" var="LIVE_EDIT_SAVE_VAR"/>
+				LIVE_EDIT_SAVE : decoderDiv.html('<c:out value="${LIVE_EDIT_SAVE_VAR}" />').text(),
 				
-				
-				
 				// HandlerLib
 				<fmt:message key="authoring.fla.transition.from.exists.error" var="TRANSITION_FROM_EXISTS_ERROR_VAR"/>
 				TRANSITION_FROM_EXISTS_ERROR : decoderDiv.html('<c:out value="${TRANSITION_FROM_EXISTS_ERROR_VAR}" />').text(),
@@ -257,6 +259,8 @@
 				ACTIVITY_BRANCHING_DESCRIPTION : decoderDiv.html('<c:out value="${ACTIVITY_BRANCHING_DESCRIPTION_VAR}" />').text(),
 				<fmt:message key="authoring.fla.default.range.condition.title.prefix" var="DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR"/>
 				DEFAULT_RANGE_CONDITION_TITLE_PREFIX : '<c:out value="${DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR}" />',
+				<fmt:message key="authoring.fla.page.prop.gradebook.none" var="GRADEBOOK_OUTPUT_NONE_VAR"/>
+				GRADEBOOK_OUTPUT_NONE : '<c:out value="${GRADEBOOK_OUTPUT_NONE_VAR}" />',
 				<fmt:message key="authoring.fla.clear.all.confirm" var="CLEAR_ALL_CONFIRM_VAR"/>
 				CLEAR_ALL_CONFIRM : decoderDiv.html('<c:out value="${CLEAR_ALL_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.remove.condition.confirm" var="REMOVE_CONDITION_CONFIRM_VAR"/>
@@ -276,7 +280,8 @@
 				<fmt:message key="authoring.fla.conditions.mapping.broken" var="CONDITIONS_MAPPING_BROKEN_ERROR_VAR"/>
 				CONDITIONS_MAPPING_BROKEN_ERROR : decoderDiv.html('<c:out value="${CONDITIONS_MAPPING_BROKEN_ERROR_VAR}" />').text()
 			},
-			
+
+			canSetReadOnly = ${canSetReadOnly},
 			isReadOnlyMode = false,
 			activitiesOnlySelectable = false,
 			initContentFolderID = '${contentFolderID}',
@@ -308,11 +313,11 @@
 		</div>
 		
 		<div class="btn-group btn-group-sm">
-			<button type="button" class="btn btn-default" onClick="javascript:MenuLib.openLearningDesign()">
+			<button id="openButton" type="button" class="btn btn-default" onClick="javascript:MenuLib.openLearningDesign()">
 				<i class="fa fa-folder-open-o"></i>
 				<span><fmt:message key="authoring.fla.page.menu.open" /></span>
 			</button>
-			<button type="button" class="btn btn-default desktopButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			<button id="openDropButton" type="button" class="btn btn-default desktopButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				<span class="caret"></span>
 				<span class="sr-only">Toggle Dropdown</span>
 			</button>
@@ -323,11 +328,12 @@
 		</div>
 
 		<div class="btn-group btn-group-sm">
-			<button id="saveButton" type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()">
+			<button id="saveButton" type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()"
+					data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='authoring.fla.page.menu.save' /></span>">
 				<i class="fa fa-save"></i>
 				<span><fmt:message key="authoring.fla.page.menu.save" /></span>
 			</button>
-			<button type="button" class="btn btn-default desktopButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			<button id="saveDropButton" type="button" class="btn btn-default desktopButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				<span class="caret"></span>
 				<span class="sr-only">Toggle Dropdown</span>
 			</button>
@@ -337,7 +343,8 @@
 			</ul>
 		</div>
 		
-		<button id="cancelLiveEditButton" class="btn btn-default" onClick="javascript:GeneralLib.cancelLiveEdit()">
+		<button id="cancelLiveEditButton" class="btn btn-default" onClick="javascript:GeneralLib.cancelLiveEdit()"
+				data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='authoring.fla.cancel.button' /></span>">
 			<i class="fa fa-ban"></i> 
 			<span><fmt:message key="authoring.fla.cancel.button" /></span>
 		</button>
@@ -427,6 +434,7 @@
 					<c:forEach var="tool" items="${tools}">
 						<div class="tooltemplate">
 						<div
+                             name="tool${tool.toolDisplayName}"
 							 toolId="${tool.toolId}"
 							 learningLibraryId="${tool.learningLibraryId}"
 							 learningLibraryTitle="${tool.learningLibraryTitle}"
@@ -462,14 +470,16 @@
 						 onClick="javascript:MenuLib.toggleDescriptionDiv()">
 						<span id="ldDescriptionFieldTitle"><fmt:message key="authoring.fla.page.ld.title" /></span>
 						<span id="ldDescriptionFieldModified"></span>
-						<span id="ldDescriptionHideTip">?</span>
+						<span id="ldDescriptionHideTip">▼</span>
 					</div>
 					<div id="ldDescriptionDetails">
 						<div class="ldDescriptionLabel"><fmt:message key="authoring.fla.page.ld.description" /></div>
 						<div id="ldDescriptionEditorContainer">
 							 <lams:CKEditor id="ldDescriptionFieldDescription" value="" contentFolderID="${contentFolderID}"></lams:CKEditor>
 						</div>
-						
+
+						<div id="ldLicenseDetails">						
+						<img id="ldDescriptionLicenseImage" class="pull-right"/>
 						<div class="ldDescriptionLabel"><fmt:message key="authoring.fla.page.ld.license" /></div>
 						<select id="ldDescriptionLicenseSelect">
 							<option value="0" selected="selected"><fmt:message key="authoring.fla.page.ld.license.none" /></option>
@@ -482,14 +492,14 @@
 								</option>
 							</c:forEach>
 						</select>
-						<img id="ldDescriptionLicenseImage" />
-						<button id="ldDescriptionLicenseButton" class="btn btn-default"><span>View</span></button>
+						<button id="ldDescriptionLicenseButton" class="btn btn-default btn-xs"><span><fmt:message key="label.view"/></span></button>
 						<div id="ldDescriptionLicenseTextContainer">
 							<div class="ldDescriptionLabel"><fmt:message key="authoring.fla.page.ld.license.info" /></div>
 							<textarea id="ldDescriptionLicenseText" rows="5"></textarea>
 						</div>
 					</div>
 				</div>
+				</div>
 				<div id="canvas"></div>
 			</td>
 		</tr>
@@ -553,6 +563,11 @@
 								<i class="fa fa-font"></i> 
 								<span><fmt:message key="authoring.fla.rename.button" /></span>
 							</button>
+							
+							<label for="ldStoreDialogReadOnlyCheckbox" id="ldStoreDialogReadOnlyLabel">
+								<input type="checkbox" id="ldStoreDialogReadOnlyCheckbox" />
+								<span id="ldStoreDialogReadOnlySpan"><fmt:message key="authoring.fla.readonly.checkbox" /></span>
+							</label>
 						</div>
 						
 						<div id="ldStoreDialogNameContainer">
@@ -567,12 +582,14 @@
 								<span><fmt:message key="authoring.fla.cancel.button" /></span>
 							</button>
 
-							<button id="ldStoreDialogSaveButton" class="btn btn-sm btn-primary">
+							<button id="ldStoreDialogSaveButton" class="btn btn-sm btn-primary"
+									data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='authoring.fla.save.button' /></span>">
 								<i class="fa fa-save"></i> 
 								<span><fmt:message key="authoring.fla.save.button" /></span>
 							</button>
 							
-							<button id="ldStoreDialogOpenButton" class="btn btn-sm btn-primary">
+							<button id="ldStoreDialogOpenButton" class="btn btn-sm btn-primary"
+									data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='authoring.fla.open.button' /></span>">
 								<i class="fa fa-folder-open-o"></i> 
 								<span><fmt:message key="authoring.fla.open.button" /></span>
 							</button>
@@ -590,7 +607,7 @@
 	
 	<!-- GROUP OR CONDITION TO BRANCH MATCHING DIALOG -->
 	
-	<div id="branchMappingDialogContents" class="dialogContents branchMappingDialog">
+	<div id="branchMappingDialogContents" class="dialogContents branchMappingDialog" style="display:none">
 		<table>
 			<tr>
 				<td></td>
@@ -647,15 +664,15 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.default" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldDefault" type="checkbox"></input>
+					<input class="propertiesContentFieldDefault" type="checkbox">
 				</td>
 			</tr>
 		</table>
@@ -668,7 +685,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -698,7 +715,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -719,8 +736,8 @@
 				</td>
 				<td>
 					 <input class="propertiesContentFieldGroupCountEnable" type="radio"
-					 		name="propertiesContentFieldGroupDivide"></input>
-					 <input class="propertiesContentFieldGroupCount spinner" type="text"></input>
+					 		name="propertiesContentFieldGroupDivide">
+					 <input class="propertiesContentFieldGroupCount spinner" type="text">
 				</td>
 			</tr>
 			<tr>
@@ -729,24 +746,24 @@
 				</td>
 				<td>
 					<input class="propertiesContentFieldLearnerCountEnable" type="radio"
-					 		name="propertiesContentFieldGroupDivide"></input>
-					 <input class="propertiesContentFieldLearnerCount spinner" type="text"></input>
+					 		name="propertiesContentFieldGroupDivide">
+					 <input class="propertiesContentFieldLearnerCount spinner" type="text">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.groups.equal" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldEqualSizes" type="checkbox"></input>
+					 <input class="propertiesContentFieldEqualSizes" type="checkbox">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.groups.view.learners" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldViewLearners" type="checkbox"></input>
+					 <input class="propertiesContentFieldViewLearners" type="checkbox">
 				</td>
 			</tr>
 			<tr>
@@ -765,7 +782,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td colspan="3">
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -802,21 +819,24 @@
 					<fmt:message key="authoring.fla.page.prop.gate.delay" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetDay spinner" type="text"></input> <fmt:message key="authoring.fla.page.prop.days" />
+					<input class="propertiesContentFieldOffsetDay spinner" type="text"> 
+					<fmt:message key="authoring.fla.page.prop.days" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetHour spinner" type="text"></input> <fmt:message key="authoring.fla.page.prop.hours" />
+					<input class="propertiesContentFieldOffsetHour spinner" type="text"> 
+					<fmt:message key="authoring.fla.page.prop.hours" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetMinute spinner" type="text"></input> <fmt:message key="authoring.fla.page.prop.minutes" />
+					<input class="propertiesContentFieldOffsetMinute spinner" type="text"> 
+					<fmt:message key="authoring.fla.page.prop.minutes" />
 				</td>
 			</tr>
 			<tr class="propertiesContentRowGateSchedule">
 				<td colspan="3">
 					<fmt:message key="authoring.fla.page.prop.gate.activity.finish.based" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldActivityCompletionBased" type="checkbox"></input>
+					 <input class="propertiesContentFieldActivityCompletionBased" type="checkbox">
 				</td>
 			</tr>
 			<tr class="propertiesContentRowConditions">
@@ -840,7 +860,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -892,15 +912,15 @@
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="text">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="text">
 				</td>
 			</tr>
 		</table>
@@ -914,7 +934,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -936,23 +956,23 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.optional.activities.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMin spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalActivityMin spinner" type="text">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.optional.activities.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMax spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalActivityMax spinner" type="text">
 				</td>
 			</tr>
 		</table>
@@ -966,15 +986,15 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text"></input>
+					 <input class="propertiesContentFieldTitle" type="text">
 				</td>
 			</tr>
 			<tr height="50px" valign="top">
 				<td>
 					<fmt:message key="authoring.fla.page.prop.color" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldColor" type="text"></input>
+					 <input class="propertiesContentFieldColor" type="text">
 				</td>
 			</tr>
 		</table>
@@ -988,15 +1008,15 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text"></input>
+					 <input class="propertiesContentFieldTitle" type="text">
 				</td>
 			</tr>
 			<tr height="50px" valign="top">
 				<td>
 					<fmt:message key="authoring.fla.page.prop.color" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldColor" type="text"></input>
+					 <input class="propertiesContentFieldColor" type="text">
 				</td>
 			</tr>
 			<tr >