Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rf90c5a15f6b670a53486046e56d07380c1ec2016 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/HtmlTag.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/HtmlTag.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/HtmlTag.java	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -0,0 +1,172 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.web.tag;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.Globals;
+import org.lamsfoundation.lams.web.filter.LocaleFilter;
+
+/** 
+ * Replaces the tradition HTML tag with one that sets the appropriate page direction,
+ * based on the page_direction session attribute. It also sets the lang attribute.
+ * 
+ * There is a single parameter xhtml, which is used to append the http://www.w3.org/1999/xhtml
+ * string and to set the flag to make Struts tags xhtml compliant.
+ * 
+ * It has been done as a class rather than a .tag file as so that the body of the
+ * page can contain scriptlets. The code is based on the Struts HTML tag.
+ * 
+ * @jsp.tag name="html"
+ * 		body-content="JSP"
+ * 		display-name="Render html tag with direction and language"
+ * 		description="Render html tag with direction and language"
+ */
+public class HtmlTag extends TagSupport {
+
+	private static final Logger log = Logger.getLogger(HtmlTag.class);
+
+	protected boolean xhtml = false;
+	
+	/**
+	 * @jsp.attribute required="false" rtexprvalue="true" 
+	 * description="Is this an xhtml file?"
+	 */
+	public boolean getXhtml() {
+	    return this.xhtml;
+	}
+	
+	public void setXhtml(boolean xhtml) {
+	    this.xhtml = xhtml;
+	}
+	
+	/**
+	 * Render the HTML tag
+	 *
+	 * @exception JspException if a JSP exception has occurred
+	 */
+	public int doStartTag() throws JspException {
+	
+	    StringBuffer sb = new StringBuffer("<html");
+	
+	    String language = null;
+	    String country = null;
+	
+	    HttpSession session = ((HttpServletRequest) this.pageContext.getRequest()).getSession();
+	
+	    Locale locale = (Locale) session.getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY);
+	    if ( locale != null ) {
+	    	language = locale.getLanguage();
+	    	country = locale.getCountry();
+	    }
+	    String direction = (String) session.getAttribute(LocaleFilter.DIRECTION);
+	
+	    if (this.xhtml) {
+	    	// for struts compatibility
+            this.pageContext.setAttribute(
+                Globals.XHTML_KEY,
+                "true",
+                PageContext.PAGE_SCOPE);
+	                
+	        sb.append(" xmlns=\"http://www.w3.org/1999/xhtml\"");
+	    }
+	
+	    if (language!=null) {
+	        sb.append(" lang=\"");
+	        sb.append(language);
+	        if (country!=null) {
+	            sb.append("-");
+	            sb.append(country);
+	        }
+	        sb.append("\"");
+	    }
+	
+	    if (this.xhtml && language!=null) {
+	        sb.append(" xml:lang=\"");
+	        sb.append(language);
+	        if (country!=null) {
+	            sb.append("-");
+	            sb.append(country);
+	        }
+	        sb.append("\"");
+	    }
+	
+	    if ( direction!=null ) {
+	    	sb.append(" dir=\"");
+	    	sb.append(direction);
+	    	sb.append("\"");
+	    }
+	    
+	    sb.append(">");
+	
+	    writeString(sb.toString());
+	        
+	    return EVAL_BODY_INCLUDE;
+	
+	}
+
+	private void writeString(String output) {
+		try {
+	    	JspWriter writer = pageContext.getOut();
+	    	writer.println(output);
+		} catch ( IOException e ) {
+			log.error("HTML tag unable to write out HTML details due to IOException.", e);
+			// don't throw a JSPException as we want the system to still function, well, best 
+			// the page can without the html tag!
+		}
+	}
+	
+	
+	/**
+	 * Process the end of this tag.
+	 *
+	 * @exception JspException if a JSP exception has occurred
+	 */
+	public int doEndTag() throws JspException {
+	
+	    writeString("</html>");
+
+	    // Evaluate the remainder of this page
+	    return (EVAL_PAGE);
+	
+	}
+	
+	/**
+	 * Release any acquired resources.
+	 */
+	public void release() {
+	    this.xhtml = false;
+	}
+	
+}
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r79c7faa88fbefa4426891dfad800110356887d3b -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 79c7faa88fbefa4426891dfad800110356887d3b)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -306,8 +326,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -rc3f536335bb5f49bfdbf9ce6ba18843ace92ad82 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision c3f536335bb5f49bfdbf9ce6ba18843ace92ad82)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -3,7 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 
-<HTML>
+<lams:html>
 <HEAD>
 	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=monitoring/addLesson.jsp?courseID=<c:out value="${courseID}"/>&classID=<c:out value="${classID}"/>"/>
 	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -20,4 +20,4 @@
 	</div>
 </BODY>
 	
-</HTML>
+</lams:html>
Index: lams_central/web/admin.jsp
===================================================================
diff -u -re86dbe041f3f00144c4bde4943e17145eca786e2 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/admin.jsp	(.../admin.jsp)	(revision e86dbe041f3f00144c4bde4943e17145eca786e2)
+++ lams_central/web/admin.jsp	(.../admin.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<HTML>
+<lams:html>
 <HEAD>
 	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=admin/adminstart.do">
 	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -26,5 +26,5 @@
 	</div><!--closes page-->
 </BODY>
 	
-</HTML>
+</lams:html>
 
Index: lams_central/web/author.jsp
===================================================================
diff -u -r756febcdf4a18e4608d64a39e778bb01b41067fe -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/author.jsp	(.../author.jsp)	(revision 756febcdf4a18e4608d64a39e778bb01b41067fe)
+++ lams_central/web/author.jsp	(.../author.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -4,7 +4,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %>
-<HTML>
+<lams:html>
 <HEAD>
 <META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <%
@@ -269,4 +269,4 @@
 		</object>
 	</noscript>
 </BODY>
-</HTML>
+</lams:html>
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -r7a1f51f64555f4cd94274847196373c7f9f549f0 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-html" prefix="html"%>
-<html>
+<lams:html>
 	<head>
 		<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<lams:css />
@@ -37,4 +37,4 @@
 			</tr>
 		</table>
 	</body>
-</html>
+</lams:html>
Index: lams_central/web/copyright.jsp
===================================================================
diff -u -r87c27a6762468b64caae883a0112a9d430c28e8a -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/copyright.jsp	(.../copyright.jsp)	(revision 87c27a6762468b64caae883a0112a9d430c28e8a)
+++ lams_central/web/copyright.jsp	(.../copyright.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -5,7 +5,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<lams:html>
 <head>
 	<title><fmt:message key="title.lams"/></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -30,5 +30,5 @@
 	</div>
 
 </body>	
-</html>
+</lams:html>
 
Index: lams_central/web/error.jsp
===================================================================
diff -u -r88acb04987abd12bc87754fbbe1f835dcd99a5cc -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/error.jsp	(.../error.jsp)	(revision 88acb04987abd12bc87754fbbe1f835dcd99a5cc)
+++ lams_central/web/error.jsp	(.../error.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
 	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<lams:html>
 <%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -66,4 +66,4 @@
 
 </script>
 </body>
-</html>
+</lams:html>
Index: lams_central/web/index.jsp
===================================================================
diff -u -r07f85020c06712619454b34400eda26dbef2ed47 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/index.jsp	(.../index.jsp)	(revision 07f85020c06712619454b34400eda26dbef2ed47)
+++ lams_central/web/index.jsp	(.../index.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -10,7 +10,7 @@
 <%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser()); %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<lams:html>
 <head>
 	<title>LAMS::<fmt:message key="index.welcome"/></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -100,5 +100,5 @@
 		</div>
 	</div>
 </body>	
-</html>
+</lams:html>
 
Index: lams_central/web/learner.jsp
===================================================================
diff -u -re86dbe041f3f00144c4bde4943e17145eca786e2 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision e86dbe041f3f00144c4bde4943e17145eca786e2)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -3,7 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 
-<HTML>
+<lams:html>
 <HEAD>
 	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/main.jsp?lessonID=<c:out value="${lessonID}"/>">
 	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -27,4 +27,4 @@
 	</div><!--closes page-->
 </BODY>
 	
-</HTML>
+</lams:html>
Index: lams_central/web/login.jsp
===================================================================
diff -u -r1071bd6f75e81b29a8c36a0b24529527b7603c13 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 1071bd6f75e81b29a8c36a0b24529527b7603c13)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -18,7 +18,7 @@
 	}*/
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<lams:html>
 <!--
 flash is searching for this string, so leave it!:
 j_security_login_page
@@ -101,4 +101,4 @@
 </body>
 
 
-</html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file
Index: lams_central/web/monitorLesson.jsp
===================================================================
diff -u -re86dbe041f3f00144c4bde4943e17145eca786e2 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision e86dbe041f3f00144c4bde4943e17145eca786e2)
+++ lams_central/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -3,7 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 
-<HTML>
+<lams:html>
 <HEAD>
 	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=monitoring/monitorLesson.jsp?lessonID=<c:out value="${lessonID}"/>"/>
 	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -28,4 +28,4 @@
 
 </BODY>
 	
-</HTML>
+</lams:html>
Index: lams_central/web/sysadmin.jsp
===================================================================
diff -u -re86dbe041f3f00144c4bde4943e17145eca786e2 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision e86dbe041f3f00144c4bde4943e17145eca786e2)
+++ lams_central/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<HTML>
+<lams:html>
 <HEAD>
 	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=admin/sysadminstart.do">
 	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -26,4 +26,4 @@
 	</div><!--closes page-->
 </BODY>
 	
-</HTML>
+</lams:html>
Index: lams_central/web/template.jsp
===================================================================
diff -u -r5427ea72e503f626cddd72e5208708184706627c -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_central/web/template.jsp	(.../template.jsp)	(revision 5427ea72e503f626cddd72e5208708184706627c)
+++ lams_central/web/template.jsp	(.../template.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -6,7 +6,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html:html locale = "true">
+<lams:html>
 <head>
 	<html:base/>
 	<title><fmt:message><tiles:getAsString name="titleKey"/></fmt:message></title>
@@ -29,4 +29,4 @@
 	</div>
 </div>
 </body>
-</html:html>
+</lams:html>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml
===================================================================
diff -u -rcadb456a32c5e95823f3472fd99a0b17c52b9218 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -59,6 +59,16 @@
             unique="false"
         />
 
+        <property
+            name="direction"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="direction"
+            length="3"
+            not-null="false"
+            unique="false"
+        />
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SupportedLocale.xml
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
diff -u -r5732eae12edb6d5513ae073b1a0f1563deb175ab -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision 5732eae12edb6d5513ae073b1a0f1563deb175ab)
+++ lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -163,43 +163,43 @@
 
 -- Supported Locales
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (1, 'en', 'AU', 'English (Australia)', 'RTL');
+VALUES (1, 'en', 'AU', 'English (Australia)', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (2, 'es', 'ES', 'Español', 'RTL');
+VALUES (2, 'es', 'ES', 'Español', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (3, 'mi', 'NZ', 'Māori', 'RTL');
+VALUES (3, 'mi', 'NZ', 'M�?ori', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (4, 'de', 'DE', 'Deutsch', 'RTL');
+VALUES (4, 'de', 'DE', 'Deutsch', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (5, 'zh', 'CN', '简体中文', 'RTL');
+VALUES (5, 'zh', 'CN', '简体中文', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (6, 'fr', 'FR', 'Français', 'RTL');
+VALUES (6, 'fr', 'FR', 'Français', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (7, 'it', 'IT', 'Italiano', 'RTL');
+VALUES (7, 'it', 'IT', 'Italiano', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (8, 'no', 'NO', 'Norsk', 'RTL');
+VALUES (8, 'no', 'NO', 'Norsk', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (9, 'sv', 'SE', 'Svenska', 'RTL');
+VALUES (9, 'sv', 'SE', 'Svenska', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (10, 'ko', 'KR', '한국어', 'RTL');
+VALUES (10, 'ko', 'KR', '한국어', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (11, 'pl', 'PL', 'Polski', 'RTL');
+VALUES (11, 'pl', 'PL', 'Polski', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (12, 'pt', 'BR', 'Português (Brasil)', 'RTL');
+VALUES (12, 'pt', 'BR', 'Português (Brasil)', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (13, 'hu', 'HU', 'Magyar', 'RTL');
+VALUES (13, 'hu', 'HU', 'Magyar', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (14, 'bg', 'BG', 'Български', 'RTL');
+VALUES (14, 'bg', 'BG', 'Българ�?ки', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (15, 'cy', 'GB', 'Cymraeg (Cymru)', 'RTL');
+VALUES (15, 'cy', 'GB', 'Cymraeg (Cymru)', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (16, 'th', 'TH', 'Thai', 'RTL');
+VALUES (16, 'th', 'TH', 'Thai', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (17, 'el', 'GR', 'Ελληνικά', 'RTL');
+VALUES (17, 'el', 'GR', 'Ελληνικά', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (18, 'nl', 'BE', 'Nederlands (België)', 'RTL');
+VALUES (18, 'nl', 'BE', 'Nederlands (België)', 'LTR');
 INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) 
-VALUES (19, 'ar', 'JO', 'عربي', 'LTR');
+VALUES (19, 'ar', 'JO', 'عربي', 'RTL');
 
 -- which current tool supports the old 1.0.x tools?
 INSERT INTO lams_tool_import_support VALUES (1, 'lafrum11', 'messageboard');
@@ -216,4 +216,3 @@
 -- external server mapping to a lams organisation
 INSERT INTO lams_ext_server_org_map VALUES
   (1,'moodle','moodle','moodle','moodle','mdl','http://localhost/moodle/mod/lamstwo/userinfo.php?ts=%timestamp%&un=%username%&hs=%hash%','http://dummy','\0',7);
-
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java
===================================================================
diff -u -r869b783a19d3623a108ff7e6b7d4ec6d7340124b -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	(.../SupportedLocale.java)	(revision 869b783a19d3623a108ff7e6b7d4ec6d7340124b)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	(.../SupportedLocale.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -29,11 +29,15 @@
     /** persistent field */
     private String description;
 
+    /** persistent field */
+    private String direction;
+
     /** full constructor */
-    public SupportedLocale(String languageIsoCode, String countryIsoCode, String description) {
+    public SupportedLocale(String languageIsoCode, String countryIsoCode, String description, String direction) {
         this.languageIsoCode = languageIsoCode;
         this.countryIsoCode = countryIsoCode;
         this.description = description;
+        this.direction = direction;
     }
 
     /** default constructor */
@@ -103,12 +107,30 @@
 		this.description = description;
 	}
  
+	/** 
+     *            @hibernate.property
+     *             column="direction"
+     *             unique="false"
+     *             length="3"
+     *             not-null="true"
+     *         
+     */
+	public String getDirection() {
+		return direction;
+	}
+
+	public void setDirection(String direction) {
+		this.direction = direction;
+	}
+
+
 	public String toString() {
 		return new ToStringBuilder(this)
 	            .append("localeId", getLocaleId())
 	            .append("languageIsoCode", getLanguageIsoCode())
 	            .append("countryIsoCode", getCountryIsoCode())
 	            .append("description", getDescription())
+	            .append("direction", getDirection())
 	            .toString();
 	}
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r6b897d09ff384d8842aee28ded8ebe6a1f5857d8 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 6b897d09ff384d8842aee28ded8ebe6a1f5857d8)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -27,7 +27,9 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Set;
+import java.util.TimeZone;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -37,6 +39,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.LanguageUtil;
 
 /** 
  *        @hibernate.class
@@ -712,29 +715,30 @@
     }
     public UserDTO getUserDTO(){
     	String languageIsoCode = null;
+    	String countryIsoCode = null;
+    	String direction = null;
     	if (locale != null) {
     		languageIsoCode = locale.getLanguageIsoCode();
+    		countryIsoCode = locale.getCountryIsoCode();
+    		direction = locale.getDirection();
     	} else {
-    		// get the server language
-    		String serverLang = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); 
-    		
-    		if ( serverLang != null) {
-    			languageIsoCode = serverLang;
-    		} else {
-    			// fallback to english
-    			languageIsoCode = "en";
-    		}
+    		String defaults[] = LanguageUtil.getDefaultLangCountry();
+    		languageIsoCode = defaults[0];
+    		countryIsoCode=defaults[1];
+    		direction=LanguageUtil.getDefaultDirection();
     	}
     	
     	return new UserDTO(this.userId,
     						this.firstName,
 							this.lastName,
 							this.login,
 							languageIsoCode,
-							locale != null? locale.getCountryIsoCode() : null,
+							countryIsoCode,
+							direction,
 							this.email,
 							new CSSThemeBriefDTO(this.flashTheme),
-							new CSSThemeBriefDTO(this.htmlTheme));
+							new CSSThemeBriefDTO(this.htmlTheme),
+							TimeZone.getDefault());
     }
 	
 	/**This method checks whether user is a member of the 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -23,6 +23,8 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.usermanagement.dto;
 
+import java.util.TimeZone;
+
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 /**
  * @author Manpreet Minhas
@@ -35,10 +37,12 @@
 	private String login;
 	private String localeLanguage;
 	private String localeCountry;
+	private String direction;
     private String email;
    // private CSSThemeVisualElement theme;
     private CSSThemeBriefDTO flashTheme;
     private CSSThemeBriefDTO htmlTheme;
+    private TimeZone timezone;
 
 //	public UserDTO(Integer userID, String firstName, String lastName,
 //			String login, String email, CSSThemeVisualElement theme) {		
@@ -51,17 +55,20 @@
 //	}
 	
 	public UserDTO(Integer userID, String firstName, String lastName,
-			String login, String localeLanguage, 
-			String localeCountry, String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme) {		
+			String login, String localeLanguage,  String localeCountry, String direction, 
+			String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme,
+			TimeZone timezone) {		
 		this.userID = userID;
 		this.firstName = firstName;
 		this.lastName = lastName;
 		this.login = login;
 		this.localeCountry = localeCountry;
 		this.localeLanguage = localeLanguage;
+		this.direction = direction;
 		this.email = email;
 		this.flashTheme = flashTheme;
 		this.htmlTheme = htmlTheme;
+		this.timezone = timezone;
 	}
 	
 	/**
@@ -142,6 +149,16 @@
 		return localeLanguage;
 	}
 	
+	/** Should the page be displayed left to right (LTR) or right to left (RTL) */
+	public String getDirection() {
+		return direction;
+	}
+	
+	/** User's timezone. At the moment, this is always the server's timezone */
+	public TimeZone getTimeZone() {
+		return timezone;
+	}
+
 //	public CSSThemeVisualElement getTheme() {
 //		return theme;
 //	}
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -rea1b1cca464163b1b772a641803a7ee319471733 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision ea1b1cca464163b1b772a641803a7ee319471733)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -106,8 +106,12 @@
 
 	public static String SERVER_VERSION_NUMBER = "ServerVersionNumber";
 
+	/** Default locale for the server. Originally en_AU */
 	public static String SERVER_LANGUAGE = "ServerLanguage";
 
+	/** Direction (left to right, right to left) for writing on HTML pages. Originally LTR */
+	public static String SERVER_PAGE_DIRECTION = "ServerPageDirection";
+
 	public static String DICTIONARY_DATES = "DictionaryDates";
 
 	public static String DICTIONARY = "Dictionary";
@@ -128,4 +132,4 @@
 	
 	public static String DEFAULT_HTML_THEME = "DefaultHTMLTheme";
 	
-}
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	(.../LanguageUtil.java)	(revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	(.../LanguageUtil.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -23,8 +23,9 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.util;
 
-import java.util.Locale;
+import java.util.TimeZone;
 
+
 /**
  * Various internationalisation (internationalization) utilities.
  *  
@@ -33,44 +34,57 @@
  */
 public class LanguageUtil {
 
-    /**
-     * 
-     */
-    public LanguageUtil() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
+	public static final String DEFAULT_LANGUAGE = "en";
+	public static final String DEFAULT_COUNTRY = "AU";
+	public static final String DEFAULT_DIRECTION = "LTR";
 
-    public static void main(String[] args) {
-        
-        String[] arr = null;
-        
-        Locale defaultLocale = Locale.getDefault();
-        if ( defaultLocale != null ) {
-            System.out.println("Default locale "+defaultLocale.getCountry()
-                    +":"+defaultLocale.getISO3Country()
-                    +":"+defaultLocale.getDisplayCountry()
-                    +":"+defaultLocale.getLanguage()
-                    +":"+defaultLocale.getISO3Language());
-        }
-        printArray(Locale.getISOCountries(), "2 code countries: ");
-        printArray(Locale.getISOLanguages(), "2 code lamguages: ");
-    }
+	/** 
+	 * Get the default language, country, based on entries in the 
+	 * server configuration file. 
+	 * 
+	 * @return String[language, country]
+	 */
+	public static String[] getDefaultLangCountry() {
 
-    /**
-     * @param arr
-     * @param comment
-     */
-    private static void printArray(String[] arr, String comment) {
-        System.out.println(comment);
-        int i=0; 
-        while ( i<arr.length ) {
-            System.out.print(arr[i]);
-            i++;
-            if ( i < arr.length) {
-                System.out.print(", ");
-            }
-        }
-        System.out.println(".\n");
-    }
+    	String languageIsoCode = null;
+    	String countryIsoCode = null;
+
+		String serverLang = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); 
+		if ( serverLang != null) {
+			// assume either "en" or "en_AU" formats
+			if ( serverLang.length() >= 2)
+				languageIsoCode = serverLang.substring(0,2);
+			if ( serverLang.length() >= 5)
+				countryIsoCode = serverLang.substring(3,5);
+		} 
+
+		// fallback to en_AU
+		if ( languageIsoCode == null )
+			languageIsoCode = DEFAULT_LANGUAGE;
+		if ( countryIsoCode == null )
+			languageIsoCode = DEFAULT_COUNTRY;
+
+		return new String[]{languageIsoCode, countryIsoCode};
+
+	}
+	
+	/** 
+	 * Get the default direction, based on the values in the server configuration file. 
+	 * @return direction
+	 */
+	public static String getDefaultDirection() {
+		String direction = Configuration.get(ConfigurationKeys.SERVER_PAGE_DIRECTION);
+		if ( direction == null )
+			direction = DEFAULT_DIRECTION;
+		return direction;
+	}
+
+	/** 
+	 * Get the default timezone 
+	 * @return timezone
+	 */
+	public static TimeZone getDefaultTimeZone() {
+		return TimeZone.getDefault();
+	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
===================================================================
diff -u -rbfc247e092fb4d16a5200b72c831cfb8549d027e -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	(.../LocaleFilter.java)	(revision bfc247e092fb4d16a5200b72c831cfb8549d027e)
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	(.../LocaleFilter.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -52,9 +53,10 @@
 public class LocaleFilter extends OncePerRequestFilter {
 	private String encoding;
 	
-	//	private static final String DEFAULT_LANGUAGE = "en";
-//	private static final String DEFUALT_COUNTRY = "AU";
 	public static final String PREFERRED_LOCALE_KEY = "org.apache.struts.action.LOCALE";
+	/** Key used in request to get the required direction. Used by the HTML tag */
+	public static final String DIRECTION = "page_direction";
+	
 	/**
 	 * Set the encoding to use for requests. This encoding will be
 	 * passed into a ServletRequest.setCharacterEncoding call.
@@ -72,6 +74,8 @@
     		request.setCharacterEncoding("UTF-8");
     	
     	Locale preferredLocale = null;
+    	String direction = null; 
+    	TimeZone tz = null;
     	//Comment: This getParameter() cause problem when reading WDDX packet, which need request.getInputStream() method.
     	//user set has first prority:
 //    	String locale = request.getParameter("locale");
@@ -83,6 +87,8 @@
 			HttpSession sharedsession = SessionManager.getSession(); 
 			UserDTO user = (UserDTO) sharedsession.getAttribute(AttributeNames.USER);
 			if(user != null){
+				direction = user.getDirection();
+				tz = user.getTimeZone();
 				String lang = user.getLocaleLanguage();
 				String country = user.getLocaleCountry();
 				// would prefer both the language and country but that's not always feasible.
@@ -94,8 +100,16 @@
     	}
 		if(preferredLocale == null){
         	//if request does not have, set it default then.
-        	preferredLocale = new Locale(Configuration.get(ConfigurationKeys.SERVER_LANGUAGE));
+			String defaults[] = LanguageUtil.getDefaultLangCountry();
+        	preferredLocale = new Locale(defaults[0]!=null?defaults[0]:"",
+        								 defaults[1]!=null?defaults[1]:"");
+		} 
+		if(direction == null){
+			direction = LanguageUtil.getDefaultDirection();
 		}
+		if(tz == null) {
+			LanguageUtil.getDefaultTimeZone();
+		}
 
     	HttpSession session = request.getSession(false);
         //set locale for STURTS and JSTL
@@ -104,15 +118,15 @@
             if (preferredLocale != null) {
                 session.setAttribute(PREFERRED_LOCALE_KEY, preferredLocale);
                 Config.set(session, Config.FMT_LOCALE, preferredLocale);
+                session.setAttribute(DIRECTION, direction);
             }
-            Config.set(session, Config.FMT_TIME_ZONE, TimeZone.getDefault());
+            Config.set(session, Config.FMT_TIME_ZONE, tz);
         }
         if (preferredLocale != null && !(request instanceof LocaleRequestWrapper)) {
             request = new LocaleRequestWrapper(request, preferredLocale);
             LocaleContextHolder.setLocale(preferredLocale);
         }
 
-        
         chain.doFilter(request, response);
         
         // Reset thread-bound LocaleContext.
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -r72862d19e593b3413e3d25913428d54bc379fde5 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -306,8 +326,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r47fb5ad7605db0ab109adcaef649179e1b068a82 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 47fb5ad7605db0ab109adcaef649179e1b068a82)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -306,8 +326,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>
Index: lams_tool_nb/web/WEB-INF/lams.tld
===================================================================
diff -u -r47f339f1264a33e426aba033e60507eefa1bf67d -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_nb/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 47f339f1264a33e426aba033e60507eefa1bf67d)
+++ lams_tool_nb/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -306,8 +326,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>
Index: lams_tool_nb/web/exportPortfolio.jsp
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_nb/web/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_nb/web/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -5,7 +5,7 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
+<lams:html locale="true">
   	<head>    
 	    <title><c:out value="${NbExportForm.title}"/></title>
 	  	
@@ -34,4 +34,4 @@
 		</div>
 
 	</body>
-</html:html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -13,7 +13,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<lams:css/>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
@@ -79,5 +79,5 @@
 </body>
 
 
-</html:html>
+</lams:html>
 
Index: lams_tool_nb/web/template/learnerTemplate.jsp
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_nb/web/template/learnerTemplate.jsp	(.../learnerTemplate.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_nb/web/template/learnerTemplate.jsp	(.../learnerTemplate.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -10,7 +10,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<lams:css />
 	<title><fmt:message key="activity.title"/></title>
@@ -22,4 +22,4 @@
 	<tiles:insert attribute="content" />
 	
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_nb/web/template/template.jsp
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_nb/web/template/template.jsp	(.../template.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_nb/web/template/template.jsp	(.../template.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -10,7 +10,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
@@ -34,4 +34,4 @@
 		</div>
 	</div>
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_notebook/web/WEB-INF/lams.tld
===================================================================
diff -u -r718784fe6546fcb251380d712a2c81c6bb29e029 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_notebook/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 718784fe6546fcb251380d712a2c81c6bb29e029)
+++ lams_tool_notebook/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -306,8 +326,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>
Index: lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_sbmt/web/WEB-INF/lams.tld
===================================================================
diff -u -rb3f41153ea9815528aed7730b3760cc11f48bf75 -r5e3a1e5f73e433076f00eb9b0a489c54430b5672
--- lams_tool_sbmt/web/WEB-INF/lams.tld	(.../lams.tld)	(revision b3f41153ea9815528aed7730b3760cc11f48bf75)
+++ lams_tool_sbmt/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -306,8 +326,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>