diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 707a311fff..5442151b11 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -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 diff --git a/config/alfresco/templates/doc_info.ftl b/config/alfresco/templates/doc_info.ftl index e896d8f305..a7a6d4cb7c 100644 --- a/config/alfresco/templates/doc_info.ftl +++ b/config/alfresco/templates/doc_info.ftl @@ -1,22 +1,22 @@ <#-- Shows some general info about the current document, including NodeRef and aspects applied --> <#if document?exists> -

Current Document Info:

- Name: ${document.name}
- Ref: ${document.nodeRef}
- Type: ${document.type}
- DBID: ${document.properties["sys:node-dbid"]}
- Content URL: ${url.context}${document.url}
- Locked: <#if document.isLocked>Yes<#else>No
+

${message("templates.doc_info.current_document_info")}

+ ${message("templates.doc_info.name")} ${document.name}
+ ${message("templates.doc_info.ref")} ${document.nodeRef}
+ ${message("templates.doc_info.type")} ${document.type}
+ ${message("templates.doc_info.dbid")} ${document.properties["sys:node-dbid"]}
+ ${message("templates.doc_info.content_url")} ${url.context}${document.url}
+ ${message("templates.doc_info.locked")} <#if document.isLocked>Yes<#else>No
<#if hasAspect(document, "cm:countable") == 1 && document.properties['cm:counter']?exists> - Counter: ${document.properties['cm:counter']}
+ ${message("templates.doc_info.counter")} ${document.properties['cm:counter']}
- Aspects: + ${message("templates.doc_info.aspects")} <#list document.aspects as aspect>
${aspect}
- Assocs: + ${message("templates.doc_info.assocs")} <#list document.assocs?keys as key>
${key} @@ -26,7 +26,7 @@
- Properties: + ${message("templates.doc_info.properties")} <#-- Get a list of all the property names for the document --> <#assign props = document.properties?keys> @@ -53,5 +53,5 @@
<#else> - No document found! + ${message("templates.doc_info.no_document_found")} \ No newline at end of file diff --git a/config/alfresco/templates/localizable.ftl b/config/alfresco/templates/localizable.ftl index 5b634a08e2..cd252f76fc 100644 --- a/config/alfresco/templates/localizable.ftl +++ b/config/alfresco/templates/localizable.ftl @@ -1,14 +1,14 @@ <#-- Shows if a document is localizable and the locale if set --> -Localisable: +${message("templates.localizable.localisable")} <#if document?exists> <#if hasAspect(document, "cm:localizable") = 1> - Yes
+ ${message("templates.localizable.yes")}
<#if document.properties.locale?exists> - Locale: ${document.properties.locale.properties.name} + ${message("templates.localizable.locale")} ${document.properties.locale.properties.name} <#else> - No
+ ${message("templates.localizable.no")}
<#else> - No document found! + ${message("templates.localizable.no_document_found")} \ No newline at end of file diff --git a/config/alfresco/templates/my_docs.ftl b/config/alfresco/templates/my_docs.ftl index 63c131d753..1297342542 100644 --- a/config/alfresco/templates/my_docs.ftl +++ b/config/alfresco/templates/my_docs.ftl @@ -4,10 +4,11 @@ - - - - + + + + + <#list userhome.children as child> <#if child.isDocument> diff --git a/config/alfresco/templates/my_summary.ftl b/config/alfresco/templates/my_summary.ftl index 7d375cc100..200e33f3f5 100644 --- a/config/alfresco/templates/my_summary.ftl +++ b/config/alfresco/templates/my_summary.ftl @@ -1,8 +1,8 @@ <#-- Table of some summary details about the current user -->
NameSizeModified DateLocked By${message("templates.my_docs.name")}${message("templates.my_docs.size")}${message("templates.my_docs.modified.date")}${message("templates.my_docs.locked")}
- - - - - + + + + +
Name: ${person.properties.firstName} ${person.properties.lastName}
User: ${person.properties.userName}
Home Space location: ${userhome.displayPath}/${userhome.name}
Items in Home Space: ${userhome.children?size}
Items in Company Space: ${companyhome.children?size}
${message("templates.my_summary.name")} ${person.properties.firstName?html} ${person.properties.lastName?html}
${message("templates.my_summary.user")} ${person.properties.userName}
${message("templates.my_summary.home_space_location")} ${userhome.displayPath}/${userhome.name}
${message("templates.my_summary.items_in_home_space")} ${userhome.children?size}
${message("templates.my_summary.items_in_company_space")} ${companyhome.children?size}
\ No newline at end of file diff --git a/config/alfresco/templates/translatable.ftl b/config/alfresco/templates/translatable.ftl index e8cdc4c81a..1ce59715a4 100644 --- a/config/alfresco/templates/translatable.ftl +++ b/config/alfresco/templates/translatable.ftl @@ -1,8 +1,8 @@ <#-- Shows the translations applied to a doc through the translatable aspect --> -Translatable: +${message("templates.translatable.translatable")} <#if document?exists> <#if hasAspect(document, "cm:translatable") = 1> - Yes
+ ${message("templates.translatable.yes")}
<#if document.assocs["cm:translations"]?exists> <#list document.assocs["cm:translations"] as t> @@ -11,8 +11,8 @@
<#else> - No
+ ${message("templates.translatable.no")}
<#else> - No document found! + ${message("templates.translatable.no_document_found")}
\ No newline at end of file diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index a76591bfee..51d93656cb 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -254,24 +254,24 @@ + + --> - - - - - diff --git a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java index ab347349e4..b5068dd1df 100644 --- a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java +++ b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java @@ -59,8 +59,8 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria private static List addedBundleNames = new ArrayList(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 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; } - } diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java index 08cc1d84b3..e4b85750c5 100644 --- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java +++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java @@ -52,8 +52,6 @@ public class PageTag extends TagSupport private final static String SCRIPTS_END = "\">\n"; private final static String STYLES_START = "\n"; - private final static String IE6COND_START = "\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) { diff --git a/source/web/css/picker.css b/source/web/css/picker.css index 52c71c2985..1e0e2e51a9 100644 --- a/source/web/css/picker.css +++ b/source/web/css/picker.css @@ -147,7 +147,7 @@ div.pickerResultsRow div.pickerButtons { margin: 0 auto; - width: 50px; + width: 60px; padding: 3px; background-color: #f1f1f1; border: 1px solid #cccccc; diff --git a/source/web/jsp/actions/simple-workflow.jsp b/source/web/jsp/actions/simple-workflow.jsp index ef16f0f7a0..0cb41ecc8c 100644 --- a/source/web/jsp/actions/simple-workflow.jsp +++ b/source/web/jsp/actions/simple-workflow.jsp @@ -160,7 +160,7 @@ - + @@ -193,12 +193,18 @@ - @@ -216,7 +222,7 @@ - +
- - - - + + + + + +
+ + + + +
diff --git a/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp b/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp index a544eecf82..b5d06428e4 100644 --- a/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp +++ b/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp @@ -36,10 +36,10 @@ - + - + - + - + - +