inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
15506: Fix for ALFCOM-3274 - removed double-encoding of webview dashlet title when set from Configure dialog.
   15543: Fixes for ETHREEOH-2596 and ETHREEOH-2392. Any Admin user now forced to enter old password when editing themselves in the Share User Admin console.
   15620:Merged V3.1 to V3.2
      15595: Merged DEV-TEMPORARY to V3.1
         15446: Appropriate JSP page was modified to align radio buttons.
      15597: Fix for ETHREEOH-2575 - all PNG files now appear in IE6, note that PNG transparency is not supported in IE6.
      15598: Merged DEV-TEMPORARY to V3.1
         15593: ETHREEOH-2445: Localization Issues [Email Templates and RSS Templates ACPs I18N]
      15599: Merged DEV-TEMPORARY to V3.1
         15491: ETHREEOH-2460: Localization Issues - Email template
      15601: *RECORD ONLY* Merged V3.2 to V3.1
         15504: ETHREEOH-2447: My Content page localisation failing. [backport from V3.2]
      15613: *RECORD ONLY* Removed reference to portlets message bundle - as per CHK-8518
   15784: Minor performance improvements to data dictionary classes relating to Permission evaluations.
   15791: Merged V3.1 to V3.2
      15693: Merged DEV-TEMPORARY to V3.1
         15648: ETHREEOH-2549: Templates in 3.1 will need localising
      15743: ETHREEOH-2586: JP:Layout error, the word "....." (cancel) should be in the same line
      15745: ETHREEOH-2493 - HTML and XML encoding fixes to Alfresco OpenSearch keyword and person search HTML/ATOM/RSS feed templates.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-08-18 15:09:08 +00:00
parent 984b493d9b
commit cb4ce6b652
13 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/alfresco/messages/webclient.properties
View File

@@ -1681,6 +1681,16 @@ my_tasks_completed_title=My Completed Tasks
my_tasks_completed_desc=List of your completed tasks
pooled_tasks_title=My Pooled Tasks
pooled_tasks_desc=List of tasks allocated to your pool
doclist-webscript_title=Document List
doclist-webscript_desc=Document List WebScript
myspaces-webscript_title=My Spaces List
myspaces-webscript_desc=My Spaces WebScript
mytasks-webscript_title=My Tasks
mytasks-webscript_desc=My Tasks WebScript
mywebforms-webscript_title=My Web Forms
mywebforms-webscript_desc=My Web Forms WebScript
mywebfiles-webscript_title=My Web Files
mywebfiles-webscript_desc=My Web Files WebScript
due_date=Due Date
completed_on=Completed on
outcome=Outcome

24
config/alfresco/templates/doc_info.ftl
View File

@@ -1,22 +1,22 @@
<#-- Shows some general info about the current document, including NodeRef and aspects applied -->
<#if document?exists>
<h4>Current Document Info:</h4>
<b>Name:</b> ${document.name}<br>
<b>Ref:</b> ${document.nodeRef}<br>
<b>Type:</b> ${document.type}<br>
<b>DBID:</b> ${document.properties["sys:node-dbid"]}<br>
<b>Content URL:</b> <a href="${url.context}${document.url}">${url.context}${document.url}</a><br>
<b>Locked:</b> <#if document.isLocked>Yes<#else>No</#if><br>
<h4>${message("templates.doc_info.current_document_info")}</h4>
<b>${message("templates.doc_info.name")}</b> ${document.name}<br>
<b>${message("templates.doc_info.ref")}</b> ${document.nodeRef}<br>
<b>${message("templates.doc_info.type")}</b> ${document.type}<br>
<b>${message("templates.doc_info.dbid")}</b> ${document.properties["sys:node-dbid"]}<br>
<b>${message("templates.doc_info.content_url")}</b> <a href="${url.context}${document.url}">${url.context}${document.url}</a><br>
<b>${message("templates.doc_info.locked")}</b> <#if document.isLocked>Yes<#else>No</#if><br>
<#if hasAspect(document, "cm:countable") == 1 && document.properties['cm:counter']?exists>
<b>Counter:</b> ${document.properties['cm:counter']}<br>
<b>${message("templates.doc_info.counter")}</b> ${document.properties['cm:counter']}<br>
</#if>
<b>Aspects:</b>
<b>${message("templates.doc_info.aspects")}</b>
<table>
<#list document.aspects as aspect>
<tr><td>${aspect}</td></tr>
</#list>
</table>
<b>Assocs:</b>
<b>${message("templates.doc_info.assocs")}</b>
<table>
<#list document.assocs?keys as key>
<tr><td>${key}</td><td>
@@ -26,7 +26,7 @@
</td></tr>
</#list>
</table>
<b>Properties:</b>
<b>${message("templates.doc_info.properties")}</b>
<table>
<#-- Get a list of all the property names for the document -->
<#assign props = document.properties?keys>
@@ -53,5 +53,5 @@
</#list>
</table>
<#else>
No document found!
${message("templates.doc_info.no_document_found")}
</#if>

10
config/alfresco/templates/localizable.ftl
View File

@@ -1,14 +1,14 @@
<#-- Shows if a document is localizable and the locale if set -->
<b>Localisable:</b>
<b>${message("templates.localizable.localisable")}</b>
<#if document?exists>
<#if hasAspect(document, "cm:localizable") = 1>
Yes<br>
${message("templates.localizable.yes")}<br>
<#if document.properties.locale?exists>
Locale: ${document.properties.locale.properties.name}
${message("templates.localizable.locale")} ${document.properties.locale.properties.name}
</#if>
<#else>
No<br>
${message("templates.localizable.no")}<br>
</#if>
<#else>
No document found!
${message("templates.localizable.no_document_found")}
</#if>

9
config/alfresco/templates/my_docs.ftl
View File

@@ -4,10 +4,11 @@
<table>
<tr style='background-color: #C6D8EB'>
<td></td>
<td><b>Name</b></td>
<td><b>Size</b></td>
<td><b>Modified Date</b></td>
<td><b>Locked By</b></td>
<td><b>${message("templates.my_docs.name")}</b></td>
<td><b>${message("templates.my_docs.size")}</b></td>
<td><b>${message("templates.my_docs.modified.date")}</b></td>
<td><b>${message("templates.my_docs.locked")}</b></td>
</tr>
<#list userhome.children as child>
<#if child.isDocument>

10
config/alfresco/templates/my_summary.ftl
View File

@@ -1,8 +1,8 @@
<#-- Table of some summary details about the current user -->
<table>
<tr><td><b>Name:</b></td> <td>${person.properties.firstName} ${person.properties.lastName}</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>Items in Home Space:</b></td> <td>${userhome.children?size}</td></tr>
<tr><td><b>Items in Company Space:</b></td> <td>${companyhome.children?size}</td></tr>
<tr><td><b>${message("templates.my_summary.name")}</b></td> <td>${person.properties.firstName?html} ${person.properties.lastName?html}</td></tr>
<tr><td><b>${message("templates.my_summary.user")}</b></td> <td>${person.properties.userName}</td></tr>
<tr><td><b>${message("templates.my_summary.home_space_location")}</b></td> <td>${userhome.displayPath}/${userhome.name}</td></tr>
<tr><td><b>${message("templates.my_summary.items_in_home_space")}</b></td> <td>${userhome.children?size}</td></tr>
<tr><td><b>${message("templates.my_summary.items_in_company_space")}</b></td> <td>${companyhome.children?size}</td></tr>
</table>

8
config/alfresco/templates/translatable.ftl
View File

@@ -1,8 +1,8 @@
<#-- Shows the translations applied to a doc through the translatable aspect -->
<b>Translatable:</b>
<b>${message("templates.translatable.translatable")}</b>
<#if document?exists>
<#if hasAspect(document, "cm:translatable") = 1>
Yes<br>
${message("templates.translatable.yes")}<br>
<table>
<#if document.assocs["cm:translations"]?exists>
<#list document.assocs["cm:translations"] as t>
@@ -11,8 +11,8 @@
</#if>
</table>
<#else>
No<br>
${message("templates.translatable.no")}<br>
</#if>
<#else>
No document found!
${message("templates.translatable.no_document_found")}<br>
</#if>

10
config/alfresco/web-client-config.xml
View File

@@ -263,15 +263,15 @@
jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
<dashlet id="opensearch" label-id="opensearch" description-id="opensearch_desc"
jsp="/jsp/dashboards/dashlets/opensearch.jsp" />
<dashlet id="doclist-webscript" label="Document List" description="Document List WebScript"
<dashlet id="doclist-webscript" label-id="doclist-webscript_title" description-id="doclist-webscript_desc"
jsp="/jsp/dashboards/dashlets/doclist-webscript.jsp" />
<dashlet id="myspaces-webscript" label="My Spaces List" description="My Spaces WebScript"
<dashlet id="myspaces-webscript" label-id="myspaces-webscript_title" description-id="myspaces-webscript_desc"
jsp="/jsp/dashboards/dashlets/myspaces-webscript.jsp" />
<dashlet id="mytasks-webscript" label="My Tasks" description="My Tasks WebScript"
<dashlet id="mytasks-webscript" label-id="mytasks-webscript_title" description-id="mytasks-webscript_desc"
jsp="/jsp/dashboards/dashlets/mytasks-webscript.jsp" />
<dashlet id="mywebforms-webscript" label="My Web Forms" description="My Web Forms WebScript"
<dashlet id="mywebforms-webscript" label-id="mywebforms-webscript_title" description-id="mywebforms-webscript_desc"
jsp="/jsp/dashboards/dashlets/mywebforms-webscript.jsp" />
<dashlet id="mywebfiles-webscript" label="My Web Files" description="My Web Files WebScript"
<dashlet id="mywebfiles-webscript" label-id="mywebfiles-webscript_title" description-id="mywebfiles-webscript_desc"
jsp="/jsp/dashboards/dashlets/mywebfiles-webscript.jsp" />
</dashlets>

7
source/java/org/alfresco/web/app/ResourceBundleWrapper.java
View File

@@ -59,8 +59,8 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria
private static List<String> addedBundleNames = new ArrayList<String>(10);
/** Serializable details of the resource bundles being wrapped */
private Locale locale;
private String bundleName;
final private Locale locale;
final private String bundleName;
/** List of delegate resource bundles */
transient private List<ResourceBundle> delegates;
@@ -255,7 +255,7 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria
{
if (logger.isWarnEnabled() == true)
{
logger.warn("Failed to find I18N message string key: " + key);
logger.warn("Failed to find I18N message key: " + key + " for locale: " + locale.toString());
}
result = "$$" + key + "$$";
@@ -313,5 +313,4 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria
return customBundleName;
}
}

18
source/java/org/alfresco/web/ui/repo/tag/PageTag.java
View File

@@ -52,8 +52,6 @@ public class PageTag extends TagSupport
private final static String SCRIPTS_END = "\"></script>\n";
private final static String STYLES_START = "<link rel=\"stylesheet\" href=\"";
private final static String STYLES_MAIN = "\" type=\"text/css\">\n";
private final static String IE6COND_START = "<!--[if IE 6]>\n";
private final static String IE6COND_END = "<![endif]-->\n";
private final static String[] SCRIPTS =
{
@@ -84,11 +82,6 @@ public class PageTag extends TagSupport
"/css/picker.css"
};
private final static String[] IE6COND_CSS =
{
"/css/ie6.css"
};
/**
* Please ensure you understand the terms of the license before changing the contents of this file.
*/
@@ -251,17 +244,6 @@ public class PageTag extends TagSupport
out.write(STYLES_MAIN);
}
// IE6COND_CSS style includes
out.write(IE6COND_START);
for (final String ie6cond_css : PageTag.IE6COND_CSS)
{
out.write(STYLES_START);
out.write(reqPath);
out.write(ie6cond_css);
out.write(STYLES_MAIN);
}
out.write(IE6COND_END);
// JavaScript includes
for (final String s : PageTag.SCRIPTS)
{

2
source/web/css/picker.css
View File

@@ -147,7 +147,7 @@ div.pickerResultsRow
div.pickerButtons
{
margin: 0 auto;
width: 50px;
width: 60px;
padding: 3px;
background-color: #f1f1f1;
border: 1px solid #cccccc;

12
source/web/jsp/actions/simple-workflow.jsp
View File

@@ -160,7 +160,7 @@
</td>
</tr>
<tr><td colspan="2" class="paddingRow"></td></tr>
<tr><td colspan="2"><h:outputText value="#{msg.move_or_copy}"/></td>
<tr><td colspan="2"><h:outputText value="#{msg.move_or_copy}"/></td></tr>
<tr>
<td colspan="2">
<table cellpadding="2" cellspacing="2" border="0">
@@ -193,7 +193,10 @@
<td colspan="2"><h:outputText value="#{msg.want_reject_step}"/></td>
</tr>
<tr>
<td>
<td colspan="2">
<table cellpadding="2" cellspacing="2" border="0">
<tr>
<td valign="top">
<h:selectOneRadio id="reject-step-present" value="#{WizardManager.bean.actionProperties.rejectStepPresent}"
onclick="javascript:checkButtonState();" >
<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
@@ -201,6 +204,9 @@
</h:selectOneRadio>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2">
<table cellpadding="0" cellspacing="0" border="0">
@@ -216,7 +222,7 @@
</td>
</tr>
<tr><td class="paddingRow"></td></tr>
<tr><td><h:outputText value="#{msg.move_or_copy}"/></td>
<tr><td><h:outputText value="#{msg.move_or_copy}"/></td></tr>
<tr>
<td>
<table cellpadding="2" cellspacing="2" border="0">

4
source/web/jsp/users/new-user-wizard/edit-user-properties.jsp
View File

@@ -36,10 +36,10 @@
<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%">
<h:outputText value="#{msg.username}:"/>
<h:inputText id="userName" disabled="true" value="#{WizardManager.bean.userName}" size="35" maxlength="255" />
<h:inputText id="userName" disabled="true" value="#{WizardManager.bean.userName}" size="35" maxlength="100" />
<h:outputText value="#{msg.password}:"/>
<h:inputSecret id="password" disabled="true" value="#{WizardManager.bean.password}" size="35" maxlength="255" redisplay="true" />
<h:inputSecret id="password" disabled="true" value="#{WizardManager.bean.password}" size="35" maxlength="100" redisplay="true" />
</h:panelGrid>
<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"

6
source/web/jsp/users/new-user-wizard/new-user-properties.jsp
View File

@@ -82,17 +82,17 @@ function updateButtonState()
<h:panelGrid columns="4" cellpadding="2" cellspacing="2" width="100%">
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.username}:"/>
<h:inputText id="userName" value="#{WizardManager.bean.userName}" size="35" maxlength="255" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();"/>
<h:inputText id="userName" value="#{WizardManager.bean.userName}" size="35" maxlength="100" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();"/>
<h:message id="errors1" for="userName" style="color:red" />
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.password}:"/>
<h:inputSecret id="password" value="#{WizardManager.bean.password}" size="35" maxlength="255" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
<h:inputSecret id="password" value="#{WizardManager.bean.password}" size="35" maxlength="100" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
<h:message id="errors2" for="password" style="color:red" />
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.confirm}:"/>
<h:inputSecret id="confirm" value="#{WizardManager.bean.confirm}" size="35" maxlength="255" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
<h:inputSecret id="confirm" value="#{WizardManager.bean.confirm}" size="35" maxlength="100" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
<h:message id="errors3" for="confirm" style="color:red" />
</h:panelGrid>