Merged V2.1 to HEAD

6933:  Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-11-12 16:07:55 +00:00
parent bfcb186478
commit e3d5cececb
2 changed files with 2 additions and 2 deletions

View File

@@ -47,7 +47,7 @@
<#-- Otherwise treat it as a string --> <#-- Otherwise treat it as a string -->
<#else> <#else>
<tr><td>${t} = ${document.properties[t]}</td></tr> <tr><td>${t} = ${document.properties[t]?html}</td></tr>
</#if> </#if>
</#if> </#if>
</#list> </#list>

View File

@@ -1,6 +1,6 @@
<#-- Table of some summary details about the current user --> <#-- Table of some summary details about the current user -->
<table> <table>
<tr><td><b>Name:</b></td> <td>${person.properties.firstName} ${person.properties.lastName}</td></tr> <tr><td><b>Name:</b></td> <td>${person.properties.firstName?html} ${person.properties.lastName?html}</td></tr>
<tr><td><b>User:</b></td> <td>${person.properties.userName}</td></tr> <tr><td><b>User:</b></td> <td>${person.properties.userName}</td></tr>
<tr><td><b>Home Space location:</b></td> <td>${userhome.displayPath}/${userhome.name}</td></tr> <tr><td><b>Home Space location:</b></td> <td>${userhome.displayPath}/${userhome.name}</td></tr>
<tr><td><b>Items in Home Space:</b></td> <td>${userhome.children?size}</td></tr> <tr><td><b>Items in Home Space:</b></td> <td>${userhome.children?size}</td></tr>