Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -rba8161c819a6b07a7deb68a5fe9344304b0b5524 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r1fe0f4f546903187be6f35e4d5c027853da9408c -re66bdae723516ab13d4a6f81e5f598018f6dbe58
Binary files differ
Index: lams_build/lib/pedagogical_planner/1/1/1/LAMS_Pedagogical_Planner_Template.zip
===================================================================
diff -u -r1f477181cf09a7f9e0a4c38845b81dc075361413 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra301da49ef54944c21a4c78c60a2637959be30b5 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a301da49ef54944c21a4c78c60a2637959be30b5)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -243,5 +243,6 @@
 error.planner.grouping.number.integer=Provided value must be a positive integer number.
 label.planner.grouping.equal.group.size=Equal group sizes
 
+label.planner.editing.advice=Editing advice
 msg.planner.not.saved  =Are you sure you want to close? If you have not saved the design, changes you have made will be lost.
 #======= End labels: Exported 216 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re6cd187fcc661f696fa9432032dc7ceec7f41d42 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e6cd187fcc661f696fa9432032dc7ceec7f41d42)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -243,12 +243,12 @@
 error.planner.grouping.number.integer=Provided value must be a positive integer number.
 label.planner.grouping.equal.group.size=Equal group sizes
 msg.planner.not.saved  =Are you sure you want to close? If you have not saved the design, changes you have made will be lost.
+label.planner.editing.advice=Editing advice
 
 label.lamscommunity.message  =Login to lamscommunity.org
 label.lamscommunity.login  =lamscommunity.org login:
 label.lamscommunity.password  =lamscommunity.org password:
 index.lamscommunity  =LAMS Community
 label.lamscommunity.changeuser  =Stop using lamscommunity.org user {0}
 lamscommunity.login.failed  =Login to lamscommunity.org failed, please try again.
-
 #======= End labels: Exported 216 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerActivityDTO.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerActivityDTO.java	(.../PedagogicalPlannerActivityDTO.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerActivityDTO.java	(.../PedagogicalPlannerActivityDTO.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,10 +25,11 @@
 
 public class PedagogicalPlannerActivityDTO {
     private String pedagogicalPlannerUrl;
-    private Long toolContentID;
     private String toolIconUrl;
     private String title;
     private String type;
+    private String editingAdviceUrl;
+    private String checkEditingAdviceUrl;
 
     public String getPedagogicalPlannerUrl() {
 	return pedagogicalPlannerUrl;
@@ -38,19 +39,12 @@
 	pedagogicalPlannerUrl = toolSignature;
     }
 
-    public Long getToolContentID() {
-	return toolContentID;
-    }
-
-    public void setToolContentID(Long toolContentID) {
-	this.toolContentID = toolContentID;
-    }
-
-    public PedagogicalPlannerActivityDTO(Long toolContentID, String type, String title, String pedagogicalPlannerUrl,
-	    String toolIconUrl) {
+    public PedagogicalPlannerActivityDTO(String type, String title, String pedagogicalPlannerUrl, String toolIconUrl,
+	    String checkEditingAdviceUrl, String editingAdviceUrl) {
 	this.pedagogicalPlannerUrl = pedagogicalPlannerUrl;
-	this.toolContentID = toolContentID;
 	this.toolIconUrl = toolIconUrl;
+	this.checkEditingAdviceUrl = checkEditingAdviceUrl;
+	this.editingAdviceUrl = editingAdviceUrl;
 	this.title = title;
 	this.type = type;
     }
@@ -78,4 +72,20 @@
     public void setType(String type) {
 	this.type = type;
     }
+
+    public String getEditingAdviceUrl() {
+	return editingAdviceUrl;
+    }
+
+    public void setEditingAdviceUrl(String editingAdviceUrl) {
+	this.editingAdviceUrl = editingAdviceUrl;
+    }
+
+    public String getCheckEditingAdviceUrl() {
+	return checkEditingAdviceUrl;
+    }
+
+    public void setCheckEditingAdviceUrl(String checkEditingAdviceUrl) {
+	this.checkEditingAdviceUrl = checkEditingAdviceUrl;
+    }
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -rc234c64ad9ff9d713f6d8e3331d0c20075e49303 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision c234c64ad9ff9d713f6d8e3331d0c20075e49303)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -71,7 +71,6 @@
  * @struts.action-forward name="passwordChanged" path=".passwordChangeOk"
  * @struts.action-forward name="portrait" path="/portrait.do"
  * @struts.action-forward name="lessons" path="/profile.do?method=lessons"
- * @struts.action-forward name="planner" path="/pedagogicalPlanner.do"
  */
 public class IndexAction extends Action {
 
@@ -143,7 +142,7 @@
     private void setHeaderLinks(HttpServletRequest request) {
 	List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
 	if (request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN)) {
-	    headerLinks.add(new IndexLinkBean("index.planner", "index.do?tab=planner"));
+	    headerLinks.add(new IndexLinkBean("index.planner", "javascript:openPedagogicalPlanner()"));
 	    headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
 	}
 	headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?tab=profile"));
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
diff -u -rda2924f4d15aa5587ed5e5dc7152b850994bdd87 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision da2924f4d15aa5587ed5e5dc7152b850994bdd87)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -81,6 +81,9 @@
  */
 public class PedagogicalPlannerAction extends LamsDispatchAction {
 
+    private static final String CHAR_QUESTION_MARK = "?";
+    private static final char CHAR_AMPERSAND = '&';
+    private static final char CHAR_EQUALS = '=';
     private static IUserManagementService userManagementService;
     private static IExportToolContentService exportService;
     private static IAuthoringService authoringService;
@@ -137,51 +140,76 @@
 	// create DTO that holds all the necessary information of the activities
 	int activitySupportingPlannerCount = 0;
 	Activity activity = learningDesign.getFirstActivity();
+	int activityIndex = 1;
 	while (activity != null) {
 	    boolean activitySupportsPlanner = false;
 	    boolean activityAdded = false;
 	    if (activity.isToolActivity()) {
 		ToolActivity toolActivity = (ToolActivity) activity;
 		String pedagogicalPlannerUrl = toolActivity.getTool().getPedagogicalPlannerUrl();
 		if (pedagogicalPlannerUrl == null) {
-		    activitites.add(new PedagogicalPlannerActivityDTO(toolActivity.getToolContentId(), toolActivity
-			    .getTool().getToolDisplayName(), activity.getTitle(),
-			    CentralConstants.PATH_ACTIVITY_NO_PLANNER_SUPPORT + "?", activity
-				    .getLibraryActivityUiImage()));
+		    activitites.add(new PedagogicalPlannerActivityDTO(toolActivity.getTool().getToolDisplayName(),
+			    activity.getTitle(), CentralConstants.PATH_ACTIVITY_NO_PLANNER_SUPPORT, activity
+				    .getLibraryActivityUiImage(), null, null));
 
 		} else {
-		    pedagogicalPlannerUrl += pedagogicalPlannerUrl.contains("?") ? '&' : '?';
-		    activitites.add(new PedagogicalPlannerActivityDTO(toolActivity.getToolContentId(), toolActivity
-			    .getTool().getToolDisplayName(), activity.getTitle(), pedagogicalPlannerUrl, activity
-			    .getLibraryActivityUiImage()));
+		    pedagogicalPlannerUrl += pedagogicalPlannerUrl
+			    .contains(PedagogicalPlannerAction.CHAR_QUESTION_MARK) ? PedagogicalPlannerAction.CHAR_AMPERSAND
+			    : PedagogicalPlannerAction.CHAR_QUESTION_MARK;
+		    pedagogicalPlannerUrl += AttributeNames.PARAM_TOOL_CONTENT_ID
+			    + PedagogicalPlannerAction.CHAR_EQUALS + toolActivity.getToolContentId();
+		    activitites
+			    .add(new PedagogicalPlannerActivityDTO(toolActivity.getTool().getToolDisplayName(),
+				    activity.getTitle(), pedagogicalPlannerUrl
+					    + PedagogicalPlannerAction.CHAR_AMPERSAND
+					    + AttributeNames.PARAM_CONTENT_FOLDER_ID
+					    + PedagogicalPlannerAction.CHAR_EQUALS
+					    + learningDesign.getContentFolderID(),
+				    activity.getLibraryActivityUiImage(), pedagogicalPlannerUrl
+					    + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_COMMAND
+					    + PedagogicalPlannerAction.CHAR_EQUALS
+					    + AttributeNames.COMMAND_CHECK_EDITING_ADVICE
+					    + PedagogicalPlannerAction.CHAR_AMPERSAND
+					    + AttributeNames.PARAM_ACTIVITY_INDEX
+					    + PedagogicalPlannerAction.CHAR_EQUALS + activityIndex,
+				    pedagogicalPlannerUrl + PedagogicalPlannerAction.CHAR_AMPERSAND
+					    + AttributeNames.PARAM_COMMAND + PedagogicalPlannerAction.CHAR_EQUALS
+					    + AttributeNames.COMMAND_GET_EDITING_ADVICE));
 		    activitySupportsPlanner = true;
 		}
 		activityAdded = true;
 	    } else if (activity.isGroupingActivity()) {
 		GroupingActivity groupingActivity = (GroupingActivity) activity;
-		activitites.add(new PedagogicalPlannerActivityDTO(groupingActivity.getCreateGrouping().getGroupingId(),
-			null, activity.getTitle(), groupingActivity.getSystemTool().getPedagogicalPlannerUrl() + "&",
-			CentralConstants.IMAGE_PATH_GROUPING));
+		activitites.add(new PedagogicalPlannerActivityDTO(null, activity.getTitle(), groupingActivity
+			.getSystemTool().getPedagogicalPlannerUrl()
+			+ PedagogicalPlannerAction.CHAR_AMPERSAND
+			+ AttributeNames.PARAM_TOOL_CONTENT_ID
+			+ PedagogicalPlannerAction.CHAR_EQUALS + groupingActivity.getCreateGrouping().getGroupingId(),
+			CentralConstants.IMAGE_PATH_GROUPING, null, null));
 		activitySupportsPlanner = true;
 		activityAdded = true;
 	    } else if (activity.isGateActivity()) {
-		activitites.add(new PedagogicalPlannerActivityDTO(null, null, activity.getTitle(),
-			CentralConstants.PATH_ACTIVITY_NO_PLANNER_SUPPORT + "?", CentralConstants.IMAGE_PATH_GATE));
+		activitites
+			.add(new PedagogicalPlannerActivityDTO(null, activity.getTitle(),
+				CentralConstants.PATH_ACTIVITY_NO_PLANNER_SUPPORT, CentralConstants.IMAGE_PATH_GATE,
+				null, null));
 		activityAdded = true;
 	    }
 	    if (activitySupportsPlanner) {
 		activitySupportingPlannerCount++;
 	    }
 	    if (!activityAdded) {
-		activitites.add(new PedagogicalPlannerActivityDTO(null, null, activity.getTitle(),
-			CentralConstants.PATH_ACTIVITY_NO_PLANNER_SUPPORT + "?", activity.getLibraryActivityUiImage()));
+		activitites.add(new PedagogicalPlannerActivityDTO(null, activity.getTitle(),
+			CentralConstants.PATH_ACTIVITY_NO_PLANNER_SUPPORT, activity.getLibraryActivityUiImage(), null,
+			null));
 	    }
 	    Transition transitionTo = activity.getTransitionTo();
 	    if (transitionTo == null) {
 		activity = null;
 	    } else {
 		activity = transitionTo.getToActivity();
 	    }
+	    activityIndex++;
 	}
 	// Set other properties
 	PedagogicalPlannerDTO planner = new PedagogicalPlannerDTO();
@@ -319,7 +347,8 @@
 
 	getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID());
 	String newPath = mapping.findForward("preview").getPath();
-	newPath = newPath + '&' + AttributeNames.PARAM_LESSON_ID + '=' + lesson.getLessonId();
+	newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID
+		+ PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId();
 	return new ActionForward(newPath, true);
     }
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerForm.java
===================================================================
diff -u -rda2924f4d15aa5587ed5e5dc7152b850994bdd87 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerForm.java	(.../PedagogicalPlannerForm.java)	(revision da2924f4d15aa5587ed5e5dc7152b850994bdd87)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerForm.java	(.../PedagogicalPlannerForm.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -36,7 +36,7 @@
  * @author Marcin Cieslak
  * 
  */
-public class PedagogicalPlannerForm extends ActionForm {
+public abstract class PedagogicalPlannerForm extends ActionForm {
     /**
      * Set when opening a Learning Design.
      */
@@ -50,10 +50,6 @@
      * Set when submitting form in base.jsp page.
      */
     private Integer callID;
-    /**
-     * Should the form contain tooltip with online instructions?
-     */
-    private Boolean editingAdviceAvailable;
 
     public Long getToolContentID() {
 	return toolContentID;
@@ -103,12 +99,4 @@
     public void setActivityOrderNumber(Integer activityOrderNumber) {
 	this.activityOrderNumber = activityOrderNumber;
     }
-
-    public Boolean getEditingAdviceAvailable() {
-	return editingAdviceAvailable;
-    }
-
-    public void setEditingAdviceAvailable(Boolean editingAdviceAvailable) {
-	this.editingAdviceAvailable = editingAdviceAvailable;
-    }
 }
\ No newline at end of file
Fisheye: Tag e66bdae723516ab13d4a6f81e5f598018f6dbe58 refers to a dead (removed) revision in file `lams_central/web/css/jTip.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/css/jquery.cluetip.css
===================================================================
diff -u -r1f477181cf09a7f9e0a4c38845b81dc075361413 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/web/css/jquery.cluetip.css	(.../jquery.cluetip.css)	(revision 1f477181cf09a7f9e0a4c38845b81dc075361413)
+++ lams_central/web/css/jquery.cluetip.css	(.../jquery.cluetip.css)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -227,9 +227,4 @@
 .cluetip-rounded #cluetip-title,
 .cluetip-rounded #cluetip-inner {
   zoom: 1;
-}
-
-a#editingAdvice{
-	float: right;
-	margin-right: 30px;
 }
\ No newline at end of file
Index: lams_central/web/css/pedagogicalPlanner.css
===================================================================
diff -u -r0cf0add4991151d21aeac41ddca7a40e76dc78f6 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/web/css/pedagogicalPlanner.css	(.../pedagogicalPlanner.css)	(revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6)
+++ lams_central/web/css/pedagogicalPlanner.css	(.../pedagogicalPlanner.css)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -59,4 +59,10 @@
 div#pedagogicalPlannerErrorArea{
 	margin-bottom: 20px;
 	width: 60%;
+}
+
+a.editingAdvice{
+	display: none;
+	font-size: smaller;
+	margin: 0px 0px 0px 500px;
 }
\ No newline at end of file
Fisheye: Tag e66bdae723516ab13d4a6f81e5f598018f6dbe58 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jtip.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/main.jsp
===================================================================
diff -u -r65b2816b6b46b51ef66de7ed0df1969fc9b80b88 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 65b2816b6b46b51ef66de7ed0df1969fc9b80b88)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -187,9 +187,6 @@
 							<c:if test="${tab eq 'community'}">
 								<tiles:insert attribute="community" />
 							</c:if>
-							<c:if test="${tab eq 'planner'}">
-								<tiles:insert attribute="planner" />
-							</c:if>
 						</td>
 					</tr>
 				</tbody>
Index: lams_central/web/pedagogical_planner/base.jsp
===================================================================
diff -u -ra301da49ef54944c21a4c78c60a2637959be30b5 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_central/web/pedagogical_planner/base.jsp	(.../base.jsp)	(revision a301da49ef54944c21a4c78c60a2637959be30b5)
+++ lams_central/web/pedagogical_planner/base.jsp	(.../base.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -9,9 +9,7 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="title.lams"/> :: <fmt:message key="planner.title" /></title>
-	<lams:css style="main" />
-	<link href="<lams:LAMSURL />css/pedagogicalPlanner.css" rel="stylesheet" type="text/css">
-	  
+
 	  <script type="text/javascript">
 	   var activityCount = ${fn:length(planner.activities)}; //How many activities are there in the sequence
 	   var activitySupportingPlannerCount = ${planner.activitySupportingPlannerCount}; //How many of activities support the planner (their data will be submitted)
@@ -26,7 +24,51 @@
 	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
 	  <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/jquery.form.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.dimensions.pack.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cluetip.js"></script>
 	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/pedagogicalPlanner.js"></script>
+	  <script language="JavaScript" type="text/javascript">
+	  	$(document).ready(function() {
+	  		var activityCount = ${fn:length(planner.activities)};
+	  		for (var activityIndex = 1;activityIndex<=activityCount;activityIndex++){
+	  			var editingAdviceLink = $('#editingAdvice'+activityIndex);
+	  			if (editingAdviceLink.length > 0){
+	  				var checkEditingAdviceUrl = $(editingAdviceLink).attr("rel");
+	  				$.get(
+	  					checkEditingAdviceUrl,
+	  					function(responseText){
+	  						var responseParts = responseText.split("&");
+    						var activityInnerIndex = responseParts[1];
+    						var editingAdviceExists = responseParts[0]=="OK";
+	  						if (editingAdviceExists){
+	  							$('#editingAdvice'+activityInnerIndex).show().cluetip({
+	  								width: 480,
+									cluetipClass: 'jtip',
+									arrows: true,
+									dropShadow: false,
+						 			sticky: true,
+									waitImage: true,
+									closeText: '<fmt:message key="label.authoring.close" />',
+									closePosition: 'title',
+									attribute: 'href',
+									activation: 'click',
+									fx: {             
+                      					open: 'slideDown'
+    								}
+								});
+	  						}
+	  					},
+	  					"html"
+	  				);
+	  			}
+	  		}
+
+		});
+	  </script>
+	  
+	  <lams:css style="main" />
+	  <link href="<lams:LAMSURL />css/pedagogicalPlanner.css" rel="stylesheet" type="text/css">
+	  <link href="<lams:LAMSURL />css/jquery.cluetip.css" rel="stylesheet" type="text/css" />
 </lams:head>
 <body class="stripes">
 <div id="page">
@@ -74,24 +116,30 @@
 					<h4>${activity.title}</h4>
 				</td>
 				<td class="formCell">
-				<iframe frameborder="0" marginheight="0" marginwidth="0" name="activity${activityStatus.index+1}" id="activity${activityStatus.index+1}" class="toolFrame"
-					src="<lams:LAMSURL/>${activity.pedagogicalPlannerUrl}toolContentID=${activity.toolContentID}">
-				</iframe>
+					<iframe frameborder="0" marginheight="0" marginwidth="0" name="activity${activityStatus.index+1}" id="activity${activityStatus.index+1}" class="toolFrame"
+						src="<lams:LAMSURL/>${activity.pedagogicalPlannerUrl}">
+					</iframe>
+					<c:if test="${not empty activity.checkEditingAdviceUrl}">
+						<a href="<lams:LAMSURL/>${activity.editingAdviceUrl}" title=""
+							rel="<lams:LAMSURL/>${activity.checkEditingAdviceUrl}" 
+							class="editingAdvice"
+							id="editingAdvice${activityStatus.index+1}"><fmt:message key="label.planner.editing.advice" /></a>
+					</c:if>
 				</td>
 			</tr>
-			<c:if test="${not activityStatus.last}">
-				<tr>
-					<td class="titleCell">
+			<tr>
+				<td class="titleCell">
+					<c:if test="${not activityStatus.last}">
 						<img src="<lams:LAMSURL/>images/pedag_down_arrow.gif" />
-					</td>
-					<td>
-					</td>
-				</tr>
-			</c:if>
+					</c:if>
+				</td>
+				<td>
+				</td>
+			</tr>
 		</c:forEach>
 	</table>
 	
-	<div  id="pedagogicalPlannerErrorArea" style="display:none;" class="warning" >
+	<div id="pedagogicalPlannerErrorArea" style="display:none;" class="warning" >
 	</div>
 	
 	<div  id="pedagogicalPlannerInfoArea" style="display:none;" class="info" >
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r9ea5d413f7ee1031aedf9282ec31f5380ce921b3 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 9ea5d413f7ee1031aedf9282ec31f5380ce921b3)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -14,7 +14,7 @@
 values ('DumpDir','C:/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('EARDir','C:/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+values ('EARDir','D:/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
@@ -245,4 +245,4 @@
 values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 0);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 0);
+values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 0);
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
diff -u -r0e5777f5ca5d43661be2751d2ee1955a871c79ea -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision 0e5777f5ca5d43661be2751d2ee1955a871c79ea)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -32,54 +32,59 @@
  */
 public class AttributeNames {
 
-	public static final String ADMIN_ORGANISATION = "organisation";
-	public static final String ADMIN_PARENT_ACCESS = "parentAccess";
-	public static final String ADMIN_USER = "user";
-	public static final String ADMIN_ERR_MSG = "errormsg";
+    public static final String ADMIN_ORGANISATION = "organisation";
+    public static final String ADMIN_PARENT_ACCESS = "parentAccess";
+    public static final String ADMIN_USER = "user";
+    public static final String ADMIN_ERR_MSG = "errormsg";
 
-	public static final String USER= "user";
-	public static final String UID="uniqueID";
+    public static final String USER = "user";
+    public static final String UID = "uniqueID";
 
     public static final String PARAM_MODE = "mode";
     public static final String PARAM_ROLE = "role";
     public static final String PARAM_SESSION_STATUS = "sessionStatus";
     public static final String PARAM_USER_ID = "userID";
-	public static final String PARAM_TOOL_CONTENT_ID = "toolContentID";
-    public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; 
-    public static final String PARAM_CURRENT_ACTIVITY_ID = "currentActivityID"; 
-    public static final String PARAM_DEST_ACTIVITY_ID = "destActivityID"; 
+    public static final String PARAM_TOOL_CONTENT_ID = "toolContentID";
+    public static final String PARAM_TOOL_SESSION_ID = "toolSessionID";
+    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";
     public static final String PARAM_CONTENT_FOLDER_ID = "contentFolderID";
-    public static final String PARAM_TITLE = "title"; 
-    
+    public static final String PARAM_TITLE = "title";
+
     public static final String PARAM_COURSE_ID = "courseID";
     public static final String PARAM_CLASS_ID = "classID";
     public static final String PARAM_GROUP_ID = "groupID";
-    
+
     public static final String PARAM_LEARNINGDESIGN_ID = "learningDesignID";
     public static final String PARAM_ORGANISATION_ID = "organisationID";
-    
+
     public static final String PARAM_LEARNER_PROGRESS_ID = "progressID";
     public static final String PARAM_LESSON_ID = "lessonID";
     public static final String PARAM_DIRECTORY_NAME = "directoryName";
     public static final String PARAM_FILENAME = "filename";
     public static final String PARAM_EXPORT_PORTFOLIO_ENABLED = "portfolioEnabled";
     public static final String PARAM_PRESENCE_ENABLED = "presenceEnabledPatch";
-    // PARAM_PRESENCE_ENABLED = "presenceEnabledPatch" : strange name used to avoid Java overwriting values in its a hashmap used in learner action in HomeAction.java
+    // PARAM_PRESENCE_ENABLED = "presenceEnabledPatch" : strange name used to avoid Java overwriting values in its a
+    // hashmap used in learner action in HomeAction.java
     public static final String PARAM_PRESENCE_IM_ENABLED = "presenceImEnabled";
     public static final String PARAM_CURRENT_TAB = "currentTab";
     public static final String PARAM_CUSTOM_CSV = "customCSV";
     public static final String PARAM_EXT_LMS_ID = "extlmsid";
-    public static final String PARAM_CREATE_DATE_TIME = "createDateTime"; 
-    
+    public static final String PARAM_CREATE_DATE_TIME = "createDateTime";
+
     public static final String PARAM_LIB = "library";
-    
+
     public static final String PARAM_OFFLINE = "offline";
-    
+
     public static final String ATTR_MODE = "mode";
     public static final String ATTR_USERNAME = "username";
     public static final String ATTR_UPDATE_PROGRESS_BAR = "updateProgressBar";
     public static final String ATTR_SESSION_STATUS = "sessionStatus";
 
-	
+    // for Pedagogical Planner
+    public static final String PARAM_COMMAND = "command";
+    public static final String COMMAND_GET_EDITING_ADVICE = "getEditingAdvice";
+    public static final String COMMAND_CHECK_EDITING_ADVICE = "checkEditingAdvice";
+    public static final String PARAM_ACTIVITY_INDEX = "activityNumber";
 }
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,10 +25,12 @@
 package org.lamsfoundation.lams.tool.chat.web.actions;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -37,6 +39,7 @@
 import org.lamsfoundation.lams.tool.chat.model.Chat;
 import org.lamsfoundation.lams.tool.chat.service.ChatServiceProxy;
 import org.lamsfoundation.lams.tool.chat.service.IChatService;
+import org.lamsfoundation.lams.tool.chat.util.ChatConstants;
 import org.lamsfoundation.lams.tool.chat.web.forms.ChatPedagogicalPlannerForm;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -71,8 +74,33 @@
 	ChatPedagogicalPlannerForm plannerForm = (ChatPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Chat chat = getChatService().getChatByContentId(toolContentID);
-	plannerForm.fillForm(chat);
-	return mapping.findForward("success");
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(chat);
+	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    plannerForm.setContentFolderID(contentFolderId);
+	    return mapping.findForward(ChatConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = chat.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
+
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(chat.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		PedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
@@ -88,7 +116,7 @@
 	} else {
 	    saveErrors(request, errors);
 	}
-	return mapping.findForward("success");
+	return mapping.findForward(ChatConstants.SUCCESS);
     }
 
     private IChatService getChatService() {
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java
===================================================================
diff -u -rfd5e4f5bc87d1f88622dff13d944a3bec845659a -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java	(.../ChatPedagogicalPlannerForm.java)	(revision fd5e4f5bc87d1f88622dff13d944a3bec845659a)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java	(.../ChatPedagogicalPlannerForm.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -24,14 +24,14 @@
 package org.lamsfoundation.lams.tool.chat.web.forms;
 
 import org.lamsfoundation.lams.tool.chat.model.Chat;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
 public class ChatPedagogicalPlannerForm extends PedagogicalPlannerForm {
     String instructions;
+    String contentFolderID;
 
     public String getInstructions() {
 	return instructions;
@@ -43,8 +43,16 @@
 
     public void fillForm(Chat chat) {
 	if (chat != null) {
-	    setInstructions(WebUtil.removeHTMLtags(chat.getInstructions()));
+	    setInstructions(chat.getInstructions());
 	    setToolContentID(chat.getToolContentId());
 	}
     }
+
+    public String getContentFolderID() {
+	return contentFolderID;
+    }
+
+    public void setContentFolderID(String contentFolderID) {
+	this.contentFolderID = contentFolderID;
+    }
 }
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -rca9d25f64fd0967cd81b417a728574d26668cc14 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision ca9d25f64fd0967cd81b417a728574d26668cc14)
+++ lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -5,6 +5,7 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
@@ -39,6 +40,7 @@
 -->
 
 <fck:editor id="${id}"
+	height="${height}"
 	basePath="${basePath}"
 	toolbarSet="${toolbarSet}"
 	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
Index: lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -5,6 +5,14 @@
 <lams:html>
 <lams:head>
 	<lams:css style="core" />
+	
+	<script type="text/javascript">
+	function prepareFormData(){
+		//FCKeditor content is not submitted when sending by jQuery; we need to do this
+		var content = FCKeditorAPI.GetInstance('instructions').GetXHTML();
+		document.getElementById("instructions").value=content;
+	}
+	</script>
 </lams:head>
 <body>
 	<%@ include file="/common/messages.jsp"%>
@@ -14,7 +22,13 @@
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
-		<html:textarea property="instructions" style="margin: 2px 0px 0px 10px;" cols="62" rows="5" />
+		
+		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<lams:FCKEditor id="instructions"
+			value="${formBean.instructions}"
+			contentFolderID="${formBean.contentFolderID}"
+			toolbarSet="Custom-Wiki" height="200px">
+		</lams:FCKEditor>
 	</html:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_forum/.classpath
===================================================================
diff -u -r406cdd685f03fa39a0ea0c85bde60f7b268bc05d -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_forum/.classpath	(.../.classpath)	(revision 406cdd685f03fa39a0ea0c85bde60f7b268bc05d)
+++ lams_tool_forum/.classpath	(.../.classpath)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -9,7 +9,6 @@
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE13_CONTAINER"/>
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-hibernate.deployer/jboss-hibernate.jar"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-cache.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -26,6 +26,7 @@
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
@@ -1071,9 +1072,31 @@
 	ForumPedagogicalPlannerForm plannerForm = (ForumPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Forum forum = getForumManager().getForumByContentId(toolContentID);
-	plannerForm.fillForm(forum);
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(forum);
+	    return mapping.findForward("success");
+	} else {
+	    try {
+		String onlineInstructions = forum.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
 
-	return mapping.findForward("success");
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(forum.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		AuthoringAction.log.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
@@ -1141,4 +1164,4 @@
 	plannerForm.setTopic(plannerForm.getTopicCount().intValue(), "");
 	return mapping.findForward("success");
     }
-}
+}
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -42,7 +42,7 @@
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		
 		<c:forEach var="topicIndex"  begin="1" end="${formBean.topicCount}" >
-			<html:textarea property="topic[${topicIndex-1}]" cols="62" rows="4" />
+			<html:textarea property="topic[${topicIndex-1}]" cols="65" rows="4" />
 		</c:forEach>
 	</html:form>
 	<a class="button" href="javascript:createTopic();"><fmt:message key="label.authoring.create.new.topic" /></a>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java	(.../McPedagogicalPlannerAction.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java	(.../McPedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -69,9 +70,30 @@
 	McPedagogicalPlannerForm plannerForm = (McPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	McContent qaContent = getMcService().retrieveMc(toolContentID);
-	plannerForm.fillForm(qaContent, getMcService());
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(qaContent, getMcService());
+	    return mapping.findForward(McAppConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = qaContent.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
 
-	return mapping.findForward(McAppConstants.SUCCESS);
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(qaContent.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		McPedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -66,11 +66,11 @@
 		<input type="hidden" id="questionCount" value="${formBean.questionCount}" />
 		
 		<c:forEach var="questionIndex"  begin="1" end="${formBean.questionCount}" >
-			<html:text property="question[${questionIndex-1}]" size="70" />
+			<html:text property="question[${questionIndex-1}]" size="75" />
 			<div class="space-left">
 				<c:forEach var="candidateAnswerIndex" begin="1" end="${formBean.candidateAnswerCount[questionIndex-1]}" >
 					${candidateAnswerIndex}.
-					<input size="50" type="text" name="candidateAnswer${questionIndex}-${candidateAnswerIndex}" id="candidateAnswer${questionIndex}-${candidateAnswerIndex}" />
+					<input size="55" type="text" name="candidateAnswer${questionIndex}-${candidateAnswerIndex}" id="candidateAnswer${questionIndex}-${candidateAnswerIndex}" />
 					<html:radio property="correct[${questionIndex-1}]" value="${candidateAnswerIndex}" />
 					<br />
 				</c:forEach>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
===================================================================
diff -u -rfd5e4f5bc87d1f88622dff13d944a3bec845659a -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	(.../QaPedagogicalPlannerAction.java)	(revision fd5e4f5bc87d1f88622dff13d944a3bec845659a)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	(.../QaPedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -61,9 +62,31 @@
 	QaPedagogicalPlannerForm plannerForm = (QaPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	QaContent qaContent = getQaService().retrieveQa(toolContentID);
-	plannerForm.fillForm(qaContent);
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(qaContent);
+	    return mapping.findForward(QaAppConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = qaContent.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
 
-	return mapping.findForward(QaAppConstants.SUCCESS);
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(qaContent.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		QaPedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -40,7 +40,7 @@
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		
 		<c:forEach var="questionIndex"  begin="1" end="${formBean.questionCount}" >
-			<html:textarea property="question[${questionIndex-1}]" cols="62" rows="4" />
+			<html:textarea property="question[${questionIndex-1}]" cols="65" rows="4" />
 		</c:forEach>
 	</html:form>
 	<a class="button" href="javascript:createQuestion();"><fmt:message key="label.add.new.question" /></a>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.sql.Timestamp;
@@ -1172,9 +1173,31 @@
 	ResourcePedagogicalPlannerForm plannerForm = (ResourcePedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Resource taskList = getResourceService().getResourceByContentId(toolContentID);
-	plannerForm.fillForm(taskList);
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(taskList);
+	    return mapping.findForward(ResourceConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = taskList.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
 
-	return mapping.findForward(ResourceConstants.SUCCESS);
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(taskList.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		AuthoringAction.log.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -59,18 +59,18 @@
 			<html:hidden property="fileVersion[${itemIndex-1}]" />
 			<html:hidden property="fileName[${itemIndex-1}]"></html:hidden>
 			<h4 class="space-left"><fmt:message key="label.authoring.basic.title"/></h4>
-			<html:text styleClass="item" size="80" property="title[${itemIndex-1}]"></html:text>
+			<html:text styleClass="item" size="85" property="title[${itemIndex-1}]"></html:text>
 			<c:choose>
 				<c:when test="${itemType eq 1}">
 					<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.url"/></h4>
-					<html:text styleClass="item" size="80" property="url[${itemIndex-1}]"></html:text>
+					<html:text styleClass="item" size="85" property="url[${itemIndex-1}]"></html:text>
 				</c:when>
 				<c:when test="${itemType eq 2}">
 					<html:hidden property="url[${itemIndex-1}]" />
 					<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.file"/>
 						<c:if test="${not empty itemFileName}">: ${itemFileName}</c:if>
 					</h4>
-					<html:file size="68" styleClass="item" property="file[${itemIndex-1}]" />
+					<html:file size="73" styleClass="item" property="file[${itemIndex-1}]" />
 				</c:when>
 			</c:choose>
 			<hr style="margin-left: auto; margin-right: auto; margin-top: 5px; margin-bottom: 5px; width: 450px" />
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java	(.../NbPedagogicalPlannerAction.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java	(.../NbPedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,10 +25,12 @@
 package org.lamsfoundation.lams.tool.noticeboard.web;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -71,8 +73,31 @@
 	NbPedagogicalPlannerForm plannerForm = (NbPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	NoticeboardContent noticeboard = getNoticeboardService().retrieveNoticeboard(toolContentID);
-	plannerForm.fillForm(noticeboard);
-	return mapping.findForward("success");
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(noticeboard);
+	    return mapping.findForward("success");
+	} else {
+	    try {
+		String onlineInstructions = noticeboard.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
+
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(noticeboard.getOnlineInstructions()) ? "NO" : "OK")
+			    + '&' + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		NbPedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -13,7 +13,7 @@
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
-		<html:textarea property="content" style="margin: 2px 0px 0px 10px;" cols="62" rows="5" />
+		<html:textarea property="content" style="margin: 2px 0px 0px 10px;" cols="65" rows="6" />
 	</html:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -rda2924f4d15aa5587ed5e5dc7152b850994bdd87 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision da2924f4d15aa5587ed5e5dc7152b850994bdd87)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,10 +25,12 @@
 package org.lamsfoundation.lams.tool.notebook.web.actions;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -72,8 +74,32 @@
 	NotebookPedagogicalPlannerForm plannerForm = (NotebookPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID);
-	plannerForm.fillForm(notebook);
-	return mapping.findForward(NotebookConstants.SUCCESS);
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(notebook);
+	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    plannerForm.setContentFolderID(contentFolderId);
+	    return mapping.findForward(NotebookConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = notebook.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
+
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(notebook.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		PedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
@@ -92,15 +118,6 @@
 	return mapping.findForward(NotebookConstants.SUCCESS);
     }
 
-    public ActionForward getEditingAdvice(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
-	Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID);
-	String onlineInstructions = notebook.getOnlineInstructions();
-	writeAJAXResponse(response, onlineInstructions);
-	return null;
-    }
-
     private INotebookService getNotebookService() {
 	if (notebookService == null) {
 	    notebookService = NotebookServiceProxy.getNotebookService(this.getServlet().getServletContext());
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java
===================================================================
diff -u -rda2924f4d15aa5587ed5e5dc7152b850994bdd87 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java	(.../NotebookPedagogicalPlannerForm.java)	(revision da2924f4d15aa5587ed5e5dc7152b850994bdd87)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java	(.../NotebookPedagogicalPlannerForm.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -23,17 +23,24 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.notebook.web.forms;
 
-import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
 
 /**
  * @struts.form name="pedagogicalPlannerForm"
  */
 public class NotebookPedagogicalPlannerForm extends PedagogicalPlannerForm {
     String instructions;
+    String contentFolderID;
 
+    public String getContentFolderID() {
+	return contentFolderID;
+    }
+
+    public void setContentFolderID(String contentFolderID) {
+	this.contentFolderID = contentFolderID;
+    }
+
     public String getInstructions() {
 	return instructions;
     }
@@ -44,9 +51,8 @@
 
     public void fillForm(Notebook notebook) {
 	if (notebook != null) {
-	    setInstructions(WebUtil.removeHTMLtags(notebook.getInstructions()));
+	    setInstructions(notebook.getInstructions());
 	    setToolContentID(notebook.getToolContentId());
-	    setEditingAdviceAvailable(!StringUtils.isEmpty(notebook.getOnlineInstructions()));
 	}
     }
 }
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -rca9d25f64fd0967cd81b417a728574d26668cc14 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision ca9d25f64fd0967cd81b417a728574d26668cc14)
+++ lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -5,6 +5,7 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
@@ -39,6 +40,7 @@
 -->
 
 <fck:editor id="${id}"
+	height="${height}"
 	basePath="${basePath}"
 	toolbarSet="${toolbarSet}"
 	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r1f477181cf09a7f9e0a4c38845b81dc075361413 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 1f477181cf09a7f9e0a4c38845b81dc075361413)
+++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -4,47 +4,32 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
-	<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/jquery.dimensions.pack.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cluetip.js"></script>
-	<script language="JavaScript" type="text/javascript">
-		$(document).ready(function() {
-			$('#editingAdvice').cluetip({
-				height: 130,
-				cluetipClass: 'jtip',
-				arrows: true,
-				dropShadow: false,
-	 			sticky: true,
-				waitImage: true,
-				activation: 'click',
-				closeText: 'X',
-				topOffset: 0
-			});
-		});
-	</script>
-	
 	<lams:css style="core" />
-	<link href="<lams:LAMSURL />css/jquery.cluetip.css" rel="stylesheet" type="text/css" />
+	
+	<script type="text/javascript">
+	function prepareFormData(){
+		//FCKeditor content is not submitted when sending by jQuery; we need to do this
+		var content = FCKeditorAPI.GetInstance('instructions').GetXHTML();
+		document.getElementById("instructions").value=content;
+	}
+	</script>
 </lams:head>
 <body>
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left" style="float:left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-		
-		<c:if test="${formBean.editingAdviceAvailable}">
-			<c:url value="/pedagogicalPlanner.do" var="tipUrl">
-				<c:param name="dispatch" value="getEditingAdvice" />
-				<c:param name="toolContentID" value="${formBean.toolContentID}" />
-			</c:url>
-			<a href="#" title="" rel="${tipUrl}" id="editingAdvice"><fmt:message key="label.planner.editing.advice" /></a>
-		</c:if>
-		
 		<html:hidden property="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
-		<html:textarea property="instructions" style="margin: 2px 0px 0px 10px;" cols="65" rows="6" />
+		<br />
+		
+		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<lams:FCKEditor id="instructions"
+			value="${formBean.instructions}"
+			contentFolderID="${formBean.contentFolderID}"
+			toolbarSet="Custom-Wiki" height="200px">
+		</lams:FCKEditor>
 	</html:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java	(.../SubmitFilesPedagogicalPlannerForm.java)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java	(.../SubmitFilesPedagogicalPlannerForm.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.sbmt.form;
 
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
 
 /**
@@ -33,7 +32,16 @@
  */
 public class SubmitFilesPedagogicalPlannerForm extends PedagogicalPlannerForm {
     String instruction;
+    String contentFolderID;
 
+    public String getContentFolderID() {
+	return contentFolderID;
+    }
+
+    public void setContentFolderID(String contentFolderID) {
+	this.contentFolderID = contentFolderID;
+    }
+
     public String getInstruction() {
 	return instruction;
     }
@@ -45,7 +53,6 @@
     public void fillForm(SubmitFilesContent content) {
 	if (content != null) {
 	    String instruction = content.getInstruction();
-	    instruction = WebUtil.removeHTMLtags(instruction);
 	    setInstruction(instruction);
 	    setToolContentID(content.getContentID());
 	}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/SubmitFilesPedagogicalPlannerAction.java
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/SubmitFilesPedagogicalPlannerAction.java	(.../SubmitFilesPedagogicalPlannerAction.java)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/SubmitFilesPedagogicalPlannerAction.java	(.../SubmitFilesPedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,10 +25,12 @@
 package org.lamsfoundation.lams.tool.sbmt.web;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -38,6 +40,7 @@
 import org.lamsfoundation.lams.tool.sbmt.form.SubmitFilesPedagogicalPlannerForm;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction;
@@ -72,8 +75,32 @@
 	SubmitFilesPedagogicalPlannerForm plannerForm = (SubmitFilesPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	SubmitFilesContent submitFiles = getSubmitFilesService().getSubmitFilesContent(toolContentID);
-	plannerForm.fillForm(submitFiles);
-	return mapping.findForward("success");
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(submitFiles);
+	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    plannerForm.setContentFolderID(contentFolderId);
+	    return mapping.findForward(SbmtConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = submitFiles.getOnlineInstruction();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
+
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(submitFiles.getOnlineInstruction()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		SubmitFilesPedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
@@ -89,7 +116,7 @@
 	} else {
 	    saveErrors(request, errors);
 	}
-	return mapping.findForward("success");
+	return mapping.findForward(SbmtConstants.SUCCESS);
     }
 
     private ISubmitFilesService getSubmitFilesService() {
Index: lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -rca9d25f64fd0967cd81b417a728574d26668cc14 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision ca9d25f64fd0967cd81b417a728574d26668cc14)
+++ lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -5,6 +5,7 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
@@ -39,6 +40,7 @@
 -->
 
 <fck:editor id="${id}"
+	height="${height}"
 	basePath="${basePath}"
 	toolbarSet="${toolbarSet}"
 	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
Index: lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -5,6 +5,14 @@
 <lams:html>
 <lams:head>
 	<lams:css style="core" />
+	
+	<script type="text/javascript">
+	function prepareFormData(){
+		//FCKeditor content is not submitted when sending by jQuery; we need to do this
+		var content = FCKeditorAPI.GetInstance('instruction').GetXHTML();
+		document.getElementById("instruction").value=content;
+	}
+	</script>
 </lams:head>
 <body>
 	<h4 class="space-left"><fmt:message key="label.authoring.basic.instruction" /></h4>
@@ -13,7 +21,13 @@
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
-		<html:textarea property="instruction" style="margin: 2px 0px 0px 10px;" cols="62" rows="5" />
+		
+		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<lams:FCKEditor id="instruction"
+			value="${formBean.instruction}"
+			contentFolderID="${formBean.contentFolderID}"
+			toolbarSet="Custom-Wiki" height="200px">
+		</lams:FCKEditor>
 	</html:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.tool.taskList.web.action;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -1057,9 +1058,31 @@
 	TaskListPedagogicalPlannerForm plannerForm = (TaskListPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	TaskList taskList = getTaskListService().getTaskListByContentId(toolContentID);
-	plannerForm.fillForm(taskList);
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(taskList);
+	    return mapping.findForward("success");
+	} else {
+	    try {
+		String onlineInstructions = taskList.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
 
-	return mapping.findForward("success");
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(taskList.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		AuthoringAction.log.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -43,7 +43,7 @@
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		
 		<c:forEach var="itemIndex"  begin="1" end="${formBean.taskListItemCount}" >
-			<html:text styleClass="item" size="80" property="taskListItem[${itemIndex-1}]"></html:text>
+			<html:text styleClass="item" size="85" property="taskListItem[${itemIndex-1}]"></html:text>
 		</c:forEach>
 	</html:form>
 	<a class="button" href="javascript:createItem();"><fmt:message key="label.authoring.basic.add.task" /></a>
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java	(.../VotePedagogicalPlannerAction.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java	(.../VotePedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -61,9 +62,31 @@
 	VotePedagogicalPlannerForm plannerForm = (VotePedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	VoteContent voteContent = getVoteService().retrieveVote(toolContentID);
-	plannerForm.fillForm(voteContent);
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(voteContent);
+	    return mapping.findForward(VoteAppConstants.SUCCESS);
+	} else {
+	    try {
+		String onlineInstructions = voteContent.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
 
-	return mapping.findForward(VoteAppConstants.SUCCESS);
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(voteContent.getOnlineInstructions()) ? "NO" : "OK")
+			    + '&' + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		VotePedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
+
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -40,7 +40,7 @@
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		
 		<c:forEach var="nominationIndex"  begin="1" end="${formBean.nominationCount}" >
-			<html:textarea property="nomination[${nominationIndex-1}]" cols="62" rows="4" />
+			<html:textarea property="nomination[${nominationIndex-1}]" cols="65" rows="4" />
 		</c:forEach>
 	</html:form>
 	<a class="button" href="javascript:createQuestion();"><fmt:message key="label.add.new.nomination" /></a>
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -63,18 +63,16 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
- * This action handles all the authoring actions, which include opening author,
- * saving, uploading instruction files and all the wikipage actions
+ * This action handles all the authoring actions, which include opening author, saving, uploading instruction files and
+ * all the wikipage actions
  * 
- * It inherits from the WikiPageAction which inherits from the
- * LamsDispatchAction so that common actions can be used in learner, monitor and
- * author
+ * It inherits from the WikiPageAction which inherits from the LamsDispatchAction so that common actions can be used in
+ * learner, monitor and author
  * 
  * @author lfoxton
  * @version
  * 
- * @struts.action path="/authoring" name="authoringForm" parameter="dispatch"
- *                scope="request" validate="false"
+ * @struts.action path="/authoring" name="authoringForm" parameter="dispatch" scope="request" validate="false"
  * @struts.action-forward name="success" path="tiles:/authoring/main"
  * @struts.action-forward name="compareWiki" path="/pages/wiki/compare.jsp"
  * @struts.action-forward name="viewWiki" path="/pages/wiki/viewWiki.jsp"
@@ -104,11 +102,11 @@
     private static final String KEY_DELETED_FILES = "deletedFiles";
 
     /**
-     * Default method when no dispatch parameter is specified. It is expected
-     * that the parameter <code>toolContentID</code> will be passed in. This
-     * will be used to retrieve content for this tool.
+     * Default method when no dispatch parameter is specified. It is expected that the parameter
+     * <code>toolContentID</code> will be passed in. This will be used to retrieve content for this tool.
      * 
      */
+    @Override
     protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -192,9 +190,9 @@
     }
 
     /**
-     * Wrapper method to make sure that the correct wiki is returned to from the
-     * WikiPageAction class
+     * Wrapper method to make sure that the correct wiki is returned to from the WikiPageAction class
      */
+    @Override
     protected ActionForward returnToWiki(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response, Long currentWikiPageId) throws Exception {
 	AuthoringForm authForm = (AuthoringForm) form;
@@ -203,9 +201,9 @@
     }
 
     /**
-     * Implements the abstract method, since this is author we return null here
-     * as there is no user
+     * Implements the abstract method, since this is author we return null here as there is no user
      */
+    @Override
     public WikiUser getCurrentUser(Long toolSessionId) {
 	// return null here to signify that this is in author
 	return null;
@@ -214,8 +212,7 @@
     /**
      * Saves the Wiki content including uploaded files and advance options
      * 
-     * The WikiPage content is not saved here as that is done in the
-     * WikiPageAction
+     * The WikiPage content is not saved here as that is done in the WikiPageAction
      * 
      * @param mapping
      * @param form
@@ -232,10 +229,10 @@
 	SessionMap<String, Object> map = getSessionMap(request, authForm);
 
 	// get wiki content.
-	Wiki wiki = wikiService.getWikiByContentId((Long) map.get(KEY_TOOL_CONTENT_ID));
+	Wiki wiki = wikiService.getWikiByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
 
 	// update wiki content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
+	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
 	updateWiki(wiki, authForm, mode);
 
 	// remove attachments marked for deletion.
@@ -244,14 +241,14 @@
 	    attachments = new HashSet<WikiAttachment>();
 	}
 
-	for (WikiAttachment att : getAttList(KEY_DELETED_FILES, map)) {
+	for (WikiAttachment att : getAttList(AuthoringAction.KEY_DELETED_FILES, map)) {
 	    // remove from db, leave in repository
 	    attachments.remove(att);
 	}
 
 	// add unsaved attachments
-	attachments.addAll(getAttList(KEY_UNSAVED_ONLINE_FILES, map));
-	attachments.addAll(getAttList(KEY_UNSAVED_OFFLINE_FILES, map));
+	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map));
+	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map));
 
 	// set attachments in case it didn't exist
 	wiki.setWikiAttachments(attachments);
@@ -317,15 +314,15 @@
 	List<WikiAttachment> unsavedFiles;
 	List<WikiAttachment> savedFiles;
 	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = (FormFile) authForm.getOfflineFile();
-	    unsavedFiles = getAttList(KEY_UNSAVED_OFFLINE_FILES, map);
+	    file = authForm.getOfflineFile();
+	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
 
-	    savedFiles = getAttList(KEY_OFFLINE_FILES, map);
+	    savedFiles = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
 	} else {
-	    file = (FormFile) authForm.getOnlineFile();
-	    unsavedFiles = getAttList(KEY_UNSAVED_ONLINE_FILES, map);
+	    file = authForm.getOnlineFile();
+	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map);
 
-	    savedFiles = getAttList(KEY_ONLINE_FILES, map);
+	    savedFiles = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
 	}
 
 	// validate file max size
@@ -340,7 +337,8 @@
 	if (file.getFileName().length() != 0) {
 
 	    // upload file to repository
-	    WikiAttachment newAtt = wikiService.uploadFileToContent((Long) map.get(KEY_TOOL_CONTENT_ID), file, type);
+	    WikiAttachment newAtt = wikiService.uploadFileToContent(
+		    (Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
 
 	    // Add attachment to unsavedFiles
 	    // check to see if file with same name exists
@@ -351,7 +349,7 @@
 		if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
 			&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 		    // move from this this list to deleted list.
-		    getAttList(KEY_DELETED_FILES, map).add(currAtt);
+		    getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(currAtt);
 		    iter.remove();
 		    break;
 		}
@@ -379,9 +377,9 @@
 
 	List fileList;
 	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    fileList = getAttList(KEY_OFFLINE_FILES, map);
+	    fileList = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
 	} else {
-	    fileList = getAttList(KEY_ONLINE_FILES, map);
+	    fileList = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
 	}
 
 	Iterator iter = fileList.iterator();
@@ -391,7 +389,7 @@
 
 	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
 		// move to delete file list, deleted at next updateContent
-		getAttList(KEY_DELETED_FILES, map).add(att);
+		getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(att);
 
 		// remove from this list
 		iter.remove();
@@ -412,9 +410,9 @@
 	List unsavedFiles;
 
 	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    unsavedFiles = getAttList(KEY_UNSAVED_OFFLINE_FILES, map);
+	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
 	} else {
-	    unsavedFiles = getAttList(KEY_UNSAVED_ONLINE_FILES, map);
+	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map);
 	}
 
 	Iterator iter = unsavedFiles.iterator();
@@ -454,8 +452,8 @@
 	wiki.setMainPage(mainPage);
 
 	if (mode.isAuthor()) { // Teacher cannot modify following
-	    wiki.setOfflineInstructions(authForm.getOnlineInstruction());
-	    wiki.setOnlineInstructions(authForm.getOfflineInstruction());
+	    wiki.setOfflineInstructions(authForm.getOfflineInstruction());
+	    wiki.setOnlineInstructions(authForm.getOnlineInstruction());
 	    wiki.setLockOnFinished(authForm.isLockOnFinished());
 	    wiki.setAllowLearnerAttachImages(authForm.isAllowLearnerAttachImages());
 	    wiki.setAllowLearnerCreatePages(authForm.isAllowLearnerCreatePages());
@@ -501,44 +499,44 @@
 
 	SessionMap<String, Object> map = new SessionMap<String, Object>();
 
-	map.put(KEY_MODE, mode);
-	map.put(KEY_CONTENT_FOLDER_ID, contentFolderID);
-	map.put(KEY_TOOL_CONTENT_ID, toolContentID);
-	map.put(KEY_ONLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(KEY_OFFLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(KEY_UNSAVED_OFFLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(KEY_DELETED_FILES, new LinkedList<WikiAttachment>());
+	map.put(AuthoringAction.KEY_MODE, mode);
+	map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
+	map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
+	map.put(AuthoringAction.KEY_ONLINE_FILES, new LinkedList<WikiAttachment>());
+	map.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<WikiAttachment>());
+	map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<WikiAttachment>());
+	map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<WikiAttachment>());
+	map.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<WikiAttachment>());
 
 	Iterator iter = wiki.getWikiAttachments().iterator();
 	while (iter.hasNext()) {
 	    WikiAttachment attachment = (WikiAttachment) iter.next();
 	    String type = attachment.getFileType();
 	    if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-		getAttList(KEY_OFFLINE_FILES, map).add(attachment);
+		getAttList(AuthoringAction.KEY_OFFLINE_FILES, map).add(attachment);
 	    }
 	    if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-		getAttList(KEY_ONLINE_FILES, map).add(attachment);
+		getAttList(AuthoringAction.KEY_ONLINE_FILES, map).add(attachment);
 	    }
 	}
 
 	return map;
     }
 
     /**
-     * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR
-     * mode.
+     * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
      * 
      * @param request
      * @return
      */
     private ToolAccessMode getAccessMode(HttpServletRequest request) {
 	ToolAccessMode mode;
 	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString()))
+	if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) {
 	    mode = ToolAccessMode.TEACHER;
-	else
+	} else {
 	    mode = ToolAccessMode.AUTHOR;
+	}
 	return mode;
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -r8d32e52903d230f8018ac609041934db7f180e73 -re66bdae723516ab13d4a6f81e5f598018f6dbe58
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 8d32e52903d230f8018ac609041934db7f180e73)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
@@ -25,10 +25,12 @@
 package org.lamsfoundation.lams.tool.wiki.web.actions;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -39,7 +41,6 @@
 import org.lamsfoundation.lams.tool.wiki.service.IWikiService;
 import org.lamsfoundation.lams.tool.wiki.service.WikiServiceProxy;
 import org.lamsfoundation.lams.tool.wiki.web.forms.WikiPedagogicalPlannerForm;
-import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -72,9 +73,32 @@
 	WikiPedagogicalPlannerForm plannerForm = (WikiPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Wiki wiki = getWikiService().getWikiByContentId(toolContentID);
-	plannerForm.fillForm(wiki);
-	plannerForm.setContentFolderID(FileUtil.generateUniqueContentFolderID());
-	return mapping.findForward("success");
+	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
+	if (command == null) {
+	    plannerForm.fillForm(wiki);
+	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    plannerForm.setContentFolderID(contentFolderId);
+	    return mapping.findForward("success");
+	} else {
+	    try {
+		String onlineInstructions = wiki.getOnlineInstructions();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter writer = response.getWriter();
+
+		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
+		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
+		    String responseText = (StringUtils.isEmpty(wiki.getOnlineInstructions()) ? "NO" : "OK") + '&'
+			    + activityIndex;
+		    writer.print(responseText);
+
+		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
+		    writer.print(onlineInstructions);
+		}
+	    } catch (IOException e) {
+		PedagogicalPlannerAction.logger.error(e);
+	    }
+	    return null;
+	}
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,