Fisheye: Tag 08a45e4407f4200f34653a91d402ac4ad2f43f50 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 08a45e4407f4200f34653a91d402ac4ad2f43f50 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/LearnerFlashEnabled.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_chat/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 00ae80d4791f903bcb3661537fc7e129c72ad195)
+++ lams_tool_chat/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -1,47 +1,47 @@
-<%/****************************************************************
- * 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
- * ****************************************************************
- */
-
-/**
- * Standard Head Items
- *	Author: Fiona Malikoff
- *	Description: Includes all the standard head items e.g. the 
- * lams css files, sets the content type, standard javascript files.
- */
-%>
-<%@ tag body-content="empty"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<lams:css style="tabbed"/>
-
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Standard Head Items
+ *	Author: Fiona Malikoff
+ *	Description: Includes all the standard head items e.g. the 
+ * lams css files, sets the content type, standard javascript files.
+ */
+%>
+<%@ tag body-content="empty"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:css style="tabbed"/>
+
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: lams_tool_daco/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_daco/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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_dimdim/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_dimdim/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_images/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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_kaltura/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -126,4 +126,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_kaltura/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_kaltura/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -56,4 +56,4 @@
 
 <a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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_mindmap/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_mindmap/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_mindmap/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -reb7210d9e59ad462f679dde12ea476e2146103ee -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_notebook/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision eb7210d9e59ad462f679dde12ea476e2146103ee)
+++ lams_tool_notebook/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -1,47 +1,47 @@
-<%/****************************************************************
- * 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
- * ****************************************************************
- */
-
-/**
- * Standard Head Items
- *	Author: Fiona Malikoff
- *	Description: Includes all the standard head items e.g. the 
- * lams css files, sets the content type, standard javascript files.
- */
-%>
-<%@ tag body-content="empty"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<lams:css style="tabbed"/>
-
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Standard Head Items
+ *	Author: Fiona Malikoff
+ *	Description: Includes all the standard head items e.g. the 
+ * lams css files, sets the content type, standard javascript files.
+ */
+%>
+<%@ tag body-content="empty"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:css style="tabbed"/>
+
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: lams_tool_pixlr/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_pixlr/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_pixlr/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -91,15 +91,19 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
@@ -122,4 +126,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_scratchie/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_scratchie/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -56,4 +56,4 @@
 
 <a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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_task/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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
Fisheye: Tag 08a45e4407f4200f34653a91d402ac4ad2f43f50 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 08a45e4407f4200f34653a91d402ac4ad2f43f50 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/SetEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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_wiki/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r08a45e4407f4200f34653a91d402ac4ad2f43f50
--- lams_tool_wiki/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/TextSearch.tag	(revision 08a45e4407f4200f34653a91d402ac4ad2f43f50)
@@ -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
Fisheye: Tag 08a45e4407f4200f34653a91d402ac4ad2f43f50 refers to a dead (removed) revision in file `lams_tool_wookie/web/WEB-INF/tags/LearnerFlashEnabled.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 08a45e4407f4200f34653a91d402ac4ad2f43f50 refers to a dead (removed) revision in file `lams_www/web/WEB-INF/tags/SetEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?