Index: lams_tool_larsrc/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/build.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/build.xml	22 Mar 2006 04:43:19 -0000	1.2
+++ lams_tool_larsrc/build.xml	22 Mar 2006 05:34:55 -0000	1.3
@@ -247,7 +247,7 @@
 				distributable="false" sessiontimeout="${sessiontimeout}"/>
 			
          <strutsconfigxml validatexml="true" version="1.2" mergedir="${conf.xdoclet.dir}"/>
-         <strutsdynaformvalidationxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  />
+         <strutsdynaformvalidationxml destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  />
 
       </webdoclet>
 
Index: lams_tool_larsrc/conf/xdoclet/struts-plugins.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-plugins.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/conf/xdoclet/struts-plugins.xml	21 Mar 2006 05:14:31 -0000	1.1
+++ lams_tool_larsrc/conf/xdoclet/struts-plugins.xml	22 Mar 2006 05:34:56 -0000	1.2
@@ -1,11 +1,11 @@
 <!-- Put custom struts plugin here -->
 <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
 	<set-property property="pathnames"
-		value="/WEB-INF/struts/validator-rules.xml,/WEB-INF/struts/validation.xml" />
+		value="/WEB-INF/struts/validator-rules.xml,/WEB-INF/validation.xml" />
 </plug-in>
 
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
-	<set-property property="definitions-config" value="/WEB-INF/struts/tiles-defs.xml"/>
+	<set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml"/>
 </plug-in>
 <!--
 <plug-in className="net.sf.struts.saif.SAIFPlugin">
Index: lams_tool_larsrc/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/tool_insert.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/db/sql/tool_insert.sql	21 Mar 2006 05:14:31 -0000	1.1
+++ lams_tool_larsrc/db/sql/tool_insert.sql	22 Mar 2006 05:34:55 -0000	1.2
@@ -31,26 +31,26 @@
 VALUES
 (
 'larsrc11',
-'rsrcService',
-'Share Resources',
-'Share Resources',
-'forum',
+'resourceService',
+'Shared Resources',
+'Shared Resources',
+'sharedresources',
 '1.1',
 NULL,
 NULL,
 0,
 2,
 1,
-'tool/lafrum11/learning/viewForum.do?mode=learner',
-'tool/lafrum11/learning/viewForum.do?mode=author',
-'tool/lafrum11/learning/viewForum.do?mode=teacher',
-'tool/lafrum11/authoring/init.do',
-'tool/lafrum11/monitoring.do',
-'tool/lafrum11/defineLater.do',
-'tool/lafrum11/exportPortfolio?mode=learner',
-'tool/lafrum11/exportPortfolio?mode=teacher',
-'tool/lafrum11/contribute.do',
-'tool/lafrum11/moderate.do',
-'org.lamsfoundation.lams.tool.forum.web.ApplicationResources',
+'tool/larsrc11/learning/viewResource.do?mode=learner',
+'tool/larsrc11/learning/viewResource.do?mode=author',
+'tool/larsrc11/learning/viewResource.do?mode=teacher',
+'tool/larsrc11/authoring/init.do',
+'tool/larsrc11/monitoring.do',
+'tool/larsrc11/defineLater.do',
+'tool/larsrc11/exportPortfolio?mode=learner',
+'tool/larsrc11/exportPortfolio?mode=teacher',
+'tool/larsrc11/contribute.do',
+'tool/larsrc11/moderate.do',
+'org.lamsfoundation.lams.tool.rsrc.ApplicationResources',
 NOW()
 )
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	22 Mar 2006 04:43:19 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	22 Mar 2006 05:34:55 -0000	1.2
@@ -44,12 +44,12 @@
 	public ActionForward execute(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 		
-//		String param = mapping.getParameter();
-//		//-----------------------Forum Author function ---------------------------
-//	  	if (param.equals("initPage")) {
-////	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.AUTHOR_MODE);
-//       		return initPage(mapping, form, request, response);
-//        }
+		String param = mapping.getParameter();
+		//-----------------------Forum Author function ---------------------------
+	  	if (param.equals("initPage")) {
+//	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.AUTHOR_MODE);
+       		return initPage(mapping, form, request, response);
+        }
 //	  	if (param.equals("monitoringInitPage")) {
 ////	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.MONITOR_MODE);
 //	  		return initPage(mapping, form, request, response);
@@ -102,5 +102,9 @@
 	//******************************************************************************************************************
 	//              Forum Author functions
 	//******************************************************************************************************************
+
+	private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		return null;
+	}
 	
 }
Index: lams_tool_larsrc/web/WEB-INF/.cvsignore
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/Attic/.cvsignore,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/WEB-INF/.cvsignore	22 Mar 2006 04:43:19 -0000	1.1
+++ lams_tool_larsrc/web/WEB-INF/.cvsignore	22 Mar 2006 05:34:55 -0000	1.2
@@ -1,2 +1,3 @@
 lib
 struts-config.xml
+validation.xml
Index: lams_tool_larsrc/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/Attic/tiles-defs.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/WEB-INF/tiles-defs.xml	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+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
+-->
+
+<tiles-definitions>
+
+	<definition name="tiles:layout" path="/layout/default.jsp">
+    	<put name="pageTitleKey" value=""/>
+    	<put name="body" value=""/>
+    	<put name="header" value="/common/header.jsp"/>
+    	<put name="footer" value="/common/footer.jsp"/>
+	</definition>
+	<!-- B: Monitoring -->
+	
+	<!-- E: Monitoring -->
+	
+</tiles-definitions>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/WEB-INF/web.xml	22 Mar 2006 04:43:19 -0000	1.2
+++ lams_tool_larsrc/web/WEB-INF/web.xml	22 Mar 2006 05:34:55 -0000	1.3
@@ -169,60 +169,4 @@
 	<error-code>403</error-code>
 	<location>/403.html</location>
 </error-page>
-
-  	<jsp-config>
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   FCKEditor Tag Library -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--   Customized Tag Library -->
-		<!--  ======================================================== -->	
-		<taglib>
-		   <taglib-uri>tags-lams</taglib-uri>
-		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-		</taglib>
-
-	</jsp-config>
 </web-app>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/jstl/tlds/c.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/jstl/tlds/fmt.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/jstl/tlds/fn.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/jstl/tlds/x.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/struts/.cvsignore'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/struts/tiles-defs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/taglibs.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/common/taglibs.jsp	22 Mar 2006 04:43:20 -0000	1.1
+++ lams_tool_larsrc/web/common/taglibs.jsp	22 Mar 2006 05:34:55 -0000	1.2
@@ -1,10 +1,14 @@
 <%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="/WEB-INF/lams.tld" prefix="lams" %>
+<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK"%>
 
Index: lams_tool_larsrc/web/pages/author_page/css/aqua.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/css/Attic/aqua.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/css/aqua.css	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,150 @@
+/*This is a theme CSS file.  Which one will be loaded into the JSP depends on a variable passed in from FLASH.*/
+
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	background-color: #A2BCF9;
+	
+}
+
+h1 {
+	font-size: large;
+	background-color: #B4C8FE;
+	border-top-width: 1px;
+	border-top-style: solid;
+	border-top-color: #999999;
+	border-left-width: 1px;
+	border-left-style: solid;
+	border-left-color: #999999;
+}
+h2 {
+	font-size: small;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	border-bottom-color: #666666;
+	margin-bottom: 1px;
+    
+ 
+}
+
+th {
+	font-size: small;
+	color: #FFFFFF;
+	background-color: #075A8B;
+	text-align: left;
+}
+
+.formtablecontainer{
+	text-align:center;
+}
+
+.datatablecontainer{
+	width:100%;
+}
+
+.buttoncontainer {
+	
+}
+
+
+input, select, textarea {
+	font-family: 'Verdana', 'Arial', 'Helvetica', sans-serif;
+	font-size: small;
+}
+
+.forms {
+	border: 1px solid #999999;
+	font-size: small;
+	font-style: normal;
+	width: 100%;
+}
+
+.formlabel {
+	font-size: small;
+	font-style: normal;
+	text-align: right;
+	width: 20%;
+}
+
+.formcontrol {
+	font-size: small;
+	font-style: normal;
+	text-align: left;
+}
+
+/********* tab styles **********/
+/*tab styles*/
+.tab{
+	text-align:center;
+}
+
+.tab a{
+	font-size: 11px;
+	color: #000000;
+	text-decoration:none;
+}
+.tab a:hover{
+	font-size: 11px;
+	color: #000000;
+	text-decoration:underline
+}
+.tabcentre{
+	background-image:url(../images/aqua_tab_centre.gif);
+	background-repeat:repeat-x;
+}
+
+.tabcentre_selected{
+	background-image:url(../images/aqua_tab_s_centre.gif);
+	background-repeat:repeat-x;
+}
+
+.tabcentre_inactive{
+	background-image:url(../images/aqua_tab_i_centre.gif);
+	background-repeat:repeat-x;
+}
+
+/** Non Selected tab style **/
+.tableft td{
+	background: url(../images/aqua_tab_left.gif) no-repeat;
+}
+.tabright td{
+	background: url(../images/aqua_tab_right.gif) no-repeat;
+}
+
+/** Selected tab style **/
+.tableft_selected td{
+	background: url(../images/aqua_tab_s_left.gif) no-repeat;
+}
+
+.tableft_inactive td{
+	background: url(../images/aqua_tab_i_left.gif) no-repeat;
+}
+
+.tabright_selected td{
+	background: url(../images/aqua_tab_s_right.gif) no-repeat;
+}
+
+.tabright_inactive td{
+	background: url(../images/aqua_tab_i_right.gif) no-repeat;
+}
+
+/*Tab content containers*/
+.tabbody{
+	width: 98%;
+	
+	background-color : #D9E8FF;
+	float:left;
+
+	margin : 0px 0px 0px 0px;
+	border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #0D3F59;
+	border-left-color:  #0D3F59;
+	
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #0D3F59;
+	padding:5px;	
+
+}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/author_page/css/base.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/css/Attic/base.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/css/base.css	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,3 @@
+/*
+This is the Base CSS, it will define the location of images etc and other core, non user configurable items. (Admin configurable)
+*/
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/author_page/css/fckeditor_style.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/css/Attic/fckeditor_style.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/css/fckeditor_style.css	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,55 @@
+.previewPanel{
+	width: 700px; 
+	height: 220px; 
+	border-style: none;
+	border-width: 1px;
+	padding: 5px;
+	
+	overflow: auto;
+}
+
+.textareaPanel{
+	width: 700px; 
+	height: 220px; 
+}
+
+
+.smallPreviewPanel{
+         width: 700px;
+         height: 120px;
+         border-style: none;
+         border-width: 1px;
+         padding: 5px;
+}
+
+.smallTextareaPanel{
+         width: 700px;
+         height: 120px;
+}
+
+#wyswygEditor{
+	/*position the wyswygEditor in the centre*/
+	position: absolute; 
+	/*top: 15%; 
+	left: 50%;
+	margin-left: -400px;
+	margin-top: -260px;*/
+	
+	width: 100%;
+	height: 100%;
+	
+	
+	/*border-style: solid; 
+	border-width: 3px;*/
+}
+
+#wyswygEditorScreen{
+	position: absolute;
+
+	width: 700px; 
+	height: 220px; 
+
+	padding: 0px;
+	margin: 0px;
+}
+
Index: lams_tool_larsrc/web/pages/author_page/css/tool_custom.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/css/Attic/tool_custom.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/css/tool_custom.css	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,59 @@
+.button{
+	float:right;
+	font-size: 12px;
+	color: #000000;
+	text-decoration:none;
+	text-align: center;
+	background-color:#B4C8FE;
+	margin: 2px 5px 2px 5px;
+	padding:3px;
+  	width: 80px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-style: solid;
+	border-right-style: solid;
+	border-bottom-style: solid;
+	border-left-style: solid;
+	border-top-color: #FFFFFF;
+	border-right-color: #0D3F59;
+	border-bottom-color: #0D3F59;
+	border-left-color: #FFFFFF;
+}
+
+.button:link{
+		color: #000000;
+		text-decoration:none;
+		background-color:#B4C8FE;
+}
+
+.button:visited{
+		color: #000000;
+		text-decoration:none;
+		background-color:#B4C8FE;
+}
+
+
+
+.button:hover{
+		text-decoration:none;
+		background-color:#FFFFFF;	
+}
+
+.button:active{
+		text-decoration:none;
+		background-color:#CCCCCC;	
+		border-top-width: 1px;
+		border-right-width: 1px;
+		border-bottom-width: 1px;
+		border-left-width: 1px;
+		border-top-style: solid;
+		border-right-style: solid;
+		border-bottom-style: solid;
+		border-left-style: solid;
+		border-bottom-color: #FFFFFF;
+		border-left-color: #0D3F59;
+		border-top-color: #0D3F59;
+		border-right-color: #FFFFFF;
+}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/author_page/css/xp.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/css/Attic/xp.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/css/xp.css	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,3 @@
+/*
+Another theme CSS, would have diufferent colours and layout techniques
+*/
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_centre.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_centre.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_i_centre.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_i_centre.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_i_left.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_i_left.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_i_right.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_i_right.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_left.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_left.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_right.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_right.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_s_centre.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_s_centre.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_s_left.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_s_left.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/images/aqua_tab_s_right.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/images/Attic/aqua_tab_s_right.gif,v
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/author_page/js/fckcontroller.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/js/Attic/fckcontroller.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/js/fckcontroller.js	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,212 @@
+var activeEditorIndex = 0;
+var oFCKeditor;
+
+//whether to initialise the editor in textarea mode or preview mode
+function initEditor(index){
+    var textareaElement = document.getElementById("tx" + index + ".textarea")
+    if(textareaElement == null)
+        return;
+    var text = textareaElement.value;
+    
+    if(containsHTML(text)){
+        var previewTextElement = document.getElementById("preview" + index + ".text");
+        var previewText = document.getElementById("tx" + index + ".textarea").value;
+        previewTextElement.innerHTML = previewText;
+    
+        hideElementById("tx"+index);
+        showElementById("preview"+index);
+    }
+    else{
+        hideElementById("preview"+index);
+        showElementById("tx"+index);
+    }
+}
+
+// FCKeditor_OnComplete is a special function that is called when an editor
+// instance is loaded ad available to the API. It must be named exactly in
+// this way.
+function FCKeditor_OnComplete( editorInstance )
+{
+    //hideElementById("wyswygEditorScreen");
+}
+
+
+function SetContents(content)
+{
+	// Get the editor instance that we want to interact with.
+	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
+
+	// Set the editor contents (replace the actual one).
+	oEditor.SetHTML(content) ;
+}
+
+  
+function doWYSWYGEdit(index, size){
+
+    var oEditor;
+    try {
+        oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
+    }
+    catch(error) {
+        //browsers like opera can't resolve the FCKeditorAPI classes
+        alert("The browser you are using doesn't support Rich Text Editor, Please use a supported browser instead.");
+        return;
+    }
+
+    if(activeEditorIndex != index && activeEditorIndex != 0){
+        saveWYSWYGEdittedText(activeEditorIndex); //save the existing content
+        doPreview(activeEditorIndex); //update preview panel
+    }
+    
+    activeEditorIndex = index;
+    
+    //hide html editor
+    doPreview(index);
+    
+    var previewElement = document.getElementById("preview" + index + ".text");
+    var posX = findPosX(previewElement);
+    var posY = findPosY(previewElement);
+                   
+    var text = document.getElementById("tx" + index + ".textarea").value;
+    
+    oEditor.SetHTML(text) ;
+    
+    wyswygEditorScreenElement = document.getElementById("wyswygEditorScreen");
+    wyswygEditorScreenElement.style.top = posY + "px";
+    wyswygEditorScreenElement.style.left = posX + "px";
+    
+    //resize the fck editor
+    fckFrameElement = document.getElementById("FCKeditor1___Frame");
+    if (size == "small") {
+        fckFrameElement.style.height = "100px";
+        wyswygEditorScreenElement.style.height = "120px";
+    } else {
+        fckFrameElement.style.height = "200px";
+        wyswygEditorScreenElement.style.height = "220px";
+    }
+
+     showElementById("wyswygEditorScreen");
+
+    
+    showElementById("wyswygEditorScreen");
+}
+
+//convert the text to HTML first,
+function doTextToHTML(index){
+    var textareaElement = document.getElementById("tx" + index + ".textarea");
+    var text = covertTextToHTML(textareaElement.value);
+    textareaElement.value = text;
+}
+
+function saveWYSWYGEdittedText(index){
+    var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
+    var text = oEditor.GetXHTML( true )
+
+
+    var htmlEditorElement = document.getElementById("tx" + index + ".textarea");
+    htmlEditorElement.value = text;
+    
+}
+
+function doEdit(index){
+    hideElementById("wyswygEditorScreen");
+    hideElementById("preview"+index);
+    showElementById("tx"+index);
+}
+
+function doPreview(index){
+    var previewTextElement = document.getElementById("preview" + index + ".text");
+    var previewText = document.getElementById("tx" + index + ".textarea").value;
+    previewTextElement.innerHTML = previewText;
+
+    hideElementById("wyswygEditorScreen");
+    hideElementById("tx"+index);
+    showElementById("preview"+index);
+}
+
+
+/*** show/hide Elements ***/
+function showElement(element) {
+    element.style.visibility = 'visible';
+    element.style.display = "block";
+}
+function hideElement(element) {
+    element.style.visibility = 'hidden';
+    element.style.display = "none";
+}
+
+function showElementById(id) {
+    var element = document.getElementById(id);
+    showElement(element);
+}
+
+function hideElementById(id) {
+    var element = document.getElementById(id);
+    hideElement(element);
+}
+
+
+/*** findPosX and findPoxY functions are use to locate the x,y location of an element ***/
+function findPosX(obj)  {
+    var curleft = 0;
+    if(obj.offsetParent)
+        while(1) 
+        {
+          curleft += obj.offsetLeft;
+          if(!obj.offsetParent)
+            break;
+          obj = obj.offsetParent;
+        }
+    else if(obj.x)
+        curleft += obj.x;
+    return curleft;
+}
+
+function findPosY(obj)  {
+    var curtop = 0;
+    if(obj.offsetParent)
+        while(1)
+        {
+          curtop += obj.offsetTop;
+          if(!obj.offsetParent)
+            break;
+          obj = obj.offsetParent;
+        }
+    else if(obj.y)
+        curtop += obj.y;
+    return curtop;
+}
+
+/**** Using the regular expressions defined below to convert Text to HTML ****/
+var NEWLINE = "<BR>";
+var GREATER = "&gt;";
+var LESSER = "&lt;";
+//var SPACE = "&nbsp;";
+
+var RE_ESCAPE_NEWLINE = new RegExp("\n", "g");
+var RE_ESCAPE_GREATER = new RegExp(">", "g");
+var RE_ESCAPE_LESSER = new RegExp("<", "g");
+//var RE_ESCAPE_SPACE = new RegExp(" ", "g");
+
+var RE_HTML_TAG = new RegExp("<.*>|" + LESSER + "|" + GREATER);
+
+function covertTextToHTML(str){
+    return str.replace(RE_ESCAPE_GREATER, GREATER)
+              .replace(RE_ESCAPE_LESSER, LESSER)
+              .replace(RE_ESCAPE_NEWLINE, NEWLINE);
+              
+              //.replace(RE_ESCAPE_SPACE, SPACE)
+}
+
+/**** Detect whether HTML was used */
+function containsHTML(str){
+    return (str.match(RE_HTML_TAG) != null)? true:false;
+}
+
+
+
+/*** implement the event onSelectTab() which gets trigger when tabs is changed ***/
+function onSelectTab(tabID){
+    //hide all active editors
+    doPreview(activeEditorIndex);
+}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/author_page/js/tabcontroller.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/author_page/js/Attic/tabcontroller.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/author_page/js/tabcontroller.js	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,52 @@
+var tabSize = 0;
+var selectedTabID = 0;
+
+/* Initialise the number of tabs in the page */
+function initTabSize(size){
+    tabSize = size;
+}
+
+function selectTab(tabID) {
+        
+    if(selectedTabID == tabID)
+        return;
+
+    if(selectedTabID == 0)
+        selectedTabID = tabID;
+        
+    //change the old tab's class
+    document.getElementById("tab" + selectedTabID).className = "tab tabcentre";
+    //swap images of side parts
+	var tl = document.getElementById("tableft_"+selectedTabID);
+	tl.src= imgRoot + themeName + "_tab_left.gif";
+	tl.height = 22;
+	var tr = document.getElementById("tabright_"+selectedTabID);
+	tr.src= imgRoot + themeName + "_tab_right.gif";
+	tr.height = 22;
+    
+    //change the new tab's class
+    document.getElementById("tab" + tabID).className = "tab tabcentre_selected";
+    var tl = document.getElementById("tableft_"+tabID);
+	tl.src= imgRoot + themeName + "_tab_s_left.gif";
+	tl.height = 25;
+	var tr = document.getElementById("tabright_"+tabID);
+	tr.src= imgRoot + themeName + "_tab_s_right.gif";
+	tr.height = 25;
+    
+    //save tabID as selectedTabID
+    selectedTabID = tabID;
+    
+    //switch the the selected tab on
+    for(i = 1; i <= tabSize; i++) {
+      document.getElementById("tabbody" + i).style.display = (i == tabID) ? 'block':'none';
+    }
+    
+    
+    try{
+        //trigger the custom event listener onSelectTab()
+        onSelectTab(tabID);
+    }
+    catch (error){
+        //catch reference error when onSelectTab() is not defined
+    }
+}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/advance.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,17 @@
+
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<!---------------------------Advance Tab Content ------------------------>	
+	<table class="forms">
+		<!-- Instructions Row -->
+		<tr>
+			<td colspan="2 class="formcontrol">
+				<html:checkbox property="lockOnFinished" value="1">
+					<fmt:message key="label.authoring.advance.lock.on.finished" />
+				</html:checkbox>
+			</td>
+		</tr>
+		<tr><td colspan="2"><html:errors/></td></tr>
+	</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,130 @@
+<%@ include file="../sharing/share.jsp" %>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ page import="java.util.HashSet" %>
+<%@ page import="java.util.Set" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+    <% 
+    	
+		Set tabs = new HashSet();
+		tabs.add("label.authoring.heading.basic");
+		tabs.add("label.authoring.heading.advance");
+		tabs.add("label.authoring.heading.instructions");
+		pageContext.setAttribute("tabs", tabs);
+		
+	%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<title>Submit Files</title>
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+    <link href="<c:out value="${tool}"/>author_page/css/aqua.css" rel="stylesheet" type="text/css">
+    
+	<!-- this is the custom CSS for hte tool -->
+	<link href="${tool}author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
+
+
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${tool}author_page/js/fckcontroller.js"></script>
+    <link href="${tool}author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+    <script>
+    
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+        
+        function init(){
+        
+            initTabSize(3);
+            
+            var tag = document.getElementById("currentTab");
+	    	if(tag.value != "")
+	    		selectTab(tag.value);
+            else
+                selectTab(1); //select the default tab;
+            
+            initEditor("Title");
+            initEditor("Instructions");
+            initEditor("OnlineInstruction");
+            initEditor("OfflineInstruction");
+            
+        }     
+        
+        function doSelectTab(tabId) {
+        	// start optional tab controller stuff
+        	var tag = document.getElementById("currentTab");
+	    	tag.value = tabId;
+	    	// end optional tab controller stuff
+	    	selectTab(tabId);
+        } 
+        
+        function doSubmit(method) {
+        	document.SbmtAuthoringForm.dispatch.value=method;
+        	document.SbmtAuthoringForm.submit();
+        }
+        
+    </script>
+    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+    
+    
+	<script type="text/javascript" src="<c:out value="${tool}"/>author_page/js/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+</head>
+<body onLoad="init()">
+
+<html:form action="authoring" method="post"
+	focus="title"  enctype="multipart/form-data">
+		<html:hidden property="toolContentID"/>
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="dispatch"/>
+
+<h1><fmt:message key="label.authoring.heading" /></h1>
+
+<!-- start tabs -->
+<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
+<!-- end tab buttons -->
+<div class="tabbody">
+<table align=center> 	  
+				<tr>   
+				<td NOWRAP class=error>
+					<c:if test="${sbmtSuccess}"> 			
+						<img src="${tool}images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="submit.successful"/> </font> </img>
+					</c:if> 			
+				</td>
+				</tr> 
+</table>
+
+<!-- tab content 1 (Basic) -->
+<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp"/>
+<!-- end of content (Basic) -->
+      
+<!-- tab content 2 (Advanced) -->
+<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+<!-- end of content (Advanced) -->
+
+<!-- tab content 3 (Instructions) -->
+<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
+<!-- end of content (Instructions) -->
+
+
+<!-- Button Row -->
+		<p align="right">
+			<html:link href="javascript:doSubmit('updateContent');" property="submit" styleClass="button">
+				<fmt:message key="label.authoring.save.button" />
+			</html:link>
+			<html:link href="javascript:;" property="cancel"
+				onclick="window.close()" styleClass="button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:link>
+		</p>
+</div>
+<lams:HTMLEditor/>
+	
+
+</html:form>
+</body>
+</html:html>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/basic.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,20 @@
+
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+	<!---------------------------Basic Tab Content ------------------------>
+	<table class="forms">
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+			<td NOWRAP width="700"><lams:SetEditor id="Title" text="${authoring.title}" small="true"/></td>
+		</tr>
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
+			<td NOWRAP width="700">
+				<lams:SetEditor id="Instructions" text="${authoring.instruction}"/>
+			</td>
+		</tr>
+		<tr><td colspan="2"><html:errors/></td></tr>
+		</table>
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/Attic/instructions.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	22 Mar 2006 05:34:55 -0000	1.1
@@ -0,0 +1,106 @@
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+	<!---------------------------Instruction Tab Content ------------------------>
+	<table class="forms">
+		<!--hidden field contentID passed by flash-->
+		<tr>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formlabel"><fmt:message
+				key="label.authoring.online.instruction" />:</td>
+			<td NOWRAP width="700">
+				<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}"/>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td class="formcontrol">
+				<div id="onlinefile">
+				<c:forEach var="file" items="${authoring.onlineFiles}">
+					<li><c:out value="${file.name}"/>
+					<c:set var="viewURL">
+						<html:rewrite page="/download/?uuid=${file.uuID}&preferDownload=false"/>
+					</c:set>
+					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+						<fmt:message key="label.view"/>
+					</a>&nbsp;
+					<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true"/>
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+						<fmt:message key="label.download"/>
+					</a>&nbsp;
+					<c:set var="deleteonline">
+					<html:rewrite page="/deletefile.do?method=deleteOnlineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
+					</c:set>
+					<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
+						<fmt:message key="label.authoring.online.delete"/>
+					</html:link>					
+					</li>
+				</c:forEach>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.online.file" />:
+			</td>
+			<td class="formcontrol">
+				<html:file property="onlineFile">
+					<fmt:message key="label.authoring.choosefile.button" />
+				</html:file>
+				<html:link href="javascript:doSubmit('uploadOnline');" property="submit">
+					<fmt:message key="label.authoring.upload.online.button" />
+				</html:link>
+			</td>
+		</tr>	
+		<!------------Offline Instructions ----------------------->
+		<tr>
+			<td class="formlabel"><fmt:message
+				key="label.authoring.offline.instruction" />:</td>
+			<td NOWRAP width="700">
+			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}"/>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td class="formcontrol">
+				<div id="offlinefile">
+				<c:forEach var="file" items="${authoring.offlineFiles}">
+					<li><c:out value="${file.name}"/>
+					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
+						<fmt:message key="label.view"/>
+					</html:link>
+					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
+						<fmt:message key="label.download"/>
+					</html:link>
+					<c:set var="deleteoffline">
+					<html:rewrite page="/deletefile.do?method=deleteOfflineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
+					</c:set>
+					<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
+						<fmt:message key="label.authoring.offline.delete"/>
+					</html:link>					
+					</li>
+				</c:forEach>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.offline.file" />:
+			</td>
+			<td class="formcontrol">
+				<html:file property="offlineFile">
+					<fmt:message key="label.authoring.choosefile.button" />
+				</html:file>
+				<html:link href="javascript:doSubmit('uploadOffline');" property="submit">
+					<fmt:message key="label.authoring.upload.offline.button" />
+				</html:link>
+			</td>
+		</tr>			
+		<tr><td colspan="2"><html:errors/></td></tr>
+		</table>
\ No newline at end of file