- added pending-invites, accept-invite and reject-invite pages.

- adapted header component to only show logo and help if no user logged in

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Michael Ru
2008-08-21 11:59:47 +00:00
parent a6bdfca691
commit 4c522387c3
2 changed files with 5 additions and 17 deletions

View File

@@ -1,33 +1,21 @@
{ {
"action" : "${action}", "action" : "${action}",
<#if inviteId??> <#if inviteId??>
"inviteId" : "${inviteId}", "inviteId" : "${inviteId}",
<#else>
"inviteId" : undefined,
</#if> </#if>
<#if inviteeUserName??> <#if inviteeUserName??>
"inviteeUserName" : "${inviteeUserName}", "inviteeUserName" : "${inviteeUserName}",
<#else>
"inviteeUserName" : undefined,
</#if> </#if>
<#if inviteeFirstName??> <#if inviteeFirstName??>
"inviteeFirstName" : "${inviteeFirstName}", "inviteeFirstName" : "${inviteeFirstName}",
<#else>
"inviteeFirstName" : undefined,
</#if> </#if>
<#if inviteeLastName??> <#if inviteeLastName??>
"inviteeLastName" : "${inviteeLastName}", "inviteeLastName" : "${inviteeLastName}",
<#else>
"inviteeLastName" : undefined,
</#if> </#if>
<#if inviteeEmail??> <#if inviteeEmail??>
"inviteeEmail" : "${inviteeEmail}", "inviteeEmail" : "${inviteeEmail}",
<#else>
"inviteeEmail" : undefined,
</#if> </#if>
<#if siteShortName??> <#if siteShortName??>
"siteShortName" : "${siteShortName}" "siteShortName" : "${siteShortName}"
<#else>
"siteShortName" : undefined
</#if> </#if>
} }

View File

@@ -40,20 +40,20 @@
+ "'" + wf_siteShortName + "', " + "'" + wf_siteShortName + "', "
+ "please follow this link:\n" + "please follow this link:\n"
+ wf_serverPath + wf_acceptUrl + wf_serverPath + wf_acceptUrl
+ "&amp;inviteId=" + workflowId + "?inviteId=" + workflowId
+ "&amp;inviteeUserName=" + wf_inviteeUserName + "&amp;inviteeUserName=" + wf_inviteeUserName
+ "&amp;siteShortName=" + wf_siteShortName + "&amp;siteShortName=" + wf_siteShortName
+ "&amp;ticket=" + wf_inviteTicket + "&amp;inviteTicket=" + wf_inviteTicket
+ "\n\n" + "\n\n"
+ mail_text_invitee_account_section + mail_text_invitee_account_section
+ "To reject the invitation to join the site " + "To reject the invitation to join the site "
+ "'" + wf_siteShortName + "', " + "'" + wf_siteShortName + "', "
+ "please follow this link:\n" + "please follow this link:\n"
+ wf_serverPath + wf_rejectUrl + wf_serverPath + wf_rejectUrl
+ "&amp;inviteId=" + workflowId + "?inviteId=" + workflowId
+ "&amp;inviteeUserName=" + wf_inviteeUserName + "&amp;inviteeUserName=" + wf_inviteeUserName
+ "&amp;siteShortName=" + wf_siteShortName + "&amp;siteShortName=" + wf_siteShortName
+ "&amp;ticket=" + wf_inviteTicket; + "&amp;inviteTicket=" + wf_inviteTicket;
mail.execute(bpm_package); mail.execute(bpm_package);
</script> </script>
</action> </action>