Index: lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r38eea63d76357e11cad168548c1332b9297f0828 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 38eea63d76357e11cad168548c1332b9297f0828)
+++ lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -27,8 +27,8 @@
 		<lams:FCKEditor id="instructions"
 			value="${formBean.instructions}"
 			contentFolderID="${formBean.contentFolderID}"
-            toolbarSet="Custom-Pedplanner" height="150px"
-            width="545px" displayExpanded="false">
+            toolbarSet="Custom-Pedplanner" height="190px"
+            width="760px" displayExpanded="false">
 		</lams:FCKEditor>
 	</html:form>
 </body>
Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -ree98a632fd0d6bd7744041ab38a53f562456263e -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ee98a632fd0d6bd7744041ab38a53f562456263e)
+++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -14,7 +14,7 @@
 		}
 		
 		body{
-			width: 550px;
+			width: 760px;
 		}
 					
 		div.FCKdiv {
@@ -64,7 +64,7 @@
 					value="${formBean.topicList[topicIndex-1]}"
 					contentFolderID="${formBean.contentFolderID}"
 	                toolbarSet="Custom-Pedplanner" height="150px"
-	                width="545px" displayExpanded="false">
+	                width="760px" displayExpanded="false">
 				</lams:FCKEditor>
 			</div>
 		</c:forEach>
Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -ree98a632fd0d6bd7744041ab38a53f562456263e -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ee98a632fd0d6bd7744041ab38a53f562456263e)
+++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -16,7 +16,7 @@
 		}
 		
 		body {
-			width: 550px;
+			width: 760px;
 		}
 				
 		div.FCKdiv {
@@ -95,13 +95,13 @@
 					value="${formBean.questionList[questionIndex-1]}"
 					contentFolderID="${formBean.contentFolderID}"
 	                toolbarSet="Custom-Pedplanner" height="150px"
-	                width="545px" displayExpanded="false">
+	                width="760px" displayExpanded="false">
 				</lams:FCKEditor>
 			</div>
 			<div class="space-left">
 				<c:forEach var="candidateAnswerIndex" begin="1" end="${formBean.candidateAnswerCount[questionIndex-1]}" >
 					${candidateAnswerIndex}.
-					<input size="55" type="text" name="candidateAnswer${questionIndex}-${candidateAnswerIndex}" id="candidateAnswer${questionIndex}-${candidateAnswerIndex}" />
+					<input size=90" 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/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -ree98a632fd0d6bd7744041ab38a53f562456263e -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ee98a632fd0d6bd7744041ab38a53f562456263e)
+++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -12,7 +12,7 @@
 		}
 		
 		body {
-			 width: 550px;
+			 width: 760px;
 		}
 			
 		div.FCKdiv {
@@ -63,7 +63,7 @@
 					value="${formBean.questionList[questionIndex-1]}"
 					contentFolderID="${formBean.contentFolderID}"
 	                toolbarSet="Custom-Pedplanner" height="150px"
-	                width="545px" displayExpanded="false">
+	                width="760px" displayExpanded="false">
 				</lams:FCKEditor>
 			</div>
 		</c:forEach>
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -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="90" 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="90" 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="78" 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/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -26,8 +26,8 @@
 		<lams:FCKEditor id="content"
 			value="${formBean.content}"
 			contentFolderID="${formBean.contentFolderID}"
-               toolbarSet="Custom-Pedplanner" height="150px"
-               width="545px" displayExpanded="false">
+               toolbarSet="Custom-Pedplanner" height="190px"
+               width="760px" displayExpanded="false">
 		</lams:FCKEditor>
 	</html:form>
 </body>
Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -28,8 +28,8 @@
 		<lams:FCKEditor id="instructions"
 			value="${formBean.instructions}"
 			contentFolderID="${formBean.contentFolderID}"
-			toolbarSet="Custom-Pedplanner" height="150px"
-			width="545px" displayExpanded="false">
+			toolbarSet="Custom-Pedplanner" height="190px"
+			width="760px" displayExpanded="false">
 		</lams:FCKEditor>
 	</html:form>
 </body>
Index: lams_tool_sbmt/web/WEB-INF/lams.tld
===================================================================
diff -u -rc5b655c3c11fa9d9b1d76e0ef602acf6363e45f9 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_sbmt/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c5b655c3c11fa9d9b1d76e0ef602acf6363e45f9)
+++ lams_tool_sbmt/web/WEB-INF/lams.tld	(.../lams.tld)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -13,28 +13,36 @@
 
    <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
-      <name>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <name>LAMSURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
 
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
+      <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+      <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeHtml</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -44,6 +52,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
@@ -64,28 +92,17 @@
    </tag>
    <tag>
 
-      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
-      <display-name>LAMS URL</display-name>
+      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+      <display-name>generate unique ID</display-name>
       <icon>    
       </icon>
-      <name>LAMSURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <name>generateID</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
       <body-content>empty</body-content>
 
-   </tag>
-   <tag>
-
-      <description>Render html tag with direction and language</description>
-      <display-name>Render html tag with direction and language</display-name>
-      <icon>    
-      </icon>
-      <name>html</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
-      <body-content>JSP</body-content>
-
       <attribute>
-         <description>Render html tag with direction and language</description>
-         <name>xhtml</name>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -95,26 +112,29 @@
    </tag>
    <tag>
 
-      <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-      <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
-      <name>out</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
 
-      <attribute>
-         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>value</name>
-         <required>true</required>
+   </tag>
+   <tag>
 
-           <rtexprvalue>true</rtexprvalue>
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
 
-      </attribute>
       <attribute>
-         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>escapeHtml</name>
-         <required>false</required>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
 
@@ -167,17 +187,17 @@
    </tag>
    <tag>
 
-      <description>Converts role name into form usable as message resources key</description>
-      <display-name>Converts role name into form usable as message resources key</display-name>
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
       <icon>    
       </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <name>user</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Converts role name into form usable as message resources key</description>
-         <name>role</name>
+         <description>Output details from the shared session UserDTO object</description>
+         <name>property</name>
          <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -213,27 +233,7 @@
       </attribute>
 
    </tag>
-   <tag>
 
-      <description>Output details from the shared session UserDTO object</description>
-      <display-name>user details</display-name>
-      <icon>    
-      </icon>
-      <name>user</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output details from the shared session UserDTO object</description>
-         <name>property</name>
-         <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
@@ -289,11 +289,6 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -466,6 +461,10 @@
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -18,6 +18,10 @@
       type="org.lamsfoundation.lams.tool.sbmt.form.AuthoringForm"
     />
     <form-bean
+      name="SbmtPedagogicalPlannerForm"
+      type="org.lamsfoundation.lams.tool.sbmt.form.SubmitFilesPedagogicalPlannerForm"
+    />
+    <form-bean
       name="learnerForm"
       type="org.lamsfoundation.lams.tool.sbmt.form.LearnerForm"
     />
@@ -61,6 +65,47 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
+      path="/learner"
+      type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
+      name="learnerForm"
+      scope="request"
+      input="/learner/sbmtlearner.jsp"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/learner/sbmtlearner.jsp"
+        redirect="false"
+      />
+      <forward
+        name="defineLater"
+        path="/learner/definelater.jsp"
+        redirect="false"
+      />
+      <forward
+        name="runOffline"
+        path="/learner/runoffline.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/pedagogicalPlanner"
+      type="org.lamsfoundation.lams.tool.sbmt.web.SubmitFilesPedagogicalPlannerAction"
+      name="SbmtPedagogicalPlannerForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/authoring/pedagogicalPlannerForm.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/monitoring"
       type="org.lamsfoundation.lams.tool.sbmt.web.MonitoringAction"
       name="SbmtMonitoringForm"
@@ -121,32 +166,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/learner"
-      type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
-      name="learnerForm"
-      scope="request"
-      input="/learner/sbmtlearner.jsp"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="success"
-        path="/learner/sbmtlearner.jsp"
-        redirect="false"
-      />
-      <forward
-        name="defineLater"
-        path="/learner/definelater.jsp"
-        redirect="false"
-      />
-      <forward
-        name="runOffline"
-        path="/learner/runoffline.jsp"
-        redirect="false"
-      />
-    </action>
 
    <!-- ========== Action Mapping Definitions ============================== -->
 		<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
Index: lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -0,0 +1,136 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * TextSearch.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays form for creating text search conditions.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%-- Required attributes --%>
+<%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
+<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
+
+<%-- Optional attributes --%>
+<%@ attribute name="action" required="false" rtexprvalue="true" %>
+<%@ attribute name="formID" required="false" rtexprvalue="true" %>
+<%@ attribute name="headingLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="allWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="phraseLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="anyWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="excludedWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelAction" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty action}">
+	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+</c:if>
+<c:if test="${empty cancelAction}">
+	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+</c:if>
+<c:if test="${empty formID}">
+	<c:set var="formID" value="textSearchForm" scope="request"/>
+</c:if>
+<c:if test="${empty headingFindTextLabelKey}">
+	<c:set var="headingLabelKey" value="textsearch.heading" scope="request"/>
+</c:if>
+<c:if test="${empty allWordsLabelKey}">
+	<c:set var="allWordsLabelKey" value="textsearch.all.words" scope="request"/>
+</c:if>
+<c:if test="${empty phraseLabelKey}">
+	<c:set var="phraseLabelKey" value="textsearch.phrase" scope="request"/>
+</c:if>
+<c:if test="${empty anyWordsLabelKey}">
+	<c:set var="anyWordsLabelKey" value="textsearch.any.words" scope="request"/>
+</c:if>
+<c:if test="${empty excludedWordsLabelKey}">
+	<c:set var="excludedWordsLabelKey" value="textsearch.excluded.words" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="textsearch.save" scope="request"/>
+</c:if>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="textsearch.cancel" scope="request"/>
+</c:if>
+
+<!-- begin text search form content -->
+	
+<c:if test="${wrapInFormTag}">
+	<form action="${action}" id="${formID}" name="${formID}">
+</c:if>
+		<html:hidden property="sessionMapID" />
+		<h4><fmt:message key="${headingLabelKey}" /></h4>
+		<table>
+			<tr>
+				<td>
+					<fmt:message key="${allWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="allWords" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${phraseLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="phrase" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${anyWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="anyWords" /> 
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${excludedWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="excludedWords" /> 
+				</td>
+			</tr>
+		</table>
+<c:if test="${wrapInFormTag}">
+	<lams:ImgButtonWrapper>
+		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
+		</a>
+		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
+		</a>
+	</lams:ImgButtonWrapper>
+	</form>
+</c:if>
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -26,8 +26,8 @@
 		<lams:FCKEditor id="instruction"
 			value="${formBean.instruction}"
 			contentFolderID="${formBean.contentFolderID}"
-            toolbarSet="Custom-Pedplanner" height="150px"
-            width="545px" displayExpanded="false">
+            toolbarSet="Custom-Pedplanner" height="190px"
+            width="760px" displayExpanded="false">
 		</lams:FCKEditor>
 	</html:form>
 </body>
Index: lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -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="85" property="taskListItem[${itemIndex-1}]"></html:text>
+			<html:text styleClass="item" size="90" 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/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -ree98a632fd0d6bd7744041ab38a53f562456263e -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ee98a632fd0d6bd7744041ab38a53f562456263e)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -12,7 +12,7 @@
 		}
 		
 		body {
-			width: 550px;
+			width: 760px;
 		}
 		
 		div.FCKdiv {
@@ -63,7 +63,7 @@
 					value="${formBean.nominationList[nominationIndex-1]}"
 					contentFolderID="${formBean.contentFolderID}"
 	                toolbarSet="Custom-Pedplanner" height="150px"
-	                width="545px" displayExpanded="false">
+	                width="760px" displayExpanded="false">
 				</lams:FCKEditor>
 			</div>
 		</c:forEach>
Index: lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -rf21aa2ec355995ada05a1490b962235e75726d61
--- lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
@@ -47,7 +47,7 @@
 			value="${formBean.wikiBody}"
 			contentFolderID="${formBean.contentFolderID}"
 			toolbarSet="Custom-Pedplanner" height="150px"
-			width="545px" displayExpanded="false">
+			width="760px" displayExpanded="false">
 		</lams:FCKEditor>
 	</html:form>
 </body>