Index: lams_tool_nb/web/a_Advanced.jsp
===================================================================
diff -u -rd4797b7fa4123ca65171aea6cac3d0904ff0f238 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/a_Advanced.jsp	(.../a_Advanced.jsp)	(revision d4797b7fa4123ca65171aea6cac3d0904ff0f238)
+++ lams_tool_nb/web/a_Advanced.jsp	(.../a_Advanced.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
 
Index: lams_tool_nb/web/a_Basic.jsp
===================================================================
diff -u -re922c53fb88812299ecab93e5dae5d2515b94ab4 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/a_Basic.jsp	(.../a_Basic.jsp)	(revision e922c53fb88812299ecab93e5dae5d2515b94ab4)
+++ lams_tool_nb/web/a_Basic.jsp	(.../a_Basic.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,8 +1,8 @@
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
 <html:form action="/authoring" target="_self" >
Index: lams_tool_nb/web/a_Instructions.jsp
===================================================================
diff -u -rc32aaa2353cfd157f5e470ffbfb6a3ba02eb71f9 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/a_Instructions.jsp	(.../a_Instructions.jsp)	(revision c32aaa2353cfd157f5e470ffbfb6a3ba02eb71f9)
+++ lams_tool_nb/web/a_Instructions.jsp	(.../a_Instructions.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
@@ -35,8 +35,6 @@
 					<td class="formlabel"><fmt:message key="instructions.onlineInstructions" /></td>
 					<td class="formcontrol">
 							<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckEditor/"
-								imageBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-								linkBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
 								height="200"
 								width="85%">
 								<c:out value="${NbAuthoringForm.onlineInstructions}" escapeXml="false" />
@@ -55,8 +53,6 @@
 					<td class="formlabel"><fmt:message key="instructions.offlineInstructions" /></td>
 					<td class="formcontrol">
 						<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckEditor/"
-								imageBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-								linkBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
 								width="85%"
 								height="200">
 							<c:out value="${NbAuthoringForm.offlineInstructions}" escapeXml="false" />
Index: lams_tool_nb/web/authorContent.jsp
===================================================================
diff -u
--- lams_tool_nb/web/authorContent.jsp	(revision 0)
+++ lams_tool_nb/web/authorContent.jsp	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -0,0 +1,41 @@
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+
+<html:form action="/authoring" target="_self" >
+<div id="datatablecontainer">
+<table width="100%" align="center">
+<tr>
+	<td align="center">
+	<html:submit property="method" styleClass="button">
+	
+				<fmt:message key="button.basic" />
+		</html:submit>
+	
+		<html:submit property="method" disabled="true" styleClass="button">
+			<fmt:message key="button.advanced" />
+		</html:submit>
+	
+		<html:submit property="method" styleClass="button">
+			<fmt:message key="button.instructions" />
+		</html:submit>
+	</td>
+</tr>
+</table>
+
+<%@ include file="" %>
+
+<div id="datatablecontainer">
+<table width="100%" align="center">
+<c:if test="${NbAuthoringForm.method == 'Basic'}" >
+<tr>
+	<td align="center"><html:button property="cancel" onclick="window.close()" styleClass="button"><fmt:message key="button.cancel"/></html:button>
+	<html:submit property="method" styleClass="button"><fmt:message key="button.ok" /></html:submit>
+	</td>
+</tr>
+</c:if>
+</table>
+</div>
\ No newline at end of file
Index: lams_tool_nb/web/authoringIndex.jsp
===================================================================
diff -u -r55190529b7a6459bd417752be98aaaba3104c03a -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/authoringIndex.jsp	(.../authoringIndex.jsp)	(revision 55190529b7a6459bd417752be98aaaba3104c03a)
+++ lams_tool_nb/web/authoringIndex.jsp	(.../authoringIndex.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,6 +1,6 @@
 <%@ page language="java" import="java.util.*" %>
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%
 String path = request.getContextPath();
 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
Index: lams_tool_nb/web/errorbox.jsp
===================================================================
diff -u
--- lams_tool_nb/web/errorbox.jsp	(revision 0)
+++ lams_tool_nb/web/errorbox.jsp	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -0,0 +1,51 @@
+<!-- 
+  Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt 
+-->
+
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
+<%@ page import="org.apache.struts.action.Action" %>
+<%
+String cprotocol = request.getProtocol();
+if(cprotocol.startsWith("HTTPS")){
+	cprotocol = "https://";
+}else{
+	cprotocol = "http://";
+}
+String pathToShare = cprotocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
+%>
+<div id="datatablecontainer">
+<h2></h2>
+<logic:messagesPresent> 
+<table border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
+<tr>
+	<td width="10%"  align="right" >
+		<img src="<%=pathToShare%>/images/error.jpg" alt="Error occured"/>
+	</td>
+	<td width="90%" valign="middle" class="body" colspan="2">
+		 <html-el:messages id="error" message="false"> 
+			 <c:out value="${error}" escapeXml="false"/><BR>
+		 </html-el:messages> 
+	</td>
+</tr>
+</logic:messagesPresent>
+</div>
+
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -rabe6814206f32216641e71de39a473d8859509d1 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision abe6814206f32216641e71de39a473d8859509d1)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
 
Index: lams_tool_nb/web/learnerIndex.jsp
===================================================================
diff -u -rabe6814206f32216641e71de39a473d8859509d1 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/learnerIndex.jsp	(.../learnerIndex.jsp)	(revision abe6814206f32216641e71de39a473d8859509d1)
+++ lams_tool_nb/web/learnerIndex.jsp	(.../learnerIndex.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,15 +1,16 @@
 <%@ page language="java" import="java.util.*" %>
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
 <%
 String path = request.getContextPath();
 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
 
 String url = "/starter/learner?userId="+555+"&toolSessionId="+455+"&toolContentId="+355+"&mode=learner";
 %>
 
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
 
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
   <head>
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r8922f7fb2a699569ad2f78fc573c91840b2c9193 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 8922f7fb2a699569ad2f78fc573c91840b2c9193)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,6 +1,6 @@
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 
 <div id="datatablecontainer">
Index: lams_tool_nb/web/monitoringContent.jsp
===================================================================
diff -u -rabe6814206f32216641e71de39a473d8859509d1 -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/monitoringContent.jsp	(.../monitoringContent.jsp)	(revision abe6814206f32216641e71de39a473d8859509d1)
+++ lams_tool_nb/web/monitoringContent.jsp	(.../monitoringContent.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,8 +1,8 @@
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
 <html:form action="/monitoring" target="_self">
Index: lams_tool_nb/web/monitoringIndex.jsp
===================================================================
diff -u -r55190529b7a6459bd417752be98aaaba3104c03a -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/monitoringIndex.jsp	(.../monitoringIndex.jsp)	(revision 55190529b7a6459bd417752be98aaaba3104c03a)
+++ lams_tool_nb/web/monitoringIndex.jsp	(.../monitoringIndex.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,6 +1,6 @@
 <%@ page language="java" import="java.util.*" %>
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%
 String path = request.getContextPath();
 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
Index: lams_tool_nb/web/noticeBoard.jsp
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -rdf8425ccbe3a47be373585c09d61502c3890f7aa
--- lams_tool_nb/web/noticeBoard.jsp	(.../noticeBoard.jsp)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/web/noticeBoard.jsp	(.../noticeBoard.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>