Index: lams_admin/web/joblist.jsp
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_admin/web/joblist.jsp	(.../joblist.jsp)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/web/joblist.jsp	(.../joblist.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 <div align="center" id="jobList">
 	<div id="datatablecontainer">
@@ -22,7 +23,7 @@
 					<c:out value="${job.name}"/>
 				</td>
 				<td>
-					<fmt:formatDate value="${job.startDate}"/>
+					<lams:Date value="${job.startDate}"/>
 				</td>
 				<td>
 					<c:out value="${job.description}"/>
Index: lams_learning/web/exportPortfolio/main.jsp
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_learning/web/exportPortfolio/main.jsp	(.../main.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_learning/web/exportPortfolio/main.jsp	(.../main.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -67,10 +67,10 @@
 		</c:if>
 
 		<p><fmt:message key="export.portfolio.lesson.started.date.label"/> 
-			<fmt:formatDate value="${portfolio.lessonStartDate}" type="both" timeStyle="long"/></p>
+			<lams:Date value="${portfolio.lessonStartDate}"/></p>
 
 		<p><fmt:message key="export.portfolio.generated.date.label"/> 
-			<fmt:formatDate value="${portfolio.portfolioCreatedDate}" type="both" timeStyle="long"/></p>
+			<lams:Date value="${portfolio.portfolioCreatedDate}"/></p>
 
 		<c:if test="${empty portfolio.activityPortfolios}">
 			<p><fmt:message key="export.portfolio.noneAttempted.message"/></p>
Index: lams_monitoring/web/gate/scheduleGateContent.jsp
===================================================================
diff -u -r4fa2f7f15e38484a59e1f5411b6de650fcac28ea -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_monitoring/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 4fa2f7f15e38484a59e1f5411b6de650fcac28ea)
+++ lams_monitoring/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -24,6 +24,7 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 	<h1 class="no-tabs-below"><fmt:message key="label.schedule.gate.title"/></h1>
 	<div id="login-header">
@@ -33,10 +34,10 @@
 
 		<p>&nbsp;</p> 
 		<%@ include file="gateInfo.jsp" %>
-		<p><fmt:message key="label.schedule.gate.open.message"/> <fmt:formatDate value="${GateForm.map.startingTime}" type="both" dateStyle="full" timeStyle="full"/></p>
+		<p><fmt:message key="label.schedule.gate.open.message"/> <lams:Date value="${GateForm.map.startingTime}"/></p>
 
 		<c:if test="${GateForm.map.endingTime!=null}">
-			<p><fmt:message key="label.schedule.gate.close.message"/> <fmt:formatDate value="${GateForm.map.endingTime}" type="both" dateStyle="full" timeStyle="full"/></p>
+			<p><fmt:message key="label.schedule.gate.close.message"/> <lams:Date value="${GateForm.map.endingTime}"/></p>
 		</c:if>
 
 		<%@ include file="gateStatus.jsp" %>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -29,8 +29,7 @@
 					<c:out value="${topic.author}"/>
 				</td>
 				<td align="center">
-					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${topic.message.updated}" type="date" pattern="MMM dd"/>
+					<lams:Date value="${topic.message.updated}"/>
 				</td>
 			</tr>
 		</c:forEach>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -34,8 +34,7 @@
 					<fmt:message key="lable.topic.subject.by" />
 					<c:out value="${topic.author}" />
 					-
-					<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
+					<lams:Date value="${topic.message.created}"/>
 				</th>
 			</tr>
 			<tr>
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -r5e9e3b9c895e932ff86edb7a64cf4b81f59f766c -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 5e9e3b9c895e932ff86edb7a64cf4b81f59f766c)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -49,8 +49,7 @@
 							<fmt:message key="lable.topic.subject.by" />
 							<c:out value="${msgDto.author}" />
 									-
-									<fmt:formatDate value="${msgDto.message.created}" type="time" timeStyle="short" />
-							<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+							<lams:Date value="${msgDto.message.created}"/>
 						</c:if>
 					</td>
 				</tr>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -r5e9e3b9c895e932ff86edb7a64cf4b81f59f766c -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 5e9e3b9c895e932ff86edb7a64cf4b81f59f766c)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -35,8 +35,7 @@
 					<c:out value="${topic.message.replyNumber}" />
 				</td>
 				<td>
-					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+					<lams:Date value="${topic.message.updated}"/>
 				</td>
 			</tr>
 		</c:forEach>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -22,8 +22,7 @@
 						<fmt:message key="lable.topic.subject.by" />
 						<c:out value="${msgDto.author}" />
 								-
-								<fmt:formatDate value="${msgDto.message.created}" type="time" timeStyle="short" />
-						<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+						<lams:Date  value="${msgDto.message.created}" />
 					</c:if>
 				</td>
 			</tr>
Index: lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp	(.../viewtopic.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp	(.../viewtopic.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -14,8 +14,7 @@
 				<fmt:message key="lable.topic.subject.by" />
 				<c:out value="${topic.author}" />
 				-
-				<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
-				<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
+				<lams:Date value="${topic.message.created}"/>
 
 			</td>
 		</tr>
Index: lams_tool_forum/web/jsps/monitoring/message/viewtopictree.jsp
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/monitoring/message/viewtopictree.jsp	(.../viewtopictree.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/web/jsps/monitoring/message/viewtopictree.jsp	(.../viewtopictree.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -15,8 +15,7 @@
 					<fmt:message key="lable.topic.subject.by" />
 					<c:out value="${msgDto.author}" />
 							-
-							<fmt:formatDate value="${msgDto.message.created}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+							<lams:Date value="${msgDto.message.created}"/>
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -38,8 +38,7 @@
 				<c:out value="${topic.message.replyNumber}" />
 			</td>
 			<td>
-				<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-				<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+				<lams:Date value="${topic.message.updated}"/>
 			</td>
 		</tr>
 	</table>
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	(.../viewmarks.jsp)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	(.../viewmarks.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -56,8 +56,7 @@
 					<c:out value="${topic.message.replyNumber}" />
 				</td>
 				<td>
-					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+					<lams:Date  value="${topic.message.updated}"/>
 				</td>
 			</tr>
 	
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -311,7 +311,7 @@
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
 	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
+	    <name>Date</name>
+		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
 </taglib>
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34 -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
@@ -22,7 +22,7 @@
 					${user.loginName}
 				</td>
 				<td>
-					<fmt:formatDate value="${user.accessDate}" pattern="hh:mm:ss dd/MM/yy"/>
+					<lams:Date value="${user.accessDate}"/>
 				</td>
 				<td>
 					${user.firstName},${user.lastName}