diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 300405b56e..707a311fff 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -527,6 +527,7 @@ clear_button=Clear you_may_want=You may want to summary_step_description=Shows a summary of the information entered. error_wizard_completed_already=This wizard has been already been completed, please re-launch it to continue. +you_may_want_checkout_document=You may want to Check Out this document to prevent the possibility of other users overwriting your changes. # Category Management messages title_categories_list=Categories @@ -2071,3 +2072,6 @@ condition_compare_boolean_property_value_not=Boolean Property ''{0}'' NOT {1} '' condition_composite_summary=Composite Condition ({0} Conditions {1}) condition_composite_summary_not=Composite Condition ({0} Conditions {1} and Inverted) condition_composite_error=Composite Condition (ERROR) + +component_property=Property +component_value=Value diff --git a/config/alfresco/templates/client/node_summary_panel.ftl b/config/alfresco/templates/client/node_summary_panel.ftl index 087510ae00..7dfcb776c3 100644 --- a/config/alfresco/templates/client/node_summary_panel.ftl +++ b/config/alfresco/templates/client/node_summary_panel.ftl @@ -1,5 +1,7 @@ <#assign isImage=node.isDocument && (node.mimetype = "image/gif" || node.mimetype = "image/jpeg" || node.mimetype = "image/png")> <#assign isVideo=node.isDocument && node.mimetype?starts_with("video/")> +<#setting locale="${locale}"> +
@@ -13,8 +15,8 @@ <#assign navurl="/navigate/showSpaceDetails/"> <#assign navurl=navurl + node.nodeRef.storeRef.protocol + '/' + node.nodeRef.storeRef.identifier + '/' + node.nodeRef.id> - - + +
Details
Close
${msg("details")}
${msg("close")}
@@ -57,9 +59,9 @@  ${msg("description")}:${node.properties.description?html} -  ${msg("created")}:${node.properties.created?datetime} +  ${msg("created")}:${node.properties.created?string(msg("date_time_pattern"))}  ${msg("creator")}:${node.properties.creator} -  ${msg("modified")}:${node.properties.modified?datetime} +  ${msg("modified")}:${node.properties.modified?string(msg("date_time_pattern"))}  ${msg("modifier")}:${node.properties.modifier} <#if node.properties.owner?exists>  ${msg("owner")}:${node.properties.owner} @@ -68,7 +70,7 @@  ${msg("author")}:${node.properties.author?html} <#if node.isDocument> -  ${msg("size")}:${(node.size / 1000)?string("0.##")} KB +  ${msg("size")}:${(node.size / 1000)?string("0.##")} ${msg("kilobyte")} diff --git a/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java b/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java index ca609814e0..763c352d6a 100644 --- a/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java +++ b/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java @@ -152,6 +152,7 @@ public class NodeInfoBean implements Serializable model.put("date", new Date()); model.put("msg", new I18NMessageMethod()); model.put("url", new BaseTemplateContentServlet.URLHelper(context)); + model.put("locale", I18NUtil.getLocale()); if (nodeRef != null) { model.put("node", new TemplateNode( diff --git a/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java b/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java index 73c404ffc1..c5216ab8cc 100644 --- a/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java +++ b/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java @@ -76,7 +76,8 @@ public class UIGenericPicker extends UICommand private Boolean showAddButton = null; private Boolean filterRefresh = null; private Boolean multiSelect = null; - private String addButtonLabel; + private String addButtonLabel = null; + private String searchButtonLabel = null; private Integer width = null; private Integer height = null; @@ -128,6 +129,7 @@ public class UIGenericPicker extends UICommand filters = (SelectItem[])values[12]; filterRefresh = (Boolean)values[13]; multiSelect = (Boolean)values[14]; + searchButtonLabel = (String)values[15]; } /** @@ -135,7 +137,7 @@ public class UIGenericPicker extends UICommand */ public Object saveState(FacesContext context) { - Object values[] = new Object[15]; + Object values[] = new Object[16]; // standard component attributes are saved by the super class values[0] = super.saveState(context); values[1] = showFilter; @@ -152,6 +154,7 @@ public class UIGenericPicker extends UICommand values[12] = filters; values[13] = filterRefresh; values[14] = multiSelect; + values[15] = searchButtonLabel; return (values); } @@ -321,14 +324,21 @@ public class UIGenericPicker extends UICommand { out.write(" "); } // Search button out.write(""); @@ -361,7 +371,7 @@ public class UIGenericPicker extends UICommand // results list row out.write(""); - out.write("