Index: lams_central/web/pedagogical_planner/sequenceChooser.jsp
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -rc697b5c30ab742ab453859355b35cd518856334f
--- lams_central/web/pedagogical_planner/sequenceChooser.jsp	(.../sequenceChooser.jsp)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_central/web/pedagogical_planner/sequenceChooser.jsp	(.../sequenceChooser.jsp)	(revision c697b5c30ab742ab453859355b35cd518856334f)
@@ -7,18 +7,11 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
 <lams:html>
 <lams:head>
 	  <title><fmt:message key="title.lams"/> :: <fmt:message key="planner.title" /></title>
-	  
-	  <c:if test="${node.edit}">
-	  	<script language="JavaScript" type="text/javascript">
-	  		var title = "<c:out value='${node.title}' escapeXml='true' />";
-	  		var briefDescription = "<c:out value='${node.briefDescription}' escapeXml='true' />";
-	  		var fullDescription = "<c:out value='${node.fullDescription}' escapeXml='true' />";
-	  	</script>
-	  </c:if>
-	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+
 	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/pedagogicalPlanner.js"></script>
 	  
 	  <lams:css style="main" />
@@ -54,47 +47,71 @@
 				<c:set var="isRootNode" value="${empty node.uid and empty node.parentUid}" />
 				<c:choose>
 					<c:when test="${isRootNode}">
-						<div style="margin: 20px 0px 0px 10px"><fmt:message key="label.planner.root.choose" /></div>
+						<div class="space-left space-top"><fmt:message key="label.planner.root.choose" /></div>
 					</c:when>
 					<c:otherwise>
-						<h3 style="margin-top: 20px"><c:out value='${node.title}' escapeXml='true' /></h3>
-						<div style="margin-left: 10px"><c:out value='${node.fullDescription}' escapeXml='true' /></div>
+						<h3 class="space-top"><c:out value='${node.title}' escapeXml='true' /></h3>
+						<div class="space-left">${node.fullDescription}</div>
 					</c:otherwise>
 				</c:choose>
-
 				
 			</td>
 		</tr>
 		<c:choose>
 			<c:when test="${empty node.subnodes}">
 				<tr>
-					<td colspan="2" style="text-align: center">
+					<td colspan="2" class="align-center">
 						<h3><fmt:message key="label.planner.empty.subnode" /></h3>
 					</td>
 				</tr>
 			</c:when>
 			<c:otherwise>
 			<%-- Iterate through subnodes --%>
-				<c:forEach var="subnode" items="${node.subnodes}">
+				<c:forEach var="subnode" items="${node.subnodes}" varStatus="subnodeStatus">
 					<tr>
-						<td style="width: 15px">
+						<td class="align-right" style="width: 60px;">
 							<%-- Cell with icons (info or actions like remove node)  --%>
 							<c:choose>
-							<c:when test="${node.edit}">
-								<c:url value="/pedagogicalPlanner.do" var="removeNodeUrl">
-									<c:param name="method" value="removeSequenceNode" />
-									<c:param name="edit" value="true" />
-									<c:param name="uid" value="${subnode.uid}" />
-								</c:url>
-								<img style="height: 15px; width: 15px; cursor: pointer;" src="<lams:LAMSURL/>images/cross.gif"
-									title="<fmt:message key="msg.planner.remove.node" />"
-									onclick="javascript:removeNode('<fmt:message key="msg.planner.remove.warning" />','${removeNodeUrl}')" />
-							</c:when>
-							<c:otherwise>
-								<c:if test="${not empty node.fileName}">
-									<img src="<lams:LAMSURL/>images/circle_filled.gif" alt="<fmt:message key="msg.planner.open.template" />" />
-								</c:if>
-							</c:otherwise>
+								<c:when test="${node.edit}">
+									<c:url value="/pedagogicalPlanner.do" var="removeNodeUrl">
+										<c:param name="method" value="removeSequenceNode" />
+										<c:param name="edit" value="true" />
+										<c:param name="uid" value="${subnode.uid}" />
+									</c:url>
+									<c:url value="/pedagogicalPlanner.do" var="downNodeUrl">
+										<c:param name="method" value="moveNodeDown" />
+										<c:param name="edit" value="true" />
+										<c:param name="uid" value="${subnode.uid}" />
+									</c:url>
+									<img class="sequenceActionImage" src="<lams:LAMSURL/>images/cross.gif"
+										title="<fmt:message key="msg.planner.remove.node" />"
+										onclick="javascript:leaveNodeEditor('<fmt:message key="msg.planner.remove.warning" />','${removeNodeUrl}')" />
+									<c:if test="${not subnodeStatus.first}">
+										<c:url value="/pedagogicalPlanner.do" var="upNodeUrl">
+											<c:param name="method" value="moveNodeUp" />
+											<c:param name="edit" value="true" />
+											<c:param name="uid" value="${subnode.uid}" />
+										</c:url>
+										<img class="sequenceActionImage" src="<lams:LAMSURL/>images/css/up.gif"
+											title="<fmt:message key="msg.planner.move.node.up" />"
+											onclick="javascript:leaveNodeEditor(null,'${upNodeUrl}')" />
+									</c:if>
+									<c:if test="${not subnodeStatus.last}">
+										<c:url value="/pedagogicalPlanner.do" var="downNodeUrl">
+											<c:param name="method" value="moveNodeDown" />
+											<c:param name="edit" value="true" />
+											<c:param name="uid" value="${subnode.uid}" />
+										</c:url>
+										<img class="sequenceActionImage" src="<lams:LAMSURL/>images/css/down.gif"
+											title="<fmt:message key="msg.planner.move.node.down" />"
+											onclick="javascript:leaveNodeEditor(null,'${downNodeUrl}')" />
+									</c:if>
+								</c:when>
+								<c:otherwise>
+									<c:if test="${not empty subnode.fileName}">
+										<img src="<lams:LAMSURL/>images/circle_filled.gif" title="<fmt:message key="msg.planner.open.template" />" />
+									</c:if>
+								</c:otherwise>
 							</c:choose>
 						</td>
 						<td>
@@ -109,7 +126,7 @@
 									(locked)
 								</c:if>
 							</a> 
-							- ${subnode.briefDescription}
+							<div class="space-left small-space-top">${subnode.briefDescription}</div>
 						</td>
 					</tr>
 				</c:forEach>
@@ -120,91 +137,137 @@
 		<c:when test="${node.edit}">
 			<%-- Form for editing the node --%>
 			<hr style="margin: auto" />
+			<logic:messagesPresent> 
+				<p class="warning">
+					<html:messages id="error">
+				       <c:out value="${error}" escapeXml="false"/><br/>
+				    </html:messages>
+			    </p>
+			</logic:messagesPresent>
 			
 			<%-- Do we edit the current node or create a subnode? --%>
 			<c:choose>
 				<c:when test="${not node.createSubnode and (isRootNode or node.locked)}">
-					<h3 style="text-align: center"><fmt:message key="msg.planner.node.locked"></fmt:message></h3>
+					<h3 class="align-center"><fmt:message key="msg.planner.node.locked" /></h3>
 				</c:when>
 				<c:otherwise>
-					<h2 style="text-align: center">
-					<c:choose>
-						<c:when test="${node.createSubnode}">
-							<fmt:message key="label.planner.create.subnode" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="label.planner.edit.node" />
-						</c:otherwise>
-					</c:choose>
-					</h2>
-					<html:form styleId="nodeForm" style="margin-left: 20px" action="/pedagogicalPlanner" method="post" enctype="multipart/form-data">
+					<html:form styleId="nodeForm" styleClass="space-left" action="/pedagogicalPlanner" method="post" enctype="multipart/form-data">
+						<c:set var="formBean"  value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 						<input type="hidden" id="method" name="method" value="saveSequenceNode" />
 						<input type="hidden" id="edit" name="edit" value="true" />
+						<html:hidden property="contentFolderId"/>
 						
 						<c:choose>
 							<c:when test="${node.createSubnode}">
 								<input type="hidden" id="parentUid" name="parentUid" value="${node.uid}" />
+								<h2 class="align-center"><fmt:message key="label.planner.create.subnode" /></h2>
 							</c:when>
 							<c:otherwise>
 								<input type="hidden" id="uid" name="uid" value="${node.uid}" />
+								<h2 class="align-center"><fmt:message key="label.planner.edit.node" /></h2>
 							</c:otherwise>
 						</c:choose>
 						
 						<div class="field-name space-top"><fmt:message key="label.title" /></div>
-						<input type="text" id="title" name="title" size="80"
-							<c:if test="${not node.createSubnode}">
-								value="<c:out escapeXml='true' value='${node.title}' />"
-							</c:if>
-						 />
+						<html:text property="title" size="130" />
 						 
-						<c:set var="entry">
-							<c:if test="${not node.createSubnode}">
-								<c:out escapeXml='true' value='${node.briefDescription}' />
-							</c:if>
-						</c:set>
 						<div class="field-name space-top"><fmt:message key="label.planner.description.brief" /></div>
-						<textarea id="briefDescription" name="briefDescription" rows="3" cols="60">${fn:trim(entry)}</textarea>
+						<lams:FCKEditor id="briefDescription"
+							value="${formBean.briefDescription}"
+							contentFolderID="${formBean.contentFolderId}"
+			                toolbarSet="Custom-Pedplanner" height="150px"
+			                width="820px" displayExpanded="false">
+						</lams:FCKEditor>
 						
-						<c:set var="entry">
-							<c:if test="${not node.createSubnode}">
-								<c:out escapeXml='true' value='${node.fullDescription}' />
+						<br /><br /><fmt:message key="label.planner.node.type" /><br />
+						<html:radio property="nodeType" styleId="hasSubnodesType" onchange="javascript:onNodeTypeChange()" value="subnodes"><fmt:message key="label.planner.node.type.subnodes" /></html:radio><br />
+						<html:radio property="nodeType" onchange="onNodeTypeChange()" value="template"><fmt:message key="label.planner.node.type.template" /></html:radio>
+						
+						<c:set var="hasSubnodesType" value="${formBean.nodeType eq 'subnodes'}" />
+						<div id="fullDescriptionArea" class="space-bottom"
+							<c:if test="${not hasSubnodesType}">
+								style="display: none;"
 							</c:if>
-						</c:set>
-						<div class="field-name space-top"><fmt:message key="label.planner.description.full" /></div>
-						<textarea id="fullDescription" name="fullDescription" rows="3" cols="60">${fn:trim(entry)}</textarea>
+						>
+							<div class="field-name space-top"><fmt:message key="label.planner.description.full" /></div>
+							<lams:FCKEditor id="fullDescription"
+								value="${formBean.fullDescription}"
+								contentFolderID="${formBean.contentFolderId}"
+				                toolbarSet="Custom-Pedplanner" height="150px"
+				                width="820px" displayExpanded="false">
+							</lams:FCKEditor>
+						</div>
+						<div id="fileArea" class="space-top"
+							<c:if test="${hasSubnodesType}">
+								style="display: none;"
+							</c:if>
+						>
+							<c:if test="${not empty node.fileName}">
+								<c:url var="downloadTemplateFile" value="/download/">
+									<c:param name="uuid" value="${formBean.fileUuid}" />
+									<c:param name="preferDownload" value="true" />
+								</c:url>
+								<fmt:message key="label.planner.uploaded.template" /> <a href="${downloadTemplateFile}">${node.fileName}</a>
+								<br /><br />
+								<html:checkbox onchange="onRemoveFileCheckboxChange()" styleId="removeFile" property="removeFile"><fmt:message key="label.planner.remove.file" /></html:checkbox>
+							</c:if>
+							<div id="fileInputArea"	class="small-space-top space-bottom">
+								<c:choose>
+									<c:when test="${empty node.fileName}">
+										<fmt:message key="label.planner.choose.file" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.planner.change.file" />
+									</c:otherwise>
+								</c:choose>
+								<br />
+								<html:file property="file" size="66" />
+							</div>
+						</div>
 					</html:form>
 				</c:otherwise>
 			</c:choose>
-			<div id="buttonArea" style="margin-top: 10px">
+			<div id="buttonArea" class="space-top">
 				<c:url value="/pedagogicalPlanner.do" var="closeNodeEditorUrl">
 					<c:param name="method" value="openSequenceNode" />
 					<c:param name="edit" value="false" />
-					<c:param name="uid" value="${node.uid}" />
 				</c:url>
-				<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor('<fmt:message key="msg.planner.not.saved" />','${closeNodeEditorUrl}');"><fmt:message key="button.close" /></a>
-				<c:if test="${not node.createSubnode}">
+				<a class="button pedagogicalPlannerButtons" 
+				<c:choose>
+					<c:when test="${node.locked}">
+						href="javascript:leaveNodeEditor(null,'${closeNodeEditorUrl}');"
+					</c:when>
+					<c:otherwise>
+						href="javascript:leaveNodeEditor('<fmt:message key="msg.planner.not.saved" />','${closeNodeEditorUrl}');"
+					</c:otherwise>
+				</c:choose>
+				><fmt:message key="button.close" /></a>
+				
+				<c:if test="${not node.createSubnode and empty node.fileName}">
 					<c:url value="/pedagogicalPlanner.do" var="createSubnodeUrl">
 						<c:param name="method" value="openSequenceNode" />
 						<c:param name="edit" value="true" />
 						<c:param name="createSubnode" value="true" />
 						<c:param name="uid" value="${node.uid}" />
 					</c:url>
-					<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor('<fmt:message key="msg.planner.not.saved" />','${createSubnodeUrl}');"><fmt:message key="label.planner.create.subnode" /></a>
+					<a class="button pedagogicalPlannerButtons" href="javascript:leaveNodeEditor(null,'${createSubnodeUrl}');"><fmt:message key="label.planner.create.subnode" /></a>
 				</c:if>
 				<c:if test="${node.createSubnode or not isRootNode }">
-					<a class="button pedagogicalPlannerButtons" href="javascript:$('#nodeForm').submit()"><fmt:message key="button.planner.save.node" /></a>
+					<a class="button pedagogicalPlannerButtons" href="javascript:document.getElementById('nodeForm').submit()"><fmt:message key="button.planner.save.node" /></a>
 				</c:if>
 			</div>
 		</c:when>
 		<c:otherwise>
-			<c:url value="/pedagogicalPlanner.do" var="openEditorUrl">
-				<c:param name="method" value="openSequenceNode" />
-				<c:param name="edit" value="true" />
-				<c:param name="uid" value="${node.uid}" />
-			</c:url>
 			<div id="buttonArea">
 				<a class="button pedagogicalPlannerButtons" href="javascript:closePlanner();"><fmt:message key="button.close" /></a>
-				<a class="button pedagogicalPlannerButtons" href="${openEditorUrl}"><fmt:message key="button.planner.editor.open" /></a>
+				<c:if test="${node.isSysAdmin}">
+					<c:url value="/pedagogicalPlanner.do" var="openEditorUrl">
+						<c:param name="method" value="openSequenceNode" />
+						<c:param name="edit" value="true" />
+						<c:param name="uid" value="${node.uid}" />
+					</c:url>
+					<a class="button pedagogicalPlannerButtons" href="${openEditorUrl}"><fmt:message key="button.planner.editor.open" /></a>
+				</c:if>
 			</div>
 		</c:otherwise>
 	</c:choose>