Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57113: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56764: ALF-20267 - IMAP: Properties' values are missing when Alfresco is installed in Chinese locale


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:45:18 +00:00
parent 4f4d6ec937
commit 22790feca5
2 changed files with 25 additions and 24 deletions

View File

@@ -4,7 +4,8 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Alfresco Repository"> <meta name="Generator" content="Alfresco Repository">
<meta name="layoutengine" content="MSHTML"><style type="text/css"> <meta name="layoutengine" content="MSHTML">
<style type="text/css">
body { body {
background-color:#FFFFFF; background-color:#FFFFFF;
color:#000000; color:#000000;
@@ -39,40 +40,40 @@
</head> </head>
<body> <body>
<hr> <hr>
<h1> 文档(名称): <!--SDL${document.name}SDL--> </h1> <h1> 文档(名称): ${document.name} </h1>
<hr> <hr>
<h2> 元数据 </h2> <h2> 元数据 </h2>
<table class="description"> <table class="description">
<#if document.properties.title?exists> <#if document.properties.title?exists>
<tr><td valign="top">标题:</td><td> <!--SDL${document.properties.title}SDL--></td></tr> <tr><td valign="top">标题:</td><td> ${document.properties.title}</td></tr>
<#else> <#else>
<tr><td valign="top">标题:</td><td>&nbsp;</td></tr> <tr><td valign="top">标题:</td><td>&nbsp;</td></tr>
</#if> </#if>
<#if document.properties.description?exists> <#if document.properties.description?exists>
<tr><td valign="top">说明:</td><td> <!--SDL${document.properties.description}SDL--></td></tr> <tr><td valign="top">说明:</td><td> ${document.properties.description}</td></tr>
<#else> <#else>
<tr><td valign="top">说明:</td><td>&nbsp;</td></tr> <tr><td valign="top">说明:</td><td>&nbsp;</td></tr>
</#if> </#if>
<tr><td>创建者:</td><td> <!--SDL${document.properties.creator}SDL--></td></tr> <tr><td>创建者:</td><td> ${document.properties.creator}</td></tr>
<tr><td>创建时间:</td><td> <!--SDL${document.properties.created?datetime}SDL--></td></tr> <tr><td>创建时间:</td><td> ${document.properties.created?datetime}</td></tr>
<tr><td>修改者:</td><td> <!--SDL${document.properties.modifier}SDL--></td></tr> <tr><td>修改者:</td><td> ${document.properties.modifier}</tr>
<tr><td>修改时间:</td><td> <!--SDL${document.properties.modified?datetime}SDL--></td></tr> <tr><td>修改时间:</td><td> ${document.properties.modified?datetime}</td></tr>
<tr><td>大小:</td><td> <!--SDL${document.size / 1024}SDL--> KB</td></tr> <tr><td>大小:</td><td> ${document.size / 1024} KB</td></tr>
</table> </table>
<br> <br>
<h2> 内容链接 </h2> <h2> 内容链接 </h2>
<table class="links"> <table class="links">
<tr> <tr>
<td>内容文件夹:</td><td> <!--SDL<a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a>SDL--></td> <td>内容文件夹:</td><td> <a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
</tr> </tr>
<tr> <tr>
<td>内容 URL</td><td> <!--SDL<a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a>SDL--></td> <td>内容 URL</td><td> <a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
</tr> </tr>
<tr> <tr>
<td>下载 URL</td><td> <!--SDL<a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a>SDL--></td> <td>下载 URL</td><td> <a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
</tr> </tr>
<tr> <tr>
<td>WebDAV URL</td><td> <!--SDL<a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a>SDL--></td> <td>WebDAV URL</td><td> <a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>
</tr> </tr>
</table> </table>
</body> </body>

View File

@@ -56,39 +56,39 @@
</head> </head>
<body> <body>
<hr/> <hr/>
<h1> 文档(名称): <!--SDL${document.name}SDL--> </h1> <h1> 文档(名称): ${document.name} </h1>
<hr/> <hr/>
<fieldset> <fieldset>
<legend> 元数据 </legend> <legend> 元数据 </legend>
<table class="description"> <table class="description">
<#if document.properties.title?exists> <#if document.properties.title?exists>
<tr><td valign="top">标题:</td><td> <!--SDL${document.properties.title}SDL--></td></tr> <tr><td valign="top">标题:</td><td> ${document.properties.title}</td></tr>
<#else> <#else>
<tr><td valign="top">标题:</td><td>&nbsp;</td></tr> <tr><td valign="top">标题:</td><td>&nbsp;</td></tr>
</#if> </#if>
<#if document.properties.description?exists> <#if document.properties.description?exists>
<tr><td valign="top">说明:</td><td> <!--SDL${document.properties.description}SDL--></td></tr> <tr><td valign="top">说明:</td><td> ${document.properties.description}</td></tr>
<#else> <#else>
<tr><td valign="top">说明:</td><td>&nbsp;</td></tr> <tr><td valign="top">说明:</td><td>&nbsp;</td></tr>
</#if> </#if>
<tr><td>创建者:</td><td> <!--SDL${document.properties.creator}SDL--></td></tr> <tr><td>创建者:</td><td> ${document.properties.creator}</td></tr>
<tr><td>创建时间:</td><td> <!--SDL${document.properties.created?datetime}SDL--></td></tr> <tr><td>创建时间:</td><td> ${document.properties.created?datetime}</td></tr>
<tr><td>修改者:</td><td> <!--SDL${document.properties.modifier}SDL--></td></tr> <tr><td>修改者:</td><td> ${document.properties.modifier}</td></tr>
<tr><td>修改时间:</td><td> <!--SDL${document.properties.modified?datetime}SDL--></td></tr> <tr><td>修改时间:</td><td> ${document.properties.modified?datetime}</td></tr>
<tr><td>大小:</td><td> <!--SDL${document.size / 1024}SDL--> KB</td></tr> <tr><td>大小:</td><td> ${document.size / 1024} KB</td></tr>
</table> </table>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend> 内容链接 </legend> <legend> 内容链接 </legend>
<table class="links"> <table class="links">
<tr> <tr>
<td>内容文件夹:</td><td> <!--SDL<a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a>SDL--></td> <td>内容文件夹:</td><td> <a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
</tr> </tr>
<tr> <tr>
<td>内容 URL</td><td> <!--SDL<a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a>SDL--></td> <td>内容 URL</td><td> <a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
</tr> </tr>
<tr> <tr>
<td>下载 URL</td><td> <!--SDL<a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a>SDL--></td> <td>下载 URL</td><td> <a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
</tr> </tr>
</table> </table>
</fieldset> </fieldset>