diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 4815d64beb..97be2a8378 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -1,5 +1,7 @@ # I18N message properties empty_message= +left_qoute=' +right_quote=' # Multilingual make_multilingual=Make Multilingual @@ -1264,8 +1266,13 @@ target_path=Target Path target_does_not_exists=Failed to create layered folder as the target path {0} does not exist in the web project selected. delete_layered_folder=Delete Layered Folder folder=Folder -shared_folder=Shared Folder -shared_from=Shared from {0} +file=File +shared_folder=Layered Folder +shared_file=Layered File +stale_shared_folder=Stale Layered Folder +stale_shared_file=Stale Layered File +target_is_deleted=Target folder for ''{0}'' is deleted. +shared_from=Layered from {0} add_avm_content_dialog_desc=This dialog helps you to add content to a folder. update_avm_file_desc=Update a file in the website with content from your computer. file_details_desc=View details about the file. diff --git a/config/alfresco/templates/client/node_summary_panel.ftl b/config/alfresco/templates/client/node_summary_panel.ftl index 7dfcb776c3..872cd6e2e0 100644 --- a/config/alfresco/templates/client/node_summary_panel.ftl +++ b/config/alfresco/templates/client/node_summary_panel.ftl @@ -70,7 +70,7 @@  ${msg("author")}:${node.properties.author?html} <#if node.isDocument> -  ${msg("size")}:${(node.size / 1000)?string("0.##")} ${msg("kilobyte")} +  ${msg("size")}:${(node.size / 1024)?string("0.##")} ${msg("kilobyte")} @@ -90,4 +90,4 @@ - \ No newline at end of file + diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index 1759b25f4f..e1c06e6e20 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -141,6 +141,12 @@ managed-bean="ReassignTaskDialog" icon="/images/icons/reassign_workflow_task_large.gif" title-id="reassign_task_title" description-id="reassign_task_desc" /> + + + @@ -664,6 +670,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - diff --git a/config/alfresco/web-client-config-workflow-actions.xml b/config/alfresco/web-client-config-workflow-actions.xml index 9713e76c14..57e3c952d4 100644 --- a/config/alfresco/web-client-config-workflow-actions.xml +++ b/config/alfresco/web-client-config-workflow-actions.xml @@ -96,6 +96,20 @@ + + + Write + + org.alfresco.web.action.evaluator.WCMWorkflowEvaluator + edit_properties + /images/icons/edit_properties.gif + dialog:editAvmFileProperties + #{AVMBrowseBean.setupContentAction} + + #{actionContext.id} + + + org.alfresco.web.action.evaluator.CheckinDocEvaluator @@ -175,7 +189,7 @@ view_details /images/icons/View_details.gif #{AVMBrowseBean.setupContentAction} - dialog:showFileDetails + dialog:workflowShowFileDetails #{actionContext.id} @@ -223,12 +237,58 @@ - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,29 +303,10 @@ - - - - - - - - - - - - - - - - - - - @@ -290,24 +331,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/source/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java b/source/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java index f5878ce239..1e0800473c 100644 --- a/source/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java @@ -48,6 +48,8 @@ public class SpaceLinkDetailsDialog extends BaseDetailsBean implements Navigatio private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the Space this bean is currently representing @@ -224,7 +226,8 @@ public class SpaceLinkDetailsDialog extends BaseDetailsBean implements Navigatio public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getOutcome() diff --git a/source/java/org/alfresco/web/bean/TemplateSupportBean.java b/source/java/org/alfresco/web/bean/TemplateSupportBean.java index 347edfa0c1..f7273d3a65 100644 --- a/source/java/org/alfresco/web/bean/TemplateSupportBean.java +++ b/source/java/org/alfresco/web/bean/TemplateSupportBean.java @@ -160,6 +160,25 @@ public class TemplateSupportBean implements Serializable return templates; } + /** + * @return the list of available Notify Email Templates. + */ + public List getNotifyEmailTemplates() + { + List templates = null; + + // get the template from the special Email Templates folder + FacesContext fc = FacesContext.getCurrentInstance(); + String xpath = Application.getRootPath(fc) + "/" + + Application.getGlossaryFolderName(fc) + "/" + + Application.getEmailTemplatesFolderName(fc) + "/" + + Application.getNotifyEmailTemplatesFolderName(fc) + "//*"; + + templates = selectDictionaryNodes(fc, xpath, MSG_SELECT_TEMPLATE); + + return templates; + } + /** * @return the list of available RSS Templates. */ diff --git a/source/java/org/alfresco/web/bean/admin/ExportDialog.java b/source/java/org/alfresco/web/bean/admin/ExportDialog.java index 4dd2a8b40c..79e8a84637 100644 --- a/source/java/org/alfresco/web/bean/admin/ExportDialog.java +++ b/source/java/org/alfresco/web/bean/admin/ExportDialog.java @@ -57,6 +57,8 @@ public class ExportDialog extends BaseDialogBean private static final String CURRENT_SPACE = "current"; private static final String DEFAULT_OUTCOME = "dialog:close"; private static final String MSG_EXPORT = "export"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; protected BrowseBean browseBean; transient private ActionService actionService; @@ -117,8 +119,9 @@ public class ExportDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_EXPORT) + - " '" + browseBean.getActionSpace().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_EXPORT) + + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + browseBean.getActionSpace().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } /** diff --git a/source/java/org/alfresco/web/bean/admin/ImportDialog.java b/source/java/org/alfresco/web/bean/admin/ImportDialog.java index e63bbd451d..133690d48c 100644 --- a/source/java/org/alfresco/web/bean/admin/ImportDialog.java +++ b/source/java/org/alfresco/web/bean/admin/ImportDialog.java @@ -73,6 +73,8 @@ public class ImportDialog extends BaseDialogBean private static final String MSG_ERROR_EMPTY_FILE = "error_import_empty_file"; private static final String MSG_OK = "ok"; private static final String MSG_IMPORT = "import"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; transient private ActionService actionService; transient private ContentService contentService; @@ -384,6 +386,8 @@ public class ImportDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_IMPORT) + " '" + browseBean.getActionSpace().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_IMPORT) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + browseBean.getActionSpace().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java b/source/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java index 39d536724d..4ec2d54512 100644 --- a/source/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java +++ b/source/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java @@ -72,7 +72,11 @@ public class CreateCategoryDialog extends BaseDialogBean if (ref != null) { categoryRef = new NodeRef(ref); - } + } + else + { + categoryRef = null; + } } /** diff --git a/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java b/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java index de07fa0a90..4d151613f4 100644 --- a/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java +++ b/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java @@ -62,7 +62,8 @@ public class DeleteCategoryDialog extends BaseDialogBean private static final String DEFAULT_OUTCOME = "finish"; private final static String MSG_DELETE_CATEGORY = "delete_category"; private final static String MSG_DELETE = "delete"; - + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private static final String MSG_CATEGORIES = "categories"; transient protected CategoryService categoryService; @@ -258,8 +259,9 @@ public class DeleteCategoryDialog extends BaseDialogBean @Override public String getContainerTitle() { - - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DELETE_CATEGORY) + " '" + getActionCategory().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DELETE_CATEGORY) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + getActionCategory().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java b/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java index 0ddd4c6953..2dcb9f222b 100644 --- a/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java +++ b/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java @@ -61,6 +61,8 @@ public class EditCategoryDialog extends BaseDialogBean private final static String MSG_EDIT_CATEGORY = "edit_category"; private final static String MSG_FINISH = "finish_button"; private static final String MSG_CATEGORIES = "categories"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; transient protected CategoryService categoryService; @@ -213,8 +215,9 @@ public class EditCategoryDialog extends BaseDialogBean @Override public String getContainerTitle() { - - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_EDIT_CATEGORY) + " '" + getActionCategory().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_EDIT_CATEGORY) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + getActionCategory().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java index ce910cb3c7..60137cf0b7 100644 --- a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java +++ b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java @@ -54,6 +54,8 @@ public class EditNodeCategoriesDialog extends BaseDialogBean private static final String MSG_ERROR_UPDATE_CATEGORY = "error_update_category"; private static final String MSG_MODIFY_CATEGORIES_OF = "modify_categories_of"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; // ------------------------------------------------------------------------------ // Dialog implementation @@ -112,8 +114,9 @@ public class EditNodeCategoriesDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_MODIFY_CATEGORIES_OF) + - " '" + this.node.getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_MODIFY_CATEGORIES_OF) + + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + this.node.getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java index 1231bb1923..4679ea8e87 100644 --- a/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java @@ -10,6 +10,8 @@ public class CCCheckinFileDialog extends CheckinCheckoutDialog private static final long serialVersionUID = -3591701539727090905L; private static final String MSG_CHECK_IN = "check_in"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; @Override protected String finishImpl(FacesContext context, String outcome) throws Exception @@ -26,7 +28,9 @@ public class CCCheckinFileDialog extends CheckinCheckoutDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CHECK_IN) + " '" + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_CHECK_IN) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java index b68d33e0eb..5c734726b0 100644 --- a/source/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java @@ -48,6 +48,8 @@ public class CCCheckoutFileDialog extends CheckinCheckoutDialog public static final String LBL_SAVE = "save"; public static final String LBL_CHECKOUT = "check_out"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private static Log logger = LogFactory.getLog(CCCheckoutFileDialog.class); @@ -76,7 +78,9 @@ public class CCCheckoutFileDialog extends CheckinCheckoutDialog { final Node document = property.getDocument(); if (document != null){ - return Application.getMessage(FacesContext.getCurrentInstance(), LBL_CHECKOUT) + " '" + document.getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, LBL_CHECKOUT) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + document.getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } return null; } diff --git a/source/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java b/source/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java index 0c8f4920e3..0b529c43af 100644 --- a/source/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java @@ -38,6 +38,8 @@ public class CCCheckoutFileLinkDialog extends CheckinCheckoutDialog public static final String MSG_CHECKOUT_OF = "check_out_of"; public static final String LBL_UNDO_CHECKOUT = "undo_checkout"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private static Log logger = LogFactory.getLog(CCCheckoutFileLinkDialog.class); @@ -56,7 +58,9 @@ public class CCCheckoutFileLinkDialog extends CheckinCheckoutDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CHECKOUT_OF) + " '" + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_CHECKOUT_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/coci/CCEditFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCEditFileDialog.java index f7af8ad8b5..c17162a610 100644 --- a/source/java/org/alfresco/web/bean/coci/CCEditFileDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCEditFileDialog.java @@ -32,6 +32,8 @@ public class CCEditFileDialog extends CheckinCheckoutDialog { private static final long serialVersionUID = -1145049277343144264L; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; public static final String LBL_CLOSE = "close"; @Override @@ -59,7 +61,8 @@ public class CCEditFileDialog extends CheckinCheckoutDialog @Override public String getContainerTitle() { - return "'" + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_LEFT_QUOTE) + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java index 6d20f013d9..3818b372b1 100644 --- a/source/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java @@ -40,6 +40,8 @@ public class CCUndoCheckoutFileDialog extends CheckinCheckoutDialog public static final String LBL_UNDO_CHECKOUT = "undo_checkout"; public static final String MSG_UNDO_CHECKOUT_FOR = "undo_checkout_for"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private static Log logger = LogFactory.getLog(CheckinCheckoutDialog.class); @@ -52,8 +54,9 @@ public class CCUndoCheckoutFileDialog extends CheckinCheckoutDialog @Override public String getContainerTitle() { - - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_UNDO_CHECKOUT_FOR) + " '" + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_UNDO_CHECKOUT_FOR) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java index 49e62d64d7..37d1f27054 100644 --- a/source/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java @@ -11,6 +11,8 @@ public class CCUpdateFileDialog extends CheckinCheckoutDialog private static final long serialVersionUID = 8230565659041530809L; private final static String MSG_UPDATE = "update"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; @Override protected String finishImpl(FacesContext context, String outcome) throws Exception @@ -24,7 +26,9 @@ public class CCUpdateFileDialog extends CheckinCheckoutDialog Node document = property.getDocument(); if(document != null) { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_UPDATE) + " '" + document.getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_UPDATE) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + document.getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } return null; } diff --git a/source/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java b/source/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java index fa6bbfe940..4279f61e20 100644 --- a/source/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java @@ -34,6 +34,8 @@ public class CCWorkingCopyMissingDialog extends CheckinCheckoutDialog private static final long serialVersionUID = 8067485292477557683L; public static final String MSG_WORKING_COPY_FOR = "working_copy_for"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; public static final String LBL_CLOSE = "close"; @Override @@ -55,7 +57,9 @@ public class CCWorkingCopyMissingDialog extends CheckinCheckoutDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_WORKING_COPY_FOR) + " '" + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_WORKING_COPY_FOR) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java b/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java index dcd1250c76..90a6f2ea0a 100644 --- a/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java @@ -38,6 +38,8 @@ public class CancelEditingDialog extends CheckinCheckoutDialog { public static final String MSG_CANCEL_EDITING = "cancel_editing"; public static final String MSG_CANCEL_EDITING_FOR = "cancel_editing_for"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private static Log logger = LogFactory.getLog(CheckinCheckoutDialog.class); @@ -51,7 +53,9 @@ public class CancelEditingDialog extends CheckinCheckoutDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CANCEL_EDITING_FOR) + " '" + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_CANCEL_EDITING_FOR) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java b/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java index 48a5a86c05..a7391e1fa1 100644 --- a/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java @@ -80,6 +80,8 @@ public class CheckinCheckoutDialog extends BaseDialogBean public static final String MSG_ERROR_CANCELCHECKOUT = "error_cancel_checkout"; public static final String MSG_ERROR_UPDATE = "error_update"; public static final String MSG_ERROR_CHECKOUT = "error_checkout"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; public static final String FILE = "file"; @@ -132,7 +134,9 @@ public class CheckinCheckoutDialog extends BaseDialogBean public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), "check_in") + " '" + this.property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, "check_in") + " " + + Application.getMessage(fc, MSG_LEFT_QUOTE)+ this.property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } /** diff --git a/source/java/org/alfresco/web/bean/coci/DoneEditingDialog.java b/source/java/org/alfresco/web/bean/coci/DoneEditingDialog.java index 431032a6e0..8a8e54e8c8 100644 --- a/source/java/org/alfresco/web/bean/coci/DoneEditingDialog.java +++ b/source/java/org/alfresco/web/bean/coci/DoneEditingDialog.java @@ -50,6 +50,8 @@ public class DoneEditingDialog extends CheckinCheckoutDialog private final static String MSG_OK = "ok"; private static final String MSG_DONE_EDITING = "done_editing"; private final static String MSG_MISSING_ORIGINAL_NODE = "missing_original_node"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private final static String DIALOG_NAME = AlfrescoNavigationHandler.DIALOG_PREFIX + "doneEditingFile"; @@ -155,7 +157,9 @@ public class DoneEditingDialog extends CheckinCheckoutDialog { if (isSourceFound()) { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DONE_EDITING) + " '" + getNodeService().getProperty(sourceNodeRef, ContentModel.PROP_NAME) + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DONE_EDITING) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + getNodeService().getProperty(sourceNodeRef, ContentModel.PROP_NAME) + Application.getMessage(fc, MSG_RIGHT_QUOTE); } else { diff --git a/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java b/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java index 6b61dab07d..7bc0257078 100644 --- a/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java +++ b/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java @@ -34,6 +34,8 @@ import org.alfresco.web.app.Application; public class UploadNewVersionDialog extends DoneEditingDialog { private final static String MSG_UPLOAD_NEW_VERSION = "upload_new_version"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private final static String MSG_OF = "of"; private boolean finishedEditing = false; @@ -57,8 +59,10 @@ public class UploadNewVersionDialog extends DoneEditingDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_UPLOAD_NEW_VERSION) + " " + Application.getMessage(FacesContext.getCurrentInstance(), MSG_OF) + " '" - + property.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_UPLOAD_NEW_VERSION) + " " + Application.getMessage(fc, MSG_OF) + " " + + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java index 96dec30270..6540c7c9dd 100644 --- a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java @@ -91,6 +91,8 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio private static final String MSG_ERROR_ASPECT_CLASSIFY = "error_aspect_classify"; private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private final static String MSG_CLOSE = "close"; private static final String ML_VERSION_PANEL_ID = "ml-versions-panel"; @@ -979,7 +981,8 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getCurrentItemId() diff --git a/source/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java b/source/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java index b8e9310040..ebcb461a2e 100644 --- a/source/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java @@ -50,6 +50,8 @@ public class DocumentLinkDetailsDialog extends BaseDetailsBean implements Naviga private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the document this bean is currently representing @@ -206,7 +208,8 @@ public class DocumentLinkDetailsDialog extends BaseDetailsBean implements Naviga public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } /** diff --git a/source/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java b/source/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java index 541e095bee..c9e568b601 100644 --- a/source/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java @@ -50,6 +50,8 @@ public class ForumDetailsDialog extends BaseDetailsBean implements NavigationSup private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the Space this bean is currently representing @@ -242,7 +244,8 @@ public class ForumDetailsDialog extends BaseDetailsBean implements NavigationSup public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java b/source/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java index 3060121dd8..136a1c2d1f 100644 --- a/source/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java @@ -50,6 +50,8 @@ public class ForumsDetailsDialog extends BaseDetailsBean implements NavigationSu private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the Space this bean is currently representing @@ -242,7 +244,8 @@ public class ForumsDetailsDialog extends BaseDetailsBean implements NavigationSu public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java b/source/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java index 371e9c674d..3470e3c70c 100644 --- a/source/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java @@ -50,6 +50,8 @@ public class TopicDetailsDialog extends BaseDetailsBean implements NavigationSup private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the Space this bean is currently representing @@ -242,7 +244,8 @@ public class TopicDetailsDialog extends BaseDetailsBean implements NavigationSup public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java b/source/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java index b2dd97e3a2..f22cea62d4 100644 --- a/source/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java +++ b/source/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java @@ -50,6 +50,8 @@ public class DeleteGroupDialog extends BaseDialogBean private static final String MSG_DELETE = "delete"; private static final String MSG_DELETE_GROUP = "delete_group"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; // ------------------------------------------------------------------------------ // Dialog implementation @@ -108,8 +110,9 @@ public class DeleteGroupDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DELETE_GROUP) + " '" + - this.groupName + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DELETE_GROUP) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + this.groupName + Application.getMessage(fc, MSG_RIGHT_QUOTE); } // ------------------------------------------------------------------------------ diff --git a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java index fa9ea30c37..ad4be8b9ba 100644 --- a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java +++ b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java @@ -438,7 +438,7 @@ public class GroupsDialog extends BaseDialogBean StringBuilder label = new StringBuilder(48); label.append(firstName) .append(' ') - .append(lastName); + .append(lastName != null ? lastName : ""); authMap.put("name", label.toString()); users.add(authMap); diff --git a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java index 3dca85fb36..c6ebed7029 100644 --- a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java +++ b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java @@ -63,6 +63,8 @@ public class MultilingualManageDialog extends BaseDialogBean private static final String MSG_CURRENT = "current"; private static final String ML_VERSION_PANEL_ID = "ml-versions-panel"; private static final String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; protected Map panels = new HashMap(4, 1.0f); @@ -214,7 +216,9 @@ public class MultilingualManageDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_MANAGE_DETAILS_FOR) + " '" + getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_MANAGE_DETAILS_FOR) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java b/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java index 50216dec0b..2ab0595fb9 100644 --- a/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java +++ b/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java @@ -50,6 +50,8 @@ public class DocumentPreviewBean extends BasePreviewBean implements NavigationSu private final static String MSG_PREVIEW_OF = "preview_of"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the document this bean is currently representing @@ -171,7 +173,8 @@ public class DocumentPreviewBean extends BasePreviewBean implements NavigationSu public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_PREVIEW_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_PREVIEW_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getCancelButtonLabel() diff --git a/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java b/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java index 13c5e47550..32eb17422f 100644 --- a/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java +++ b/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java @@ -49,6 +49,8 @@ public class SpacePreviewBean extends BasePreviewBean implements NavigationSuppo private static final long serialVersionUID = -4766291793031654901L; private final static String MSG_PREVIEW_OF = "preview_of"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * Returns the Space this bean is currently representing @@ -196,7 +198,8 @@ public class SpacePreviewBean extends BasePreviewBean implements NavigationSuppo public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_PREVIEW_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_PREVIEW_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getCancelButtonLabel() diff --git a/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java b/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java index ee00a4a65d..c5f3957eb7 100644 --- a/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java +++ b/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java @@ -49,6 +49,8 @@ public class DeleteRuleDialog extends BaseDialogBean private static final String MSG_DELETE_RULE = "delete_rule"; private static final String MSG_YES = "yes"; private static final String MSG_NO = "no"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; transient private Rule currentRule; transient private RuleService ruleService; @@ -144,7 +146,9 @@ public class DeleteRuleDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DELETE_RULE) + " '" + currentRule.getTitle() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DELETE_RULE) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + currentRule.getTitle() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java b/source/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java index 404224c6d7..fc8989348e 100644 --- a/source/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java @@ -44,6 +44,8 @@ public class ApplyDocTemplateDialog extends BaseDialogBean private static final String DIALOG_CLOSE = "dialog:close"; private static final String MSG_APPLY_TEMPLATE = "apply_template"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; protected String template; @@ -81,7 +83,8 @@ public class ApplyDocTemplateDialog extends BaseDialogBean public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_APPLY_TEMPLATE) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_APPLY_TEMPLATE) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getTemplate() diff --git a/source/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java b/source/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java index b614944b91..f3e920c05d 100644 --- a/source/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java @@ -45,6 +45,8 @@ public class ApplyRssTemplateDialog extends BaseDialogBean private static final String DIALOG_CLOSE = "dialog:close"; private static final String MSG_APPLY_RSS_FEED = "apply_rss_feed"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private String rssTemplate; @@ -73,7 +75,8 @@ public class ApplyRssTemplateDialog extends BaseDialogBean public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_APPLY_RSS_FEED) + " '" + getNode().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_APPLY_RSS_FEED) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getNode().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public void applyRSSTemplate(ActionEvent event) diff --git a/source/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java b/source/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java index 1271c42754..68762f959d 100644 --- a/source/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java @@ -45,10 +45,11 @@ public class ApplySpaceTemplateDialog extends BaseDialogBean private static final String DIALOG_CLOSE = "dialog:close"; private static final String MSG_APPLY_TEMPLATE = "apply_template"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; protected String template; - @Override protected String finishImpl(FacesContext context, String outcome) throws Exception { @@ -58,7 +59,8 @@ public class ApplySpaceTemplateDialog extends BaseDialogBean public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_APPLY_TEMPLATE) + " '" + getNode().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_APPLY_TEMPLATE) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getNode().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public void applyTemplate(ActionEvent event) diff --git a/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java b/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java index d723d36887..3fef0377e5 100644 --- a/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java @@ -64,6 +64,8 @@ public class SpaceDetailsDialog extends BaseDetailsBean implements NavigationSup private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** RSS Template ID */ private String rssTemplate; @@ -518,7 +520,8 @@ public class SpaceDetailsDialog extends BaseDetailsBean implements NavigationSup public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getOutcome(){ diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java index 8aae29cc34..769b973b8d 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java @@ -44,6 +44,8 @@ public class TrashcanDeleteItemDialog extends TrashcanDialog private static final String MSG_YES = "yes"; private static final String MSG_NO = "no"; private static final String MSG_DELETE_ITEM = "delete_item"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private String deleteItem(FacesContext newContext, String newOutcome) { @@ -98,8 +100,9 @@ public class TrashcanDeleteItemDialog extends TrashcanDialog @Override public String getContainerTitle() { - - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DELETE_ITEM) + " '" + property.getItem().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DELETE_ITEM) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getItem().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java index 5ccfee9d5c..d3d3ee568a 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java @@ -37,6 +37,8 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; transient private PermissionService permissionService; @@ -49,8 +51,9 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + - property.getItem().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getItem().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java index 77fffe2b12..0b372c918a 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java @@ -45,6 +45,8 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog private static final String MSG_RECOVERED_ITEM_PERMISSION = "recovered_item_permission"; private static final String MSG_RECOVERED_ITEM_PARENT = "recovered_item_parent"; private static final String MSG_RECOVERED_ITEM_FAILURE = "recovered_item_failure"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private static final String MSG_RECOVER_ITEM = "recover_item"; private static final String MSG_NO = "no"; @@ -135,7 +137,9 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_RECOVER_ITEM) + " '" + property.getItem().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_RECOVER_ITEM) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + property.getItem().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/users/ContentUsersBean.java b/source/java/org/alfresco/web/bean/users/ContentUsersBean.java index 29698520d6..dae46118d0 100644 --- a/source/java/org/alfresco/web/bean/users/ContentUsersBean.java +++ b/source/java/org/alfresco/web/bean/users/ContentUsersBean.java @@ -43,6 +43,8 @@ public class ContentUsersBean extends UserMembersBean private final static String MSG_MANAGE_CONTENT_USERS = "manage_content_users"; private final static String MSG_CONTENT_OWNER = "content_owner"; private final static String MSG_CLOSE= "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * @return The space to work against @@ -67,7 +69,9 @@ public class ContentUsersBean extends UserMembersBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_MANAGE_CONTENT_USERS) + " '" + browseBean.getDocument().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_MANAGE_CONTENT_USERS) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + browseBean.getDocument().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java index aece8efe84..9214ecf836 100644 --- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java +++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java @@ -332,8 +332,8 @@ public class CreateUserWizard extends BaseWizardBean bundle.getString("user_jobtitle"), bundle.getString("user_location"), bundle.getString("presence_username"), bundle.getString("quota")}, new String[] { - Utils.encode(this.firstName + " " + this.lastName), this.userName, - "********", homeSpaceLabel, + Utils.encode(this.firstName + " " + this.lastName), Utils.encode(this.userName), + "********", Utils.encode(homeSpaceLabel), Utils.encode(this.email), Utils.encode(this.organisation), Utils.encode(this.jobtitle), Utils.encode(this.location), Utils.encode(presenceLabel), quotaLabel}); diff --git a/source/java/org/alfresco/web/bean/users/DeleteUserDialog.java b/source/java/org/alfresco/web/bean/users/DeleteUserDialog.java index a6af09b528..5806790fa1 100644 --- a/source/java/org/alfresco/web/bean/users/DeleteUserDialog.java +++ b/source/java/org/alfresco/web/bean/users/DeleteUserDialog.java @@ -67,6 +67,8 @@ public class DeleteUserDialog extends BaseDialogBean private static final String MSG_TITLE_DELETE_USER = "title_delete_user"; private static final String BUTTON_NO = "no"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; transient private AuthenticationService authenticationService; @@ -300,6 +302,8 @@ public class DeleteUserDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_TITLE_DELETE_USER) + " '" + getPerson().getProperties().get("userName") + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_TITLE_DELETE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + getPerson().getProperties().get("userName") + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/users/EditUserRolesDialog.java b/source/java/org/alfresco/web/bean/users/EditUserRolesDialog.java index 520ad39215..d39b7c84fe 100644 --- a/source/java/org/alfresco/web/bean/users/EditUserRolesDialog.java +++ b/source/java/org/alfresco/web/bean/users/EditUserRolesDialog.java @@ -36,6 +36,8 @@ public class EditUserRolesDialog extends BaseDialogBean { private static final long serialVersionUID = 614541023231055676L; private static final String MSG_MODIFY_USER_ROLE = "modify_user_roles"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; SpaceUsersBean spaceUsersBean; @@ -75,7 +77,10 @@ public class EditUserRolesDialog extends BaseDialogBean { } @Override - public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_MODIFY_USER_ROLE) + " '" + spaceUsersBean.getPersonName() + "'"; + public String getContainerTitle() + { + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_MODIFY_USER_ROLE) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + spaceUsersBean.getPersonName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java b/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java index fd3f6de402..acf99aa6fd 100644 --- a/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java +++ b/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java @@ -40,6 +40,8 @@ public class RemoveContentUserDialog extends BaseDialogBean private static final long serialVersionUID = -3090054828215666084L; private static final String MSG_REMOVE_USER = "remove_user"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private ContentUsersBean contentUsersBean; @@ -60,8 +62,9 @@ public class RemoveContentUserDialog extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_REMOVE_USER) + - " '" + this.getPersonName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_REMOVE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + this.getPersonName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java b/source/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java index d3ce99da29..1900405787 100644 --- a/source/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java +++ b/source/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java @@ -39,6 +39,8 @@ public class RemoveInvitedUserDialog extends BaseDialogBean { private static final String BUTTON_YES = "yes"; private static final String MSG_REMOVE_USER = "remove_user"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; private SpaceUsersBean spaceUsersBean; @@ -84,8 +86,10 @@ public class RemoveInvitedUserDialog extends BaseDialogBean { } @Override - public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_REMOVE_USER) + " '" - + spaceUsersBean.getPersonName() + "'"; + public String getContainerTitle() + { + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_REMOVE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + spaceUsersBean.getPersonName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/bean/users/SpaceUsersBean.java b/source/java/org/alfresco/web/bean/users/SpaceUsersBean.java index fa9d70f2f7..5f8fadcd33 100644 --- a/source/java/org/alfresco/web/bean/users/SpaceUsersBean.java +++ b/source/java/org/alfresco/web/bean/users/SpaceUsersBean.java @@ -43,6 +43,8 @@ public class SpaceUsersBean extends UserMembersBean private final static String MSG_MANAGE_INVITED_USERS = "manage_invited_users"; private final static String MSG_SPACE_OWNER = "space_owner"; private final static String MSG_CLOSE= "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** * @return The space to work against @@ -67,7 +69,9 @@ public class SpaceUsersBean extends UserMembersBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_MANAGE_INVITED_USERS) + " '" + browseBean.getActionSpace().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_MANAGE_INVITED_USERS) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + + browseBean.getActionSpace().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/users/UserMembersBean.java b/source/java/org/alfresco/web/bean/users/UserMembersBean.java index 302503272a..4a5ff6e896 100644 --- a/source/java/org/alfresco/web/bean/users/UserMembersBean.java +++ b/source/java/org/alfresco/web/bean/users/UserMembersBean.java @@ -429,8 +429,9 @@ public abstract class UserMembersBean extends BaseDialogBean implements IContext // set data binding properties // this will also force initialisation of the props now during the UserTransaction // it is much better for performance to do this now rather than during page bind - Map props = node.getProperties(); - props.put("fullName", ((String)props.get("firstName")) + ' ' + ((String)props.get("lastName"))); + Map props = node.getProperties(); + String lastName = (String)props.get("lastName"); + props.put("fullName", ((String)props.get("firstName")) + ' ' + (lastName != null ? lastName : "")); props.put("userNameLabel", props.get("userName")); props.put("roles", roleListToString(context, permissionMap.get(authority))); props.put("icon", WebResources.IMAGE_PERSON); diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java index 470329ebf8..2056a59bda 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java @@ -131,6 +131,7 @@ public class AVMBrowseBean implements IContextListener private static final String MSG_CREATED_BY = "store_created_by"; private static final String MSG_WORKING_USERS = "store_working_users"; private static final String MSG_SEARCH_FORM_CONTENT = "search_form_content"; + private static final String MSG_TARGET_IS_DELETED ="target_is_deleted"; /** Component id the status messages are tied too */ static final String COMPONENT_SANDBOXESPANEL = "sandboxes-panel"; @@ -1328,18 +1329,39 @@ public class AVMBrowseBean implements IContextListener String type = ""; if (avmRef.getType() == AVMNodeType.LAYERED_DIRECTORY && avmRef.isPrimary()) { - type = Application.getMessage(FacesContext.getCurrentInstance(), "shared_folder"); + if (getAvmService().lookup(avmRef.getIndirectionVersion(), avmRef.getIndirection()) != null) + { + type = Application.getMessage(FacesContext.getCurrentInstance(), "shared_folder"); + } + else + { + type = Application.getMessage(FacesContext.getCurrentInstance(), "stale_shared_folder"); + } } else { type = Application.getMessage(FacesContext.getCurrentInstance(), "folder"); } node.getProperties().put("folderType", type); - + this.folders.add(node); } else { + String type = "file"; + if (avmRef.isLayeredFile()) + { + if (getAvmService().lookup(avmRef.getIndirectionVersion(), avmRef.getIndirection()) != null) + { + type = Application.getMessage(FacesContext.getCurrentInstance(), "shared_file"); + } + else + { + type = Application.getMessage(FacesContext.getCurrentInstance(), "stale_shared_file"); + } + } + + node.getProperties().put("fileType", type); node.getProperties().put("fileType16", FileTypeImageUtils.getFileTypeImage(avmRef.getName(), true)); node.getProperties().put("url", DownloadContentServlet.generateBrowserURL( AVMNodeConverter.ToNodeRef(-1, avmRef.getPath()), avmRef.getName())); @@ -1406,7 +1428,18 @@ public class AVMBrowseBean implements IContextListener UIActionLink link = (UIActionLink)event.getComponent(); Map params = link.getParameterMap(); String path = params.get("id"); - updateUILocation(path); + AVMNodeDescriptor avmNode = getAvmService().lookup(-1, path); + + if (avmNode.isLayeredDirectory() && avmNode.isPrimary() && (getAvmService().lookup(avmNode.getIndirectionVersion(), avmNode.getIndirection()) == null)) + { + String pattern = Application.getMessage(FacesContext.getCurrentInstance(), MSG_TARGET_IS_DELETED); + String folderName = path.substring(path.lastIndexOf("/") + 1); + Utils.addErrorMessage(MessageFormat.format(pattern, folderName)); + } + else + { + updateUILocation(path); + } } /** diff --git a/source/java/org/alfresco/web/bean/wcm/AVMEditBean.java b/source/java/org/alfresco/web/bean/wcm/AVMEditBean.java index 404baf0aa1..c6c83fb6a8 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMEditBean.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMEditBean.java @@ -56,8 +56,11 @@ public class AVMEditBean extends BaseDialogBean private static final String MSG_ERROR_UPDATE = "error_update"; private static final String MSG_UPLOAD_SUCCESS = "file_upload_success"; - private static final String MSG_APPLY_RSS_FEED= "update"; + private static final String MSG_APPLY_RSS_FEED= "apply_rss_feed"; private static final String MSG_UPDATE = "update"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; + private File file = null; private String fileName = null; @@ -280,7 +283,8 @@ public class AVMEditBean extends BaseDialogBean @Override public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_APPLY_RSS_FEED) + " '" + getAvmNode().getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_APPLY_RSS_FEED) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getAvmNode().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } @Override diff --git a/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java b/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java index 26140a9bfb..2879184e15 100644 --- a/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java +++ b/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java @@ -63,6 +63,9 @@ public class FileDetailsBean extends AVMDetailsBean /** Action service bean reference */ transient private ActionService actionService; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; + // ------------------------------------------------------------------------------ // Construction @@ -256,7 +259,8 @@ public class FileDetailsBean extends AVMDetailsBean public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), "details_of") + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, "details_of") + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getCurrentItemId() diff --git a/source/java/org/alfresco/web/bean/wcm/FolderDetailsBean.java b/source/java/org/alfresco/web/bean/wcm/FolderDetailsBean.java index ec06ccb6d2..74d6e0ddfa 100644 --- a/source/java/org/alfresco/web/bean/wcm/FolderDetailsBean.java +++ b/source/java/org/alfresco/web/bean/wcm/FolderDetailsBean.java @@ -42,6 +42,9 @@ public class FolderDetailsBean extends AVMDetailsBean { private static final long serialVersionUID = -2668158215990649862L; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; + /** * @see org.alfresco.web.bean.wcm.AVMDetailsBean#getAvmNode() */ @@ -109,7 +112,8 @@ public class FolderDetailsBean extends AVMDetailsBean public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), "details_of") + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, "details_of") + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } public String getCurrentItemId() diff --git a/source/java/org/alfresco/web/bean/wcm/WebSiteDetailsDialog.java b/source/java/org/alfresco/web/bean/wcm/WebSiteDetailsDialog.java index 9222d27b8f..b1edc494ae 100644 --- a/source/java/org/alfresco/web/bean/wcm/WebSiteDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/WebSiteDetailsDialog.java @@ -50,6 +50,8 @@ public class WebSiteDetailsDialog extends BaseDetailsBean implements NavigationS private static final String MSG_DETAILS_OF = "details_of"; private static final String MSG_LOCATION = "location"; private final static String MSG_CLOSE = "close"; + private final static String MSG_LEFT_QUOTE = "left_qoute"; + private final static String MSG_RIGHT_QUOTE = "right_quote"; /** @@ -240,7 +242,8 @@ public class WebSiteDetailsDialog extends BaseDetailsBean implements NavigationS public String getContainerTitle() { - return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + getName() + "'"; + FacesContext fc = FacesContext.getCurrentInstance(); + return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE); } } diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java index b1157c2ca9..7db949e1eb 100644 --- a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java +++ b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java @@ -564,7 +564,7 @@ public class UIRichList extends UIComponentBase implements IDataContainer,Serial // Private data /** map of available IRichListRenderer instances */ - private final Map viewRenderers = new HashMap(4, 1.0f); + protected final Map viewRenderers = new HashMap(4, 1.0f); // component state private int currentPage = 0; diff --git a/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java index 0adf0123d8..05f7df384c 100644 --- a/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java +++ b/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java @@ -25,7 +25,6 @@ package org.alfresco.web.ui.common.renderer.data; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -175,11 +174,23 @@ public class RichListRenderer extends BaseRenderer private static final long serialVersionUID = -2753231623981676639L; public static final String VIEWMODEID = "details"; + public static final String STALE_CSS= "conflictItemsList"; public String getViewModeID() { return VIEWMODEID; } + + public String getRowStyle(FacesContext context, UIRichList richList, Object row) + { + String rowStyle = (String)richList.getAttributes().get("rowStyleClass"); + String altStyle = (String)richList.getAttributes().get("altRowStyleClass"); + if (altStyle != null && (this.rowIndex++ & 1) == 1) + { + rowStyle = altStyle; + } + return rowStyle; + } public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns) throws IOException @@ -231,13 +242,7 @@ public class RichListRenderer extends BaseRenderer // output row or alt style row if set out.write("'); // find the actions column if it exists @@ -321,7 +326,7 @@ public class RichListRenderer extends BaseRenderer out.write(""); } - private int rowIndex = 0; + protected int rowIndex = 0; } diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIAVMList.java b/source/java/org/alfresco/web/ui/wcm/component/UIAVMList.java new file mode 100644 index 0000000000..f2daab8c38 --- /dev/null +++ b/source/java/org/alfresco/web/ui/wcm/component/UIAVMList.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2005-2007 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing + */ +package org.alfresco.web.ui.wcm.component; + +import org.alfresco.web.ui.common.component.data.UIRichList; +import org.alfresco.web.ui.common.renderer.data.IRichListRenderer; +import org.alfresco.web.ui.wcm.renderer.AVMListRenderer; + +/** + * @author Kevin Roast + */ +public class UIAVMList extends UIRichList +{ + /** + * Default constructor + */ + public UIAVMList() + { + setRendererType("org.alfresco.faces.AVMListRenderer"); + + // instantiate each renderer and add to the list + IRichListRenderer renderer = new AVMListRenderer.DetailsViewRenderer(); + viewRenderers.put(renderer.getViewModeID(), renderer); + } +} \ No newline at end of file diff --git a/source/java/org/alfresco/web/ui/wcm/renderer/AVMListRenderer.java b/source/java/org/alfresco/web/ui/wcm/renderer/AVMListRenderer.java new file mode 100644 index 0000000000..9fe96e712e --- /dev/null +++ b/source/java/org/alfresco/web/ui/wcm/renderer/AVMListRenderer.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2005-2007 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.web.ui.wcm.renderer; + +import javax.faces.context.FacesContext; + +import org.alfresco.service.cmr.avm.AVMNodeDescriptor; +import org.alfresco.service.cmr.avm.AVMService; +import org.alfresco.web.bean.repository.Repository; +import org.alfresco.web.bean.wcm.AVMNode; +import org.alfresco.web.ui.common.component.data.UIRichList; +import org.alfresco.web.ui.common.renderer.data.RichListRenderer; + +/** + * @author kevinr + */ +public class AVMListRenderer extends RichListRenderer +{ + // ------------------------------------------------------------------------------ + // Inner classes + + /** + * Class to implement a Details view for the RichList component + * + * @author kevinr + */ + public static class DetailsViewRenderer extends RichListRenderer.DetailsViewRenderer + { + private static final long serialVersionUID = -2753231623981676638L; + + @Override + public String getRowStyle(FacesContext context, UIRichList richList, Object row) + { + String rowStyle = (String)richList.getAttributes().get("rowStyleClass"); + String altStyle = (String)richList.getAttributes().get("altRowStyleClass"); + if (altStyle != null && (this.rowIndex++ & 1) == 1) + { + rowStyle = altStyle; + } + + if (row instanceof AVMNode) + { + AVMNodeDescriptor avmRef = ((AVMNode)row).getDescriptor(); + + if ((avmRef.isLayeredDirectory() && avmRef.isPrimary()) || avmRef.isLayeredFile()) + { + AVMService avmService = Repository.getServiceRegistry(context).getAVMService(); + if (avmService.lookup(avmRef.getIndirectionVersion(), avmRef.getIndirection()) == null) + { + rowStyle = STALE_CSS; + } + } + } + + return rowStyle; + } + } +} diff --git a/source/java/org/alfresco/web/ui/wcm/tag/AVMListTag.java b/source/java/org/alfresco/web/ui/wcm/tag/AVMListTag.java new file mode 100644 index 0000000000..f28828c34c --- /dev/null +++ b/source/java/org/alfresco/web/ui/wcm/tag/AVMListTag.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2005-2007 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.web.ui.wcm.tag; + +import org.alfresco.web.ui.common.tag.data.RichListTag; + +/** + * @author kevinr + */ +public class AVMListTag extends RichListTag +{ + // ------------------------------------------------------------------------------ + // Component methods + + /** + * @see javax.faces.webapp.UIComponentTag#getComponentType() + */ + @Override + public String getComponentType() + { + return "org.alfresco.faces.AVMList"; + } + + /** + * @see javax.faces.webapp.UIComponentTag#getRendererType() + */ + @Override + public String getRendererType() + { + return "org.alfresco.faces.AVMListRenderer"; + } +} diff --git a/source/web/WEB-INF/faces-config-wcm.xml b/source/web/WEB-INF/faces-config-wcm.xml index 1f6034f1df..7b8fb1ecf6 100644 --- a/source/web/WEB-INF/faces-config-wcm.xml +++ b/source/web/WEB-INF/faces-config-wcm.xml @@ -59,10 +59,21 @@ org.alfresco.web.ui.wcm.component.UILinkValidationReport + + org.alfresco.faces.AVMList + org.alfresco.web.ui.wcm.component.UIAVMList + + + - + + + org.alfresco.faces.Data + org.alfresco.faces.AVMListRenderer + org.alfresco.web.ui.wcm.renderer.AVMListRenderer + + - - + \ No newline at end of file diff --git a/source/web/WEB-INF/wcm.tld b/source/web/WEB-INF/wcm.tld index 2be766371c..a5ebc432f4 100644 --- a/source/web/WEB-INF/wcm.tld +++ b/source/web/WEB-INF/wcm.tld @@ -553,4 +553,120 @@ + + avmList + org.alfresco.web.ui.wcm.tag.AVMListTag + JSP + + + The AVMList component is capable of rendering a list of java bean objects in a single rendering + mode. A List of objects is bound to the component through the value attribute and components + within the list can bind to specific fields (columns) through getter methods for each bean object + within the list. The component provides mechanism to page and sort data through additional + components + + + + id + false + true + + + + value + false + true + + + + binding + false + true + + + + rendered + false + true + + + + styleClass + false + true + + + + style + false + true + + + + headerStyleClass + false + true + + + + rowStyleClass + false + true + + + + altRowStyleClass + false + true + + + + width + false + true + + + + var + false + true + + + + initialSortColumn + false + true + + + + initialSortDescending + false + true + + + + listConfig + false + true + + + + viewMode + false + true + + + + pageSize + false + true + + + + refreshOnBind + false + true + + + diff --git a/source/web/jsp/actions/mail.jsp b/source/web/jsp/actions/mail.jsp index 21167ed1aa..32d32ff510 100644 --- a/source/web/jsp/actions/mail.jsp +++ b/source/web/jsp/actions/mail.jsp @@ -224,7 +224,7 @@ <%-- Templates drop-down selector --%> - + diff --git a/source/web/jsp/content/add-content-dialog.jsp b/source/web/jsp/content/add-content-dialog.jsp index 8389a93328..76375f9ff0 100644 --- a/source/web/jsp/content/add-content-dialog.jsp +++ b/source/web/jsp/content/add-content-dialog.jsp @@ -119,7 +119,7 @@ if (fileUploaded) - + @@ -184,14 +184,14 @@ if (fileUploaded) function pageLoaded() { <% if (fileUploaded) { %> - document.getElementById("dialog").onsubmit = validate; + document.getElementById("dialog").onsubmit = validateDialog; <% } %> document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} } function checkButtonState() { - if (document.getElementById("dialog:dialog-body:file-name").value.length == 0 ) + if (document.getElementById("dialog:dialog-body:name").value.length == 0 ) { document.getElementById("dialog:finish-button").disabled = true; } @@ -200,19 +200,5 @@ if (fileUploaded) document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:file-name"), - unescape(''), true); - } - else - { - return true; - } - } \ No newline at end of file diff --git a/source/web/jsp/content/create-content-wizard/details.jsp b/source/web/jsp/content/create-content-wizard/details.jsp index 402a7382f7..30456f1361 100644 --- a/source/web/jsp/content/create-content-wizard/details.jsp +++ b/source/web/jsp/content/create-content-wizard/details.jsp @@ -36,15 +36,15 @@ function pageLoaded() { - document.getElementById("wizard:wizard-body:file-name").focus(); - document.getElementById("wizard").onsubmit = validate; + document.getElementById("wizard:wizard-body:name").focus(); + document.getElementById("wizard").onsubmit = validateWizard; document.getElementById("wizard:next-button").onclick = function() {finishButtonPressed = true; clear_wizard();} document.getElementById("wizard:finish-button").onclick = function() {finishButtonPressed = true; clear_wizard();} } function checkButtonState() { - if (document.getElementById("wizard:wizard-body:file-name").value.length == 0 ) + if (document.getElementById("wizard:wizard-body:name").value.length == 0 ) { document.getElementById("wizard:next-button").disabled = true; //document.getElementById("wizard:finish-button").disabled = true; @@ -56,21 +56,6 @@ } } - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("wizard:wizard-body:file-name"), - unescape(''), - true); - } - else - { - return true; - } - } - function formChanged() { if (document.getElementById("wizard:wizard-body:form-name").value != "") @@ -95,7 +80,7 @@ - diff --git a/source/web/jsp/content/versioned-details.jsp b/source/web/jsp/content/versioned-details.jsp index d216b8fed5..75eacbedea 100644 --- a/source/web/jsp/content/versioned-details.jsp +++ b/source/web/jsp/content/versioned-details.jsp @@ -86,10 +86,10 @@
- '' +
- : ' + :
diff --git a/source/web/jsp/dialog/container.jsp b/source/web/jsp/dialog/container.jsp index 58683baeb3..d643aeac97 100644 --- a/source/web/jsp/dialog/container.jsp +++ b/source/web/jsp/dialog/container.jsp @@ -188,6 +188,7 @@ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> diff --git a/source/web/jsp/forums/create-dialog.jsp b/source/web/jsp/forums/create-dialog.jsp index 314240d2f2..4448461d4d 100644 --- a/source/web/jsp/forums/create-dialog.jsp +++ b/source/web/jsp/forums/create-dialog.jsp @@ -38,7 +38,7 @@ function pageLoaded() { document.getElementById("dialog:dialog-body:name").focus(); - document.getElementById("dialog").onsubmit = validate; + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} checkButtonState(); } @@ -54,21 +54,6 @@ document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:name"), - unescape('
'), - true); - } - else - { - return true; - } - } diff --git a/source/web/jsp/forums/create-topic-dialog.jsp b/source/web/jsp/forums/create-topic-dialog.jsp index eb4392b778..d64c955203 100644 --- a/source/web/jsp/forums/create-topic-dialog.jsp +++ b/source/web/jsp/forums/create-topic-dialog.jsp @@ -38,7 +38,7 @@ function pageLoaded() { document.getElementById("dialog:dialog-body:name").focus(); - document.getElementById("dialog").onsubmit = validate; + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} checkButtonState(); } @@ -55,21 +55,6 @@ document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:name"), - unescape(''), - true); - } - else - { - return true; - } - } diff --git a/source/web/jsp/ml/add-translation-dialog.jsp b/source/web/jsp/ml/add-translation-dialog.jsp index dceac98ca2..dd185ff97c 100644 --- a/source/web/jsp/ml/add-translation-dialog.jsp +++ b/source/web/jsp/ml/add-translation-dialog.jsp @@ -122,7 +122,7 @@ - + @@ -191,13 +191,14 @@ function pageLoaded() { + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_add_2Dcontent_2Dupload_2Dend();} checkButtonState(); } function checkButtonState() { - if (document.getElementById("dialog:dialog-body:file-name").value.length == 0 + if (document.getElementById("dialog:dialog-body:name").value.length == 0 || document.getElementById("dialog:dialog-body:language").selectedIndex == 0) { document.getElementById("dialog:finish-button").disabled = true; @@ -208,19 +209,5 @@ } } - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:file-name"), - unescape(''), true); - } - else - { - return true; - } - } - \ No newline at end of file diff --git a/source/web/jsp/spaces/create-space-dialog.jsp b/source/web/jsp/spaces/create-space-dialog.jsp index bcbd83e1df..bf2602425b 100644 --- a/source/web/jsp/spaces/create-space-dialog.jsp +++ b/source/web/jsp/spaces/create-space-dialog.jsp @@ -38,7 +38,7 @@ function pageLoaded() { document.getElementById("dialog:dialog-body:name").focus(); - document.getElementById("dialog").onsubmit = validate; + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} checkButtonState(); } @@ -54,21 +54,6 @@ document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:name"), - unescape(''), - true); - } - else - { - return true; - } - } diff --git a/source/web/jsp/spaces/create-space-wizard/details.jsp b/source/web/jsp/spaces/create-space-wizard/details.jsp index 093da9369d..a13bc3ff3d 100644 --- a/source/web/jsp/spaces/create-space-wizard/details.jsp +++ b/source/web/jsp/spaces/create-space-wizard/details.jsp @@ -41,7 +41,7 @@ function pageLoaded() { document.getElementById("wizard:wizard-body:name").focus(); - document.getElementById("wizard").onsubmit = validate; + document.getElementById("wizard").onsubmit = validateWizard; document.getElementById("wizard:next-button").onclick = function() {finishButtonPressed = true; clear_wizard();} document.getElementById("wizard:finish-button").onclick = function() {finishButtonPressed = true; clear_wizard();} checkButtonState(); @@ -77,21 +77,7 @@ checkButtonState(); } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("wizard:wizard-body:name"), - unescape(''), - true); - } - else - { - return true; - } - } + diff --git a/source/web/jsp/wcm/add-content-dialog.jsp b/source/web/jsp/wcm/add-content-dialog.jsp index 683b9ada5b..6632a47605 100644 --- a/source/web/jsp/wcm/add-content-dialog.jsp +++ b/source/web/jsp/wcm/add-content-dialog.jsp @@ -133,7 +133,7 @@ - + @@ -176,12 +176,13 @@ function pageLoaded() { + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} } function checkButtonState() { - if (document.getElementById("dialog:dialog-body:file-name").value.length == 0 ) + if (document.getElementById("dialog:dialog-body:name").value.length == 0 ) { document.getElementById("dialog:finish-button").disabled = true; } @@ -190,20 +191,6 @@ document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:file-name"), - unescape(''), true); - } - else - { - return true; - } - } - + \ No newline at end of file diff --git a/source/web/jsp/wcm/browse-sandbox.jsp b/source/web/jsp/wcm/browse-sandbox.jsp index 92cd2b5983..a5bba6ae01 100644 --- a/source/web/jsp/wcm/browse-sandbox.jsp +++ b/source/web/jsp/wcm/browse-sandbox.jsp @@ -220,7 +220,7 @@ - @@ -305,7 +305,7 @@ - + @@ -330,7 +330,7 @@ - @@ -402,10 +402,18 @@ - <%-- Content Actions column --%> - + <%-- Type column --%> + - + + + + + + <%-- Content Actions column --%> + + + <%-- actions are configured in web-client-config-wcm-actions.xml --%> @@ -414,7 +422,7 @@ - + diff --git a/source/web/jsp/wcm/create-folder-dialog.jsp b/source/web/jsp/wcm/create-folder-dialog.jsp index 9335af6a6e..3c5c70b7b4 100644 --- a/source/web/jsp/wcm/create-folder-dialog.jsp +++ b/source/web/jsp/wcm/create-folder-dialog.jsp @@ -37,7 +37,7 @@ function pageLoaded() { document.getElementById("dialog:dialog-body:name").focus(); - document.getElementById("dialog").onsubmit = validate; + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} checkButtonState(); } @@ -53,22 +53,6 @@ document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:name"), - unescape(''), - true); - } - else - { - return true; - } - } - diff --git a/source/web/jsp/wcm/create-web-content-wizard/details.jsp b/source/web/jsp/wcm/create-web-content-wizard/details.jsp index 017bc7308e..3752a036e2 100644 --- a/source/web/jsp/wcm/create-web-content-wizard/details.jsp +++ b/source/web/jsp/wcm/create-web-content-wizard/details.jsp @@ -36,15 +36,15 @@ function pageLoaded() { - document.getElementById("wizard:wizard-body:file-name").focus(); - document.getElementById("wizard").onsubmit = validate; + document.getElementById("wizard:wizard-body:name").focus(); + document.getElementById("wizard").onsubmit = validateWizard; document.getElementById("wizard:next-button").onclick = function() {finishButtonPressed = true; clear_wizard();} document.getElementById("wizard:finish-button").onclick = function() {finishButtonPressed = true; clear_wizard();} } function checkButtonState() { - if (document.getElementById("wizard:wizard-body:file-name").value.length == 0 ) + if (document.getElementById("wizard:wizard-body:name").value.length == 0 ) { document.getElementById("wizard:next-button").disabled = true; document.getElementById("wizard:finish-button").disabled = true; @@ -55,21 +55,6 @@ document.getElementById("wizard:finish-button").disabled = true; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("wizard:wizard-body:file-name"), - unescape(''), - true); - } - else - { - return true; - } - } function mimeTypeChanged(event) { @@ -86,7 +71,7 @@ - diff --git a/source/web/jsp/wcm/create-webapp.jsp b/source/web/jsp/wcm/create-webapp.jsp index 7704ed88f4..bdb4d3af06 100644 --- a/source/web/jsp/wcm/create-webapp.jsp +++ b/source/web/jsp/wcm/create-webapp.jsp @@ -37,7 +37,7 @@ function pageLoaded() { document.getElementById("dialog:dialog-body:name").focus(); - document.getElementById("dialog").onsubmit = validate; + document.getElementById("dialog").onsubmit = validateDialog; document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();} checkButtonState(); } @@ -53,21 +53,6 @@ document.getElementById("dialog:finish-button").disabled = false; } } - - function validate() - { - if (finishButtonPressed) - { - finishButtonPressed = false; - return validateName(document.getElementById("dialog:dialog-body:name"), - unescape(''), - true); - } - else - { - return true; - } - } diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp index afffcb7555..03f241d4f1 100644 --- a/source/web/jsp/wcm/create-website-wizard/details.jsp +++ b/source/web/jsp/wcm/create-website-wizard/details.jsp @@ -63,14 +63,16 @@ if (finishButtonPressed) { finishButtonPressed = false; + var message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText; var valid = validateName(document.getElementById("wizard:wizard-body:name"), - unescape(''), + message, true); if (valid == true) { + message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_dns_name").textContent : $("wizard:wizard-body:validation_invalid_dns_name").innerText; valid = validateRegex(document.getElementById("wizard:wizard-body:dnsname"), "^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$", true, null, - unescape(''), true); + message, true); } return valid; } @@ -86,7 +88,8 @@ d.style.display = d.style.display == 'block' ? 'none' : 'block'; } - +
diff --git a/source/web/scripts/validation.js b/source/web/scripts/validation.js index 935aebe0ec..1110819951 100644 --- a/source/web/scripts/validation.js +++ b/source/web/scripts/validation.js @@ -138,6 +138,34 @@ function validateName(control, message, showMessage) return result; } +function validateDialog() +{ + if (finishButtonPressed) + { + finishButtonPressed = false; + var message = (window.gecko) ? $("dialog:dialog-body:validation_invalid_character").textContent : $("dialog:dialog-body:validation_invalid_character").innerText; + return validateName($("dialog:dialog-body:name"), message, true); + } + else + { + return true; + } +} + +function validateWizard() +{ + if (finishButtonPressed) + { + finishButtonPressed = false; + var message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText; + return validateName($("wizard:wizard-body:name"), message, true); + } + else + { + return true; + } +} + /** * Decodes the given string *
diff --git a/source/web/jsp/wcm/manage-review-task-dialog.jsp b/source/web/jsp/wcm/manage-review-task-dialog.jsp index baef271ad4..249f65968d 100644 --- a/source/web/jsp/wcm/manage-review-task-dialog.jsp +++ b/source/web/jsp/wcm/manage-review-task-dialog.jsp @@ -77,9 +77,9 @@ border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"> - + - - + +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ taglib uri="/WEB-INF/wcm.tld" prefix="w" %> + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- Name column --%> + + + + + + + + + + + + + + + + <%-- Description column --%> + + + + + + + + <%-- Path column --%> + + + + + + + + <%-- Created Date column --%> + + + + + + + + + + <%-- Modified Date column --%> + + + + + + + + + + <%-- Actions column --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + + + + + + + diff --git a/source/web/jsp/wcm/workflow-file-details.jsp b/source/web/jsp/wcm/workflow-file-details.jsp new file mode 100755 index 0000000000..bf7f5ea06f --- /dev/null +++ b/source/web/jsp/wcm/workflow-file-details.jsp @@ -0,0 +1,121 @@ +<%-- + * Copyright (C) 2005-2007 Alfresco Software Limited. + + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" +--%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%> +<%@ taglib uri="/WEB-INF/wcm.tld" prefix="w" %> + +<%@ page import="org.alfresco.web.ui.common.PanelGenerator"%> + + + + + + +
+ + + + + + + + +
+
+ +
+ + + + + + + + + +
+ + <%-- icon image for the doc --%> + + + + + + + + +
+
+ +
+
+
+ <%-- properties for the doc --%> + +
+
+ +
+ + + + + + <%-- Primary column --%> + + + + + + + + <%-- Modified Date column --%> + + + + + + + + + + <%-- actions --%> + + + + + + + + + +
\ No newline at end of file diff --git a/source/web/jsp/wizard/container.jsp b/source/web/jsp/wizard/container.jsp index 42d0057433..ca4411c4ea 100644 --- a/source/web/jsp/wizard/container.jsp +++ b/source/web/jsp/wizard/container.jsp @@ -130,6 +130,7 @@
+