Merged HEAD (5.1) to 5.1.N (5.1.1)

118067 gbroadbent: ACE_4566: Fix for email templates in NORWEGIAN Bokmal


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-23 11:28:09 +00:00
parent c879393f6d
commit 1ac52839cf
5 changed files with 367 additions and 0 deletions

View File

@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="Generator" content="Alfresco Repository">
<meta name="layoutengine" content="MSHTML">
<style type="text/css">
body {
background-color:#FFFFFF;
color:#000000;
font-family:Verdana,Arial,sans-serif;
font-size:11px;
}
* {
font-family:Verdana,Arial,sans-serif;
font-size:11px;
}
h1 {
text-align:left;
font-size:15px;
}
h2 {
text-align:left;
font-size:13px;
margin: 17px;
text-decoration:underline;
}
table.links td, table.description td {
border-bottom:1px dotted #555555;
padding:5px;
}
table.description, table.links {
border:0;
border-collapse:collapse;
width:auto;
margin:7px 20px 7px 20px;
}
</style>
</head>
<body>
<hr>
<h1> Dokument (navn): ${document.name} </h1>
<hr>
<h2> Metadata </h2>
<table class="description">
<#if document.properties.title?exists>
<tr><td valign="top">Tittel:</td><td>${document.properties.title}</td></tr>
<#else>
<tr><td valign="top">Tittel:</td><td>&nbsp;</td></tr>
</#if>
<#if document.properties.description?exists>
<tr><td valign="top">Beskrivelse:</td><td>${document.properties.description}</td></tr>
<#else>
<tr><td valign="top">Beskrivelse:</td><td>&nbsp;</td></tr>
</#if>
<tr><td>Oppretter:</td><td>${document.properties.creator}</td></tr>
<tr><td>Opprettet:</td><td>${document.properties.created?datetime}</td></tr>
<tr><td>Modifikator:</td><td>${document.properties.modifier}</td></tr>
<tr><td>Modifisert:</td><td>${document.properties.modified?datetime}</td></tr>
<tr><td>Størrelse:</td><td>${document.size / 1024} kB</td></tr>
</table>
<br>
<h2> Lenker for innhold </h2>
<table class="links">
<tr>
<td>Mappe for innhold:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
</tr>
<tr>
<td>URL for innhold:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
</tr>
<tr>
<td>URL til nedlasting:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
</tr>
<tr>
<td>WebDAV URL:</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>
</tr>
</table>
</body>
</html>

View File

@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="Generator" content="Alfresco Repository">
<style type="text/css">
body {
background-color:#FFFFFF;
color:#000000;
}
* {
font-family:Verdana,Arial,sans-serif;
font-size:11px;
}
h1 {
text-align:left;
font-size:15px;
}
h2 {
text-align:left;
font-size:13px;
}
fieldset {
border:1px dotted #555555;
margin:15px 5px 15px 5px;
}
fieldset legend {
font-weight:bold;
border:1px dotted #555555;
background-color: #FFFFFF;
padding:7px;
}
.links {
border:0;
border-collapse:collapse;
width:99%;
}
.links td {
border:0;
padding:5px;
}
.description {
border:0;
border-collapse:collapse;
width:99%;
}
.description td {
/*border:1px dotted #555555;*/
padding:5px;
}
#start_workflow input, #start_workflow select, #start_workflow textarea
{
border:1px solid #555555;
}
</style>
</head>
<body>
<hr/>
<h1> Dokument (navn): ${document.name} </h1>
<hr/>
<fieldset>
<legend> Metadata </legend>
<table class="description">
<#if document.properties.title?exists>
<tr><td valign="top">Tittel:</td><td>${document.properties.title}</td></tr>
<#else>
<tr><td valign="top">Tittel:</td><td>&nbsp;</td></tr>
</#if>
<#if document.properties.description?exists>
<tr><td valign="top">Beskrivelse:</td><td>${document.properties.description}</td></tr>
<#else>
<tr><td valign="top">Beskrivelse:</td><td>&nbsp;</td></tr>
</#if>
<tr><td>Oppretter:</td><td>${document.properties.creator}</td></tr>
<tr><td>Opprettet:</td><td>${document.properties.created?datetime}</td></tr>
<tr><td>Modifikator:</td><td>${document.properties.modifier}</td></tr>
<tr><td>Modifisert:</td><td>${document.properties.modified?datetime}</td></tr>
<tr><td>Størrelse:</td><td>${document.size / 1024} kB</td></tr>
</table>
</fieldset>
<fieldset>
<legend> Lenker for innhold </legend>
<table class="links">
<tr>
<td>Mappe for innhold:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
</tr>
<tr>
<td>URL for innhold:</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>
<td>URL til nedlasting:</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>
</table>
</fieldset>
</body>
</html>

View File

@@ -0,0 +1,27 @@
------------------------------------------------------------------------------
Dokumentnavn: ${document.name}
------------------------------------------------------------------------------
<#if document.properties.title?exists>
Tittel: ${document.properties.title}
<#else>
Tittel: INGEN
</#if>
<#if document.properties.description?exists>
Beskrivelse: ${document.properties.description}
<#else>
Beskrivelse: INGEN
</#if>
Oppretter: ${document.properties.creator}
Opprettet: ${document.properties.created?datetime}
Modifikator: ${document.properties.modifier}
Modifisert: ${document.properties.modified?datetime}
Størrelse: ${document.size / 1024} kB
LENKER FOR INNHOLD
Mappe for innhold: ${contentFolderUrl}
URL for innhold: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
URL til nedlasting: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
WebDAV URL: ${contextUrl}${document.webdavUrl}

View File

@@ -0,0 +1,26 @@
------------------------------------------------------------------------------
Dokumentnavn: ${document.name}
------------------------------------------------------------------------------
<#if document.properties.title?exists>
Tittel: ${document.properties.title}
<#else>
Tittel: INGEN
</#if>
<#if document.properties.description?exists>
Beskrivelse: ${document.properties.description}
<#else>
Beskrivelse: INGEN
</#if>
Oppretter: ${document.properties.creator}
Opprettet: ${document.properties.created?datetime}
Modifikator: ${document.properties.modifier}
Modifisert: ${document.properties.modified?datetime}
Størrelse: ${document.size / 1024} kB
LENKER FOR INNHOLD
Mappe for innhold: ${contentFolderUrl}
URL for innhold: ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
URL til nedlasting: ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

View File

@@ -0,0 +1,136 @@
<html>
<head>
<style type="text/css"><!--
body
{
font-family: Arial, sans-serif;
font-size: 14px;
color: #4c4c4c;
}
a, a:visited
{
color: #0072cf;
}
.activity a
{
text-decoration: none;
}
.activity a:hover
{
text-decoration: underline;
}
--></style>
</head>
<body bgcolor="#dddddd">
<table width="100%" cellpadding="20" cellspacing="0" border="0" bgcolor="#dddddd">
<tr>
<td width="100%" align="center">
<table width="70%" cellpadding="0" cellspacing="0" bgcolor="white" style="background-color: white; border: 1px solid #aaaaaa;">
<tr>
<td width="100%">
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td style="padding: 20px 30px 0px;">
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td>
<div style="font-size: 22px; padding-bottom: 4px;">
Nyere aktiviteter
</div>
<div style="font-size: 13px;">
${date?datetime?string.full}
</div>
<div style="font-size: 14px; margin: 18px 0px 24px 0px; padding-top: 18px; border-top: 1px solid #aaaaaa;">
<#if activities?exists && activities?size &gt; 0>
<#list activities as activity>
<#if activity.siteNetwork??>
<#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"} ${activity.activitySummary.lastName!\"\"}</a>">
<#assign secondUserLink="">
<#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"}\">${activity.activitySummary.title!\"\"}</a>">
<#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${siteTitles[activity.siteNetwork]!activity.siteNetwork?html}</a>">
<#assign suppressSite=false>
<#switch activity.activityType>
<#case "org.alfresco.site.user-joined">
<#case "org.alfresco.site.user-left">
<#assign suppressSite=true>
<#case "org.alfresco.site.user-role-changed">
<#assign custom0=message("role."+activity.activitySummary.role)!"">
<#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"} ${activity.activitySummary.memberLastName!\"\"}</a>">
<#break>
<#case "org.alfresco.site.group-added">
<#case "org.alfresco.site.group-removed">
<#assign suppressSite=true>
<#case "org.alfresco.site.group-role-changed">
<#assign custom0=message("role."+activity.activitySummary.role)!"">
<#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
<#break>
<#case "org.alfresco.subscriptions.followed">
<#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"} ${activity.activitySummary.followerLastName!\"\"}</a>">
<#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"} ${activity.activitySummary.userLastName!\"\"}</a>">
<#assign suppressSite=true>
<#break>
<#case "org.alfresco.subscriptions.subscribed">
<#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"} ${activity.activitySummary.subscriberLastName!\"\"}</a>">
<#assign custom0=(activity.activitySummary.node!"")?html>
<#assign suppressSite=true>
<#break>
<#case "org.alfresco.profile.status-changed">
<#assign custom0=(activity.activitySummary.status!"")?html>
<#assign suppressSite=true>
<#break>
<#default>
</#switch>
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium}
</div>
</#if>
</#list>
</#if>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<div style="border-top: 1px solid #aaaaaa;">&nbsp;</div>
</td>
</tr>
<tr>
<td style="padding: 0px 30px; font-size: 13px;">
Du kan slå av meldinger ved å klikke på denne lenken:<br />
<br /><a href="${shareUrl}/page/user/${personProps["cm:userName"]}/user-notifications">${shareUrl}/page/user/${personProps["cm:userName"]}/user-notifications</a>
</td>
</tr>
<tr>
<td>
<div style="border-bottom: 1px solid #aaaaaa;">&nbsp;</div>
</td>
</tr>
<tr>
<td style="padding: 10px 30px;">
<img src="${shareUrl}/res/themes/default/images/app-logo.png" alt="" width="117" height="48" border="0" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>