From 68e75f18c534756b3bb5962fbd536b341d696907 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Fri, 15 Aug 2008 14:21:16 +0000 Subject: [PATCH] - Initial cut of site members page (no interaction yet) - I18N of join/leave buttons in site finder - Made start page of Members area the site members page rather than invite git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../site/membership/membership.lib.ftl | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl index b01171f6df..afcba2a527 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl @@ -1,15 +1,24 @@ <#macro membershipJSON site role person> - <#escape x as jsonUtils.encodeJSONString(x)> - { - "role" : "${role}", - "person": - { - "userName" : "${person.properties.userName}", - "url" : "${url.serviceContext + "/api/people/" + person.properties.userName}", - "firstName" : "${person.properties.firstName}", - "lastName" : "${person.properties.lastName}" - }, - "url" : "${url.serviceContext + "/api/sites/" + site.shortName + "/memberships/" + person.properties.userName}" - } - + <#escape x as jsonUtils.encodeJSONString(x)> + { + "role" : "${role}", + "person": + { + "userName" : "${person.properties.userName}", + "firstName" : "${person.properties.firstName}", + "lastName" : "${person.properties.lastName}", + <#if person.assocs["cm:avatar"]??> + "avatar" : "${"api/node/" + person.assocs["cm:avatar"][0].nodeRef?string?replace('://','/') + "/content/thumbnails/avatar"}", + + <#if person.properties.jobtitle??> + "jobtitle" : "${person.properties.jobtitle}", + + <#if person.properties.organization??> + "organization" : "${person.properties.organization}", + + "url" : "${url.serviceContext + "/api/people/" + person.properties.userName}" + }, + "url" : "${url.serviceContext + "/api/sites/" + site.shortName + "/memberships/" + person.properties.userName}" + } + \ No newline at end of file