From 3de5ef8f5c86540f6edb97b0fc57b97693cacfd7 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Thu, 4 Sep 2008 12:39:06 +0000 Subject: [PATCH] Calendar dashlet consitent with other dashlets. Date formats to UK git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/slingshot/calendar/userevents.get.json.ftl | 2 +- .../alfresco/slingshot/documentlibrary/doclist.get.json.ftl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl index a897be1d87..1a952b80c0 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl @@ -9,7 +9,7 @@ "name" : "${event.name}", "title" : "${event.properties["ia:whatEvent"]}", "where" : "${event.properties["ia:whereEvent"]}", - "when" : "${event.properties["ia:fromDate"]?string("dd MMMM yyyy")}", + "when" : "${event.properties["ia:fromDate"]?string("dd MMM yyyy")}", "url" : "page/site/${event.parent.parent.name}/calendar?date=${event.properties["ia:fromDate"]?string("MM/dd/yyyy")}", "start" : "${event.properties["ia:fromDate"]?string("HH:mm")}", "end" : "${event.properties["ia:toDate"]?string("HH:mm")}", diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl index e9ce20e5cb..66b4db31e8 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl @@ -56,10 +56,10 @@ "lockedByUser": "${lockedByUser}", "title": "${(d.properties.title!"")}", "description": "${(d.properties.description!"")}", - "createdOn": "${d.properties.created?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}", + "createdOn": "${d.properties.created?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}", "createdBy": "${createdBy}", "createdByUser": "${createdByUser}", - "modifiedOn": "${d.properties.modified?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}", + "modifiedOn": "${d.properties.modified?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}", "modifiedBy": "${modifiedBy}", "modifiedByUser": "${modifiedByUser}", "size": "${d.size?c}",