Index: lams_tool_survey/build.xml
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/build.xml	(.../build.xml)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/build.xml	(.../build.xml)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -276,6 +276,15 @@
 		</war>
 	</target>
 
+	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+	   		<copy todir="${conf.webinf.dir}/tlds/lams" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
+			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+				<fileset dir="${tag.web.dir}/tags">
+					<include name="*.tag" />
+				</fileset>
+			</copy>
+	   </target>
+
 	<!-- =================================================================== -->
 	<!-- Deploy the jar and war                               				 -->
 	<!-- =================================================================== -->
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -90,4 +90,4 @@
 		<fmt:message key="${cancelButtonLabelKey}" />
 	</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -32,6 +32,21 @@
  %>
 <%@ tag body-content="empty" %>
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<fmt:formatDate value="${value}" type="both" dateStyle="long" timeStyle="full" />
+<%@ taglib uri="tags-core" prefix="c" %>
 
+<c:if test="${empty type}">
+	<c:set var="type" value="both" scope="request"/>
+</c:if>
+
+<c:choose>
+	<c:when test="${style=='short'}">
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
+	</c:when>
+	<c:otherwise>
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="full" />
+	</c:otherwise>
+</c:choose>
Index: lams_tool_survey/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -79,4 +79,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
+ * 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
+ * ****************************************************************
+ */
 
-			/**
-			 * Tab.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates a tab element.
-			 * Wiki: 
-			 */
+/**
+ * Tab.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates a tab element.
+ * Wiki: 
+ */
 
 			%>
 <%@ tag body-content="empty"%>
Index: lams_tool_survey/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
+ * 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
+ * ****************************************************************
+ */
 
-			/**
-			 * TabBody.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates the body container for a tab element
-			 * Wiki: 
-			 */
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
 
 		%>
 <%@ tag body-content="scriptless"%>
Index: lams_tool_survey/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
+ * 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
+ * ****************************************************************
+ */
 
-			/**
-			 * Tabs.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Create a tab list from a input collection or nested Tab tags.
-			 * Wiki: 
-			 */
+/**
+ * Tabs.tag
+ *	Author: Mitchell Seaton
+ *	Description: Create a tab list from a input collection or nested Tab tags.
+ * Wiki: 
+ */
 
 		%>
 <%@ tag body-content="scriptless"%>
Index: lams_tool_survey/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
+ * 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.
-			 */
+/**
+ * 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"%>
@@ -44,12 +44,11 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<lams:css />
+<lams:css style="tabbed"/>
+
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-<script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
-
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r49baeb6ea3cf1a5b493a798e22521dc9aec32974 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 49baeb6ea3cf1a5b493a798e22521dc9aec32974)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -179,7 +179,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>style</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
Index: lams_tool_survey/web/common/tabbedheader.jsp
===================================================================
diff -u
--- lams_tool_survey/web/common/tabbedheader.jsp	(revision 0)
+++ lams_tool_survey/web/common/tabbedheader.jsp	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -0,0 +1,27 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+
+	
+	<!-- HTTP 1.1 -->
+	<meta http-equiv="Cache-Control" content="no-store"/>
+	<!-- HTTP 1.0 -->
+	<meta http-equiv="Pragma" content="no-cache"/>
+	<!-- Prevents caching at the Proxy Server -->
+	<meta http-equiv="Expires" content="0"/>
+	
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
+
+ 	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/survey.css'/>" rel="stylesheet" type="text/css">
+	<lams:css style="tabbed"/>
+
+
+ 	<!-- ********************  javascript ********************** -->
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/surveycommon.js'/>"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+
+	
Index: lams_tool_survey/web/error.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/error.jsp	(.../error.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/error.jsp	(.../error.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -51,7 +51,7 @@
 <%
 }
 %>
-<body>
+<body class="stripes">
 <form action="${lams}errorpages/error.jsp" method="post" id="errorForm">
 	<input type="hidden" name="errorName" value="${errorName}"/>
 	<input type="hidden" name="errorMessage" value="${errorMessage}"/>
Index: lams_tool_survey/web/layout/default.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/layout/default.jsp	(.../default.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/layout/default.jsp	(.../default.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -5,7 +5,7 @@
         
 <html>
 	<tiles:insert attribute="header" />
-	<body>
+	<body class="stripes">
 		<tiles:useAttribute name="pageTitleKey" scope="request" />
 		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
 		<logic:notEmpty name="pTitleKey">
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -17,7 +17,7 @@
 <head>
 	<title><fmt:message key="label.author.title" /></title>
 
-	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/tabbedheader.jsp"%>
 	<%@ include file="/common/fckeditorheader.jsp"%>
 
 	<script>
@@ -59,7 +59,7 @@
 
  
 </head>
-<body onLoad="init()">
+<body class="stripes" onLoad="init()">
 <div id="page">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
Index: lams_tool_survey/web/pages/authoring/definelater.jsp
===================================================================
diff -u -r777fe5cc6b9431c87be6665efdd098d3bda5af88 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 777fe5cc6b9431c87be6665efdd098d3bda5af88)
+++ lams_tool_survey/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -14,7 +14,7 @@
 <head>
 	<title><fmt:message key="label.author.title" /></title>
 
-	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/tabbedheader.jsp"%>
 	<%@ include file="/common/fckeditorheader.jsp"%>
 
 	<script>
@@ -46,7 +46,7 @@
 
 
 </head>
-<body onLoad="init()">
+<body class="stripes" onLoad="init()">
 <div id="page">
 	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
@@ -85,4 +85,4 @@
 <div id="footer"></div>
 </div>
 </body>
-</html:html>
+</html:html>
\ No newline at end of file
Index: lams_tool_survey/web/pages/authoring/definelaterforbid.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/authoring/definelaterforbid.jsp	(.../definelaterforbid.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/authoring/definelaterforbid.jsp	(.../definelaterforbid.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -6,13 +6,15 @@
 
 	<%@ include file="/common/header.jsp"%>
 </head>
-<body>
+<body class="stripes">
+	<div id="content">
 	<div align="center">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
 		</h1>
 
 		<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
 	</div>
+	</div>
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/authoring/start.jsp
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,12 +1,12 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
-<body>
+<body class="stripes">
 <html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
 	<html:hidden property="sessionMapID"/>
 </html:form>
 
 <script type="text/javascript">
 document.getElementById("startForm").submit();
 </script>
-<body>
+<body class="stripes">
 </html>
Index: lams_tool_survey/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r103eacc68afe9e0df0c7bae49c482eb34873165a -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 103eacc68afe9e0df0c7bae49c482eb34873165a)
+++ lams_tool_survey/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -12,13 +12,11 @@
 	    <%@ include file="/common/header.jsp" %>
 </head>
 <body>
-	<div id="page-learner">
-		<h1 class="no-tabs-below">
+		<div id="content">
+		<h1>
 			${sessionMap.title}
 		</h1>
-		<div id="header-no-tabs-learner">
-		</div>
-		<div id="content-learner">
+
 			<c:forEach var="sessionEntry" items="${sessionMap.summaryList}" varStatus="sessionStatus">
 				<c:set var="toolSession" value="${sessionEntry.key}"/>
 				<c:set var="questionList" value="${sessionEntry.value}"/>
@@ -110,8 +108,7 @@
 					</c:forEach>
 				<%-- End session table --%>
 			</c:forEach>
-		<div id="footer-learner"></div>
+		<div id="footer"></div>
 		</div>
-	</div>
 </body>
 </html>
Index: lams_tool_survey/web/pages/learning/definelater.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -6,25 +6,20 @@
 	<meta http-equiv="refresh" content="60">
 </head>
 
-<body>
+<body class="stripes">
 
-	<div id="page-learner">
-		<h1 class="no-tabs-below">
+		<div id="content">
+		<h1>
 			${survey.title}
 		</h1>
-		<div id="header-no-tabs-learner">
-		</div>
-		<!--closes header-->
 
-		<div id="content-learner">
 			<lams:DefineLater/>
 		</div>
 		
-		<div id="footer-learner">
+		<div id="footer">
 		</div>
 		<!--closes footer-->
 
-	</div>
 
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/learning/finish.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,13 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%-- This page just for : redir finish page to parent rather that part of the frame --%>
 <html>
-	<body>
+	<body class="stripes">
 	<script type="text/javascript">
 	<!--
 		document.location.href = "${nextActivityUrl}";
 	-->        
     </script>
 	
 	
-	<body>
+	</body>
 </html>
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -rc856a18bf4731ff3a9ba197b01e278b65549acb0 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c856a18bf4731ff3a9ba197b01e278b65549acb0)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -26,7 +26,7 @@
 	-->        
     </script>
 </head>
-<body>
+<body class="stripes">
 	<html:form action="/learning/doSurvey" method="post" styleId="surveyForm">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<html:hidden property="questionSeqID"/>
@@ -38,15 +38,12 @@
 	<c:set var="position" value="${formBean.position}"/>
 	<c:set var="questionSeqID" value="${formBean.questionSeqID}"/>
 	<c:set var="currentIdx" value="${formBean.currentIdx}"/>
-	<div id="page-learner">
-		<h1 class="no-tabs-below">
-			${sessionMap.title}
-		</h1>
-		<div id="header-no-tabs-learner">
-		</div>
-		<!--closes header-->
 
-		<div id="content-learner">
+		<div id="content">
+			<h1>
+				${sessionMap.title}
+			</h1>
+
 			<h2>
 				${sessionMap.instructions}
 			</h2>
@@ -70,6 +67,8 @@
 				</table>
 				<%-- Display button according to different situation --%>
 				<%--POSITION: 0=middle of survey, 1=first question, 2=last question, 3=Only one question available--%>
+				<table>
+					<tr><td>
 					<c:choose>
 						<c:when test="${(sessionMap.showOnOnePage && (empty questionSeqID or questionSeqID == 0)) or position == 3}">
 							<div class="right-buttons">
@@ -104,14 +103,15 @@
 							</span>
 						</c:otherwise>
 					</c:choose>
-		
+				</td>
+				</tr>
+				</table>
 		</div>  <!--closes content-->
 		
-		<div id="footer-learner">
+		<div id="footer">
 		</div>
 		<!--closes footer-->
 
-	</div><!--closes page-->
 </html:form>	
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -7,19 +7,19 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 </head>
-<body>
-	<div id="page-learner">
+<body class="stripes">
+
 		<c:set var="sessionMapID" value="${param.sessionMapID}"/>
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 		
 		<html:form action="/learning/submitReflection" method="post">
 			<html:hidden property="userID" />
 			<html:hidden property="sessionMapID"/>
-			<h1 class="no-tabs-below">
+			
+			<div id="content">
+			<h1>
 				${sessionMap.title}
 			</h1>
-			<div id="header-no-tabs-learner"></div>
-			<div id="content-learner">
 				<table>
 					<tr>
 						<td>
@@ -34,7 +34,7 @@
 		
 					<tr>
 						<td>
-							<lams:STRUTS-textarea cols="66" rows="8" property="entryText"/>
+							<lams:STRUTS-textarea cols="60" rows="8" property="entryText"/>
 						</td>
 					</tr>
 		
@@ -49,10 +49,9 @@
 			</div>
 		</html:form>
 		
-		<div id="footer-learner">
+		<div id="footer">
 		</div>
 		<!--closes footer-->
 
-	</div><!--closes page-->
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -raf90466abe57cb9be572bfc519ac6902cb8166fa -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -30,16 +30,13 @@
     </script>
 
 </head>
-<body>
-	<div id="page-learner">
-		<h1 class="no-tabs-below">
+<body class="stripes">
+
+
+		<div id="content">
+		<h1>
 			${sessionMap.title}
 		</h1>
-		<div id="header-no-tabs-learner">
-		</div>
-		<!--closes header-->
-
-		<div id="content-learner">
 			<h2>
 				${sessionMap.instructions}
 			</h2>
@@ -92,6 +89,9 @@
 				</c:forEach>
 					
 			</table>
+			
+			<table>
+			<tr><td>
 			<c:if test="${not sessionMap.finishedLock}">
 				<span class="left-buttons">
 					<html:button property="RetakeButton"
@@ -119,16 +119,15 @@
 					</c:otherwise>
 				</c:choose>
 			</span>
-
+			</td></tr>
+			</table>
 		</div>
 		<!--closes content-->
 
-		<div id="footer-learner">
+		<div id="footer">
 		</div>
 		<!--closes footer-->
 
-	</div>
-	<!--closes page-->
 </body>
 </html:html>
 
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -21,13 +21,12 @@
     </script>
 </head>
 
-<body>
-<div id="page-learner">
-			<h1 class="no-tabs-below">
+<body class="stripes">
+			<div id="content">
+			<h1>
 				${sessionMap.title}
 			</h1>
-			<div id="header-no-tabs-learner"></div>
-			<div id="content-learner">
+			
 				<table>
 					<tr>
 						<td>
@@ -51,10 +50,9 @@
 					</c:otherwise>
 				</c:choose>		
 			</div>
-	<div id="footer-learner">
+	<div id="footer">
 		</div>
 		<!--closes footer-->
 
-	</div><!--closes page-->
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/learning/start.jsp
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/learning/start.jsp	(.../start.jsp)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/web/pages/learning/start.jsp	(.../start.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <html>
-	<body>
+	<body class="stripes">
 
 		<c:choose>
 			<c:when test="${sessionMap.showOnOnePage}">
@@ -15,5 +15,5 @@
 				</script>
 			</c:otherwise>
 		</c:choose>
-	<body>
+	<body class="stripes">
 </html>
Index: lams_tool_survey/web/pages/monitoring/chartreport.jsp
===================================================================
diff -u -rde91e6d736e56d514d840e128bd06c9238b5871b -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/monitoring/chartreport.jsp	(.../chartreport.jsp)	(revision de91e6d736e56d514d840e128bd06c9238b5871b)
+++ lams_tool_survey/web/pages/monitoring/chartreport.jsp	(.../chartreport.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -9,13 +9,11 @@
 	    <%@ include file="/common/header.jsp" %>
 </head>
 <body>
-	<div id="page-learner">
-		<h1 class="no-tabs-below">
-			<fmt:message key="title.chart.report"/>
-		</h1>
-		<div id="header-no-tabs-learner">
-		</div>
-		<div id="content-learner">
+		<div id="content">
+			<h1>
+				<fmt:message key="title.chart.report"/>
+			</h1>
+
 			<table class="alternative-color">
 				<tr>
 					<%-- <th class="first"><fmt:message key="label.question"/></th> --%>
@@ -49,8 +47,7 @@
 							title="<fmt:message key="message.view.pie.chart"/>">
 			</div>
 		</div>
-		<div id="footer-learner"></div>
+		<div id="learner"></div>
 		</div>
-	</div>
 </body>
 </html>
Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp
===================================================================
diff -u -rc856a18bf4731ff3a9ba197b01e278b65549acb0 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/monitoring/listanswers.jsp	(.../listanswers.jsp)	(revision c856a18bf4731ff3a9ba197b01e278b65549acb0)
+++ lams_tool_survey/web/pages/monitoring/listanswers.jsp	(.../listanswers.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -10,13 +10,11 @@
 	    <%@ include file="/common/header.jsp" %>
 </head>
 <body>
-	<div id="page-learner">
-		<h1 class="no-tabs-below">
+		<div id="content">
+		<h1>
 			<fmt:message key="title.chart.report"/>
 		</h1>
-		<div id="header-no-tabs-learner">
-		</div>
-		<div id="content-learner">
+
 			<c:forEach var="entry" items="${answerList}" varStatus="status">
 				<c:set var="user" value="${entry.key}"/>
 				<c:set var="question" value="${entry.value}"/>
@@ -108,7 +106,7 @@
 					</c:if>
 				</c:forEach>
 		</div>
-		<div id="footer-learner"></div>
+		<div id="learner"></div>
 		</div>
 	</div>
 </body>
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24)
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -6,7 +6,7 @@
 
 <html>
 	<head>
-		 <%@ include file="/common/header.jsp" %>
+		 <%@ include file="/common/tabbedheader.jsp" %>
 	 <script>
 	 
 	        function init(){
@@ -25,7 +25,7 @@
 			}
 	    </script>		 
 	</head>
-	<body onLoad="init()">
+	<body class="stripes" onLoad="init()">
 	<div id="page">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
Index: lams_tool_survey/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r6d73140515a0f88aec42968fa35246a45e7941dc -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_survey/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 6d73140515a0f88aec42968fa35246a45e7941dc)
+++ lams_tool_survey/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -7,13 +7,13 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 </head>
-<body>
-	<div id="page-learner">
-			<h1 class="no-tabs-below">
+<body class="stripes">
+
+			<div id="content">
+			<h1>
 				<fmt:message key="page.title.monitoring.view.reflection"/>
 			</h1>
-			<div id="header-no-tabs-learner"></div>
-			<div id="content-learner">
+			
 				<table>
 					<tr>
 						<td>
@@ -50,9 +50,8 @@
 					</tr>
 				</table>
 			</div>
-		<div id="footer-learner">
+		<div id="footer">
 		</div>
 		<!--closes footer-->
-	</div><!--closes page-->
 </body>
-</html:html>
+</html:html>
\ No newline at end of file
Index: lams_tool_vote/build.xml
===================================================================
diff -u -r378b75ad4d19133fbc8eb0ad95205b2162109d83 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/build.xml	(.../build.xml)	(revision 378b75ad4d19133fbc8eb0ad95205b2162109d83)
+++ lams_tool_vote/build.xml	(.../build.xml)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -292,6 +292,15 @@
 					todir="${jboss.deploy}"/> 
 		</target>
 	
+	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
+			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+				<fileset dir="${tag.web.dir}/tags">
+					<include name="*.tag" />
+				</fileset>
+			</copy>
+	   </target>
+
 		<!-- =================================================================== -->
 		<!-- Clean and rebuild the database. 									 -->
 		<!-- =================================================================== -->
@@ -467,4 +476,15 @@
 
 			</target>
 	
+	   <!-- ================================= 
+	          target: synchronize-jsp              
+	         ================================= -->
+	    <target name="synchronize-deploy" description="copy non-java file into deploy folder">
+	        <copy verbose="yes" todir="${jboss.deploy}/${product}.war">
+	        	<fileset dir="${conf.web.dir}">
+	        		<include name="**/*.*"/>
+	        	</fileset>
+	        </copy>
+	    </target>
+
 </project>
\ No newline at end of file
Index: lams_tool_vote/web/Template.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/Template.jsp	(.../Template.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/Template.jsp	(.../Template.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -35,7 +35,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale = "true">
     
-    <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+    <body class="stripes" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
       <table width="900" border="0" cellspacing="0" cellpadding="0" align="center"> 
 	        <!-- header -->
 	        <c:set var="pageheader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
Index: lams_tool_vote/web/WEB-INF/lams.tld
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -13,6 +13,26 @@
 
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
@@ -64,6 +84,34 @@
    </tag>
    <tag>
 
+      <description>Help tag</description>
+      <display-name>Help tag</display-name>
+      <icon>    
+      </icon>
+      <name>help</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Help tag</description>
+         <name>module</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>toolSignature</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -131,7 +179,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>style</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -15,7 +15,7 @@
  * 
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  * USA
  * 
  * http://www.gnu.org/licenses/gpl.txt
Index: lams_tool_vote/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -15,7 +15,7 @@
  * 
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  * USA
  * 
  * http://www.gnu.org/licenses/gpl.txt
Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -15,7 +15,7 @@
  * 
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  * USA
  * 
  * http://www.gnu.org/licenses/gpl.txt
Index: lams_tool_vote/web/WEB-INF/tags/ExportPortOutput.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/ExportPortOutput.tag	(.../ExportPortOutput.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/ExportPortOutput.tag	(.../ExportPortOutput.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -15,7 +15,7 @@
  * 
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  * USA
  * 
  * http://www.gnu.org/licenses/gpl.txt
Index: lams_tool_vote/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -15,7 +15,7 @@
  * 
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  * USA
  * 
  * http://www.gnu.org/licenses/gpl.txt
Index: lams_tool_vote/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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
+ * ****************************************************************
+ */
 
-			/**
-			 * Tab.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates a tab element.
-			 * Wiki: 
-			 */
+/**
+ * Tab.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates a tab element.
+ * Wiki: 
+ */
 
 			%>
 <%@ tag body-content="empty"%>
Index: lams_tool_vote/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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
+ * ****************************************************************
+ */
 
-			/**
-			 * TabBody.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates the body container for a tab element
-			 * Wiki: 
-			 */
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
 
 		%>
 <%@ tag body-content="scriptless"%>
Index: lams_tool_vote/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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
+ * ****************************************************************
+ */
 
-			/**
-			 * Tabs.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Create a tab list from a input collection or nested Tab tags.
-			 * Wiki: 
-			 */
+/**
+ * Tabs.tag
+ *	Author: Mitchell Seaton
+ *	Description: Create a tab list from a input collection or nested Tab tags.
+ * Wiki: 
+ */
 
 		%>
 <%@ tag body-content="scriptless"%>
Index: lams_tool_vote/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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.
-			 */
+/**
+ * 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"%>
@@ -44,7 +44,8 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<lams:css />
+<lams:css style="tabbed"/>
+
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -44,7 +44,7 @@
 	<head>
 	<title> <bean:message key="activity.title"/>  </title>
 
-	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/tabbedheader.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 
@@ -125,7 +125,7 @@
 	</script>
 	
 </head>
-<body onLoad="init();">
+<body class="stripes" onLoad="init();">
 
 <div id="page">
 	<h1> <bean:message key="label.authoring.vote"/> </h1>
Index: lams_tool_vote/web/authoring/editNominationBox.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -27,7 +27,7 @@
 		<%@ include file="/common/header.jsp"%>
 	</head>
 	
-	<body>
+	<body class="stripes">
 		<table cellpadding="0">
 			<html:form  action="/authoring?validate=false" styleId="newNominationForm" enctype="multipart/form-data" method="POST">					   	
 			
Index: lams_tool_vote/web/authoring/newNominationBox.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -27,7 +27,7 @@
 		<%@ include file="/common/header.jsp"%>
 	</head>
 	
-	<body>
+	<body class="stripes">
 		<table cellpadding="0">
 	
 			<html:form  action="/authoring?validate=false" styleId="newNominationForm" enctype="multipart/form-data" method="POST">				
Index: lams_tool_vote/web/common/tabbedheader.jsp
===================================================================
diff -u
--- lams_tool_vote/web/common/tabbedheader.jsp	(revision 0)
+++ lams_tool_vote/web/common/tabbedheader.jsp	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -0,0 +1,36 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+
+
+<!-- HTTP 1.1 -->
+<meta http-equiv="Cache-Control" content="no-store" />
+<!-- HTTP 1.0 -->
+<meta http-equiv="Pragma" content="no-cache" />
+<!-- Prevents caching at the Proxy Server -->
+<meta http-equiv="Expires" content="0" />
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!-- ********************  CSS ********************** -->
+<c:choose>
+	<c:when test="${not empty localLinkPath}">
+		<lams:css localLinkPath="${localLinkPath}" style="tabbed"/>
+	</c:when>
+	<c:otherwise>
+		<lams:css  style="tabbed"/>
+	</c:otherwise>
+</c:choose>
+
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+
+<%@ include file="/common/fckeditorheader.jsp"%>
+
Index: lams_tool_vote/web/error.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/error.jsp	(.../error.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/error.jsp	(.../error.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -72,7 +72,7 @@
 <%
 }
 %>
-<body>
+<body class="stripes">
 <form action="${lams}errorpages/error.jsp" method="post" id="errorForm">
 	<input type="hidden" name="errorName" value="${errorName}"/>
 	<input type="hidden" name="errorMessage" value="${errorMessage}"/>
Index: lams_tool_vote/web/export/exportportfolio.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -29,26 +29,21 @@
 	<title> <bean:message key="label.export"/> </title>
 		<lams:css localLinkPath="../"/>
 	</head>
-	<body>
+	<body class="stripes">
 	
     <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 	<html:hidden property="method"/>
 	<html:hidden property="toolContentID"/>
 
-	<div id="page-learner"><!--main box 'page'-->
-
-		<h1 class="no-tabs-below">
+		<div id="content">
+	
+		<h1>
 		<c:if test="${(exportPortfolioDto.userExceptionNoToolSessions != 'true') }"> 	
 			<c:if test="${(exportPortfolioDto.portfolioExportMode == 'learner')}"><bean:message key="label.export.learner"/></c:if>			
 			<c:if test="${(exportPortfolioDto.portfolioExportMode != 'learner')}"><bean:message key="label.export.teacher"/> </h1></c:if>			
 		</c:if>
         </h1>
-		<div id="header-no-tabs-learner">
 	
-		</div><!--closes header-->
-	
-		<div id="content-learner">
-	
 		<c:if test="${(exportPortfolioDto.userExceptionNoToolSessions == 'true')}"> 	
 				<table align="center">
 					<tr> 
@@ -67,11 +62,9 @@
 		</div>  <!--closes content-->
 	
 	
-		<div id="footer-learner">
+		<div id="footer">
 		</div><!--closes footer-->
 	
-	</div><!--closes page-->
-
 		</html:form>
 </body>
 </html:html>
Index: lams_tool_vote/web/includes/layout.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/includes/layout.jsp	(.../layout.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/includes/layout.jsp	(.../layout.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -9,7 +9,7 @@
 		<title><bean:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
 	</head>
-	<body>
+	<body class="stripes">
 		<div id="page">
 			<tiles:useAttribute name="pageTitleKey" scope="request" />
 			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
Index: lams_tool_vote/web/includes/learnerLayout.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -25,9 +25,10 @@
 		</script>		
 		
 	</head>
-	<body>
-		<div id="page-learner">
+	<body class="stripes">
+		<div id="content">
 			<tiles:insert attribute="body" />
 		</div>
-	</body>
+		<div id="footer"></div>
+</body>
 </html>
Index: lams_tool_vote/web/includes/tablayout.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -7,12 +7,12 @@
 <html>
 	<head>
 		<title><bean:message key="activity.title" /></title>
-		<%@ include file="/common/header.jsp"%>
+		<%@ include file="/common/tabbedheader.jsp"%>
 
 		<tiles:insert attribute="header" />
 	</head>
 
-	<body onLoad="init()">
+	<body class="stripes" onLoad="init()">
 		<div id="page">
 	
 				<tiles:useAttribute name="pageTitleKey" scope="request" />
Index: lams_tool_vote/web/layout/default.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/layout/default.jsp	(.../default.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/layout/default.jsp	(.../default.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -5,7 +5,7 @@
         
 <html>
 	<tiles:insert attribute="header" />
-	<body>
+	<body class="stripes">
 		<tiles:useAttribute name="pageTitleKey" scope="request" />
 		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
 		<logic:notEmpty name="pTitleKey">
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 	
 	<script language="JavaScript" type="text/JavaScript">
@@ -46,17 +47,14 @@
 	</script>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 
-<h1 class="no-tabs-below">
+<div id="content">
+
+<h1>
 	<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 </h1>
 
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
-
 <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolSessionID"/>
@@ -259,9 +257,8 @@
 
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -95,16 +96,15 @@
 	</script>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 
-<h1 class="no-tabs-below">
-	<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
-</h1>
 
-<div id="header-no-tabs-learner"></div>
 
-<div id="content-learner">
+<div id="content">
+
+<h1>
+	<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+</h1>
 	<html:form  onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolSessionID"/>
@@ -183,9 +183,8 @@
 	</html:form>
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 	
 	<script language="JavaScript" type="text/JavaScript">
@@ -46,16 +47,15 @@
 	</script>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 
-<h1 class="no-tabs-below">
+
+
+<div id="content">
+<h1>
 	<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 </h1>
 
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolSessionID"/>
@@ -112,9 +112,7 @@
 
 </div>
 
-<div id="footer-learner"></div>
-
-</div>
+<div id="footer"></div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 	
 	<script language="JavaScript" type="text/JavaScript">
@@ -46,17 +47,15 @@
 	</script>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 
-<h1 class="no-tabs-below">
+
+<div id="content">
+
+<h1>
 	<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 </h1>
 
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
-
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolSessionID"/>
@@ -121,9 +120,8 @@
 
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/LearnerRep.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -53,19 +54,15 @@
 	</script>		
 </head>
 
-<body>
-	<div id="page-learner">
-	
-	<h1 class="no-tabs-below">
+<body class="stripes">
+
+	<div id="content">
+
+	<h1>
 		<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 	</h1>
 
-	<div id="header-no-tabs-learner"></div>
-	
 
-	<div id="content-learner">
-
-
 		<table>
 				<tr>
 			 		<th NOWRAP>  <bean:message key="label.learner.progress"/>   </th>
@@ -172,10 +169,8 @@
 
 	</div>
 	
+	<div id="footer"></div>
 
-<div id="footer-learner"></div>	
-
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -47,23 +48,22 @@
 	
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">
-		<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
-	</h1>
 	
-	
-	<div id="header-no-tabs-learner"></div>
 
 	<html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
+
 		<html:hidden property="dispatch"/>
 		<html:hidden property="toolSessionID"/>
 		<html:hidden property="userID"/>	
 	
-		<div id="content-learner">
+		<div id="content">
 		
+	<h1>
+		<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
+	</h1>
+	
 		<table>
 			<tr>
 				<td>
@@ -73,7 +73,7 @@
 
 			<tr>
 				<td>
-					<html:textarea cols="66" rows="8" property="entryText"></html:textarea>
+					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
 				</td>
 			</tr>
 
@@ -90,10 +90,6 @@
 		</div>
 	</html:form>	
 	
-	<div id="footer-learner"></div>
-
-
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,8 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -47,19 +48,14 @@
 	
 </head>
 
-<body>
-	<div id="page-learner">
-	
-	<h1 class="no-tabs-below">&nbsp;</h1>
-	
-	<div id="header-no-tabs-learner"></div>
-	
+<body class="stripes">
+
 	<html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">	
 		<html:hidden property="dispatch"/>
 		<html:hidden property="toolSessionID"/>
 		<html:hidden property="userID"/>	
 	
-		<div id="content-learner">
+		<div id="content">
 			&nbsp&nbsp&nbsp&nbsp&nbsp <bean:message key="label.learning.forceOfflineMessage" />
 			
 			<table>	
@@ -86,10 +82,6 @@
 		</div>
 	</html:form>	
 	
-	<div id="footer-learner"></div>
-
-
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,25 +34,19 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">&nbsp;</h1>
-	
-	<div id="header-no-tabs-learner"></div>
-	
-	<div id="content-learner">
+	<div id="content">
 		<lams:DefineLater defineLaterMessageKey="error.defineLater"/>
 	</div>
 	
-	<div id="footer-learner"></div>
+	<div id="footer"></div>
 
-
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -39,19 +39,18 @@
 	
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">
+	<h1>
 		<bean:message key="label.view.reflection"/>
 	</h1>
 	
 	
-	<div id="header-no-tabs-learner"></div>
 	
+	
 	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 	
-		<div id="content-learner">
+		<div id="content">
 		
 			<table>
 				<tr>
@@ -81,10 +80,9 @@
 		</div>
 	</html:form>	
 	
-	<div id="footer-learner"></div>
+	<div id="footer"></div>
 
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/monitoring/LearnerRep.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -50,7 +50,7 @@
 		//-->
 	</script>	
 </head>
-<body>
+<body class="stripes">
 
 		<table>
 				<tr>
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -42,7 +42,7 @@
 
 	<title> <bean:message key="label.monitoring"/> </title>
 
-	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/tabbedheader.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 
@@ -143,7 +143,7 @@
 	</script>
 	
 </head>
-<body onLoad="init();">
+<body class="stripes" onLoad="init();">
 
 
 	<div id="page">
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -34,7 +34,7 @@
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 	
 </head>
-<body>
+<body class="stripes">
 <div id="page">
 
     <table>
Index: lams_tool_vote/web/monitoring/editNominationBox.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/monitoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/monitoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -40,7 +40,7 @@
 		</script>		
 	</head>
 	
-	<body>
+	<body class="stripes">
 		<table cellpadding="0">
 
 			<html:form  action="/monitoring?validate=false" styleId="newNominationForm" enctype="multipart/form-data" method="POST">			
Index: lams_tool_vote/web/monitoring/newNominationBox.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r825e32a1131e134c0e2d560418cc349973b3702f
--- lams_tool_vote/web/monitoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/monitoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
@@ -40,7 +40,7 @@
 		</script>		
 	</head>
 	
-	<body>
+	<body class="stripes">
 		<table cellpadding="0">