From aa417e841fb33d40ec05584593385611c21bbe0d Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Tue, 2 May 2006 10:44:51 +0000 Subject: [PATCH] converted new rule/run action wizard to new framework git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 108 +- config/alfresco/web-client-config-actions.xml | 5 +- config/alfresco/web-client-config-dialogs.xml | 4 +- config/alfresco/web-client-config-wizards.xml | 79 +- .../web/bean/DocumentDetailsBean.java | 32 +- .../{wizard => actions}/BaseActionWizard.java | 1580 +++++++++-------- .../web/bean/actions/RunActionWizard.java | 93 + .../web/bean/dialog/BaseDialogBean.java | 12 +- .../web/bean/rules/CreateRuleWizard.java | 811 +++++++++ .../web/bean/rules/EditRuleWizard.java | 310 ++++ .../web/bean/{ => rules}/RulesBean.java | 6 +- .../web/bean/spaces/CreateSpaceDialog.java | 2 +- .../web/bean/spaces/CreateSpaceWizard.java | 2 +- .../web/bean/wizard/NewActionWizard.java | 236 --- .../web/bean/wizard/NewRuleWizard.java | 1516 ---------------- source/web/WEB-INF/faces-config-beans.xml | 67 +- source/web/jsp/actions/actions.jsp | 154 ++ .../add-features.jsp} | 22 +- .../check-in.jsp} | 324 ++-- .../check-out.jsp} | 316 ++-- .../action-move.jsp => actions/copy.jsp} | 316 ++-- .../action-import.jsp => actions/import.jsp} | 340 ++-- .../link-category.jsp} | 314 ++-- .../action-email.jsp => actions/mail.jsp} | 512 +++--- .../action-copy.jsp => actions/move.jsp} | 316 ++-- .../remove-features.jsp} | 22 +- .../simple-workflow.jsp} | 574 +++--- .../specialise-type.jsp} | 312 ++-- .../transform-image.jsp} | 346 ++-- .../transform.jsp} | 334 ++-- source/web/jsp/browse/browse.jsp | 2 +- source/web/jsp/dialog/rules.jsp | 10 +- .../compare-mime-type.jsp} | 330 ++-- .../compare-property-value.jsp} | 364 ++-- source/web/jsp/rules/conditions.jsp | 154 ++ source/web/jsp/rules/details.jsp | 127 ++ .../has-aspect.jsp} | 330 ++-- .../in-category.jsp} | 332 ++-- .../is-subtype.jsp} | 24 +- source/web/jsp/test/_template.jsp | 157 -- source/web/jsp/test/adduser.jsp | 42 - source/web/jsp/test/edituser.jsp | 42 - source/web/jsp/test/userform.jsp | 89 - source/web/jsp/test/userlist.jsp | 108 -- source/web/jsp/wizard/container.jsp | 5 +- .../create-action/action-add-features.jsp | 182 -- .../wizard/create-action/action-check-in.jsp | 188 -- .../wizard/create-action/action-check-out.jsp | 185 -- .../jsp/wizard/create-action/action-copy.jsp | 185 -- .../jsp/wizard/create-action/action-email.jsp | 283 --- .../wizard/create-action/action-import.jsp | 196 -- .../create-action/action-link-category.jsp | 184 -- .../jsp/wizard/create-action/action-move.jsp | 185 -- .../create-action/action-remove-features.jsp | 182 -- .../create-action/action-simple-workflow.jsp | 316 ---- .../create-action/action-specialise-type.jsp | 182 -- .../create-action/action-transform-image.jsp | 200 --- .../wizard/create-action/action-transform.jsp | 194 -- .../web/jsp/wizard/create-action/action.jsp | 195 -- .../web/jsp/wizard/create-action/summary.jsp | 174 -- source/web/jsp/wizard/new-rule/action.jsp | 265 --- source/web/jsp/wizard/new-rule/condition.jsp | 283 --- source/web/jsp/wizard/new-rule/details.jsp | 229 --- source/web/jsp/wizard/new-rule/summary.jsp | 175 -- 64 files changed, 5448 insertions(+), 9716 deletions(-) rename source/java/org/alfresco/web/bean/{wizard => actions}/BaseActionWizard.java (67%) create mode 100644 source/java/org/alfresco/web/bean/actions/RunActionWizard.java create mode 100644 source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java create mode 100644 source/java/org/alfresco/web/bean/rules/EditRuleWizard.java rename source/java/org/alfresco/web/bean/{ => rules}/RulesBean.java (94%) delete mode 100644 source/java/org/alfresco/web/bean/wizard/NewActionWizard.java delete mode 100644 source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java create mode 100644 source/web/jsp/actions/actions.jsp rename source/web/jsp/{wizard/new-rule/action-remove-features.jsp => actions/add-features.jsp} (91%) rename source/web/jsp/{wizard/new-rule/action-check-in.jsp => actions/check-in.jsp} (90%) rename source/web/jsp/{wizard/new-rule/action-check-out.jsp => actions/check-out.jsp} (89%) rename source/web/jsp/{wizard/new-rule/action-move.jsp => actions/copy.jsp} (90%) rename source/web/jsp/{wizard/new-rule/action-import.jsp => actions/import.jsp} (89%) rename source/web/jsp/{wizard/new-rule/action-link-category.jsp => actions/link-category.jsp} (89%) rename source/web/jsp/{wizard/new-rule/action-email.jsp => actions/mail.jsp} (85%) rename source/web/jsp/{wizard/new-rule/action-copy.jsp => actions/move.jsp} (90%) rename source/web/jsp/{wizard/new-rule/action-specialise-type.jsp => actions/remove-features.jsp} (91%) rename source/web/jsp/{wizard/new-rule/action-simple-workflow.jsp => actions/simple-workflow.jsp} (86%) rename source/web/jsp/{wizard/new-rule/action-add-features.jsp => actions/specialise-type.jsp} (89%) rename source/web/jsp/{wizard/new-rule/action-transform-image.jsp => actions/transform-image.jsp} (88%) rename source/web/jsp/{wizard/new-rule/action-transform.jsp => actions/transform.jsp} (89%) rename source/web/jsp/{wizard/new-rule/condition-is-subtype.jsp => rules/compare-mime-type.jsp} (89%) rename source/web/jsp/{wizard/new-rule/condition-contains-text.jsp => rules/compare-property-value.jsp} (89%) create mode 100644 source/web/jsp/rules/conditions.jsp create mode 100644 source/web/jsp/rules/details.jsp rename source/web/jsp/{wizard/new-rule/condition-has-aspect.jsp => rules/has-aspect.jsp} (89%) rename source/web/jsp/{wizard/new-rule/condition-in-category.jsp => rules/in-category.jsp} (89%) rename source/web/jsp/{wizard/new-rule/condition-has-mimetype.jsp => rules/is-subtype.jsp} (91%) delete mode 100644 source/web/jsp/test/_template.jsp delete mode 100644 source/web/jsp/test/adduser.jsp delete mode 100644 source/web/jsp/test/edituser.jsp delete mode 100644 source/web/jsp/test/userform.jsp delete mode 100644 source/web/jsp/test/userlist.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-add-features.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-check-in.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-check-out.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-copy.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-email.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-import.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-link-category.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-move.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-remove-features.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-simple-workflow.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-specialise-type.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-transform-image.jsp delete mode 100644 source/web/jsp/wizard/create-action/action-transform.jsp delete mode 100644 source/web/jsp/wizard/create-action/action.jsp delete mode 100644 source/web/jsp/wizard/create-action/summary.jsp delete mode 100644 source/web/jsp/wizard/new-rule/action.jsp delete mode 100644 source/web/jsp/wizard/new-rule/condition.jsp delete mode 100644 source/web/jsp/wizard/new-rule/details.jsp delete mode 100644 source/web/jsp/wizard/new-rule/summary.jsp diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 4211568f63..3200138f61 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -32,7 +32,7 @@ editcategory_description=Set the category for the document then click OK. editworkflow_description=Modify the simple workflow properties then click OK. editspace_description=Modify the space properties then click OK. editlink_description=Modify the link object properties then click OK. -newspace_description=Enter information about the new space then click Create Space. +create_space_description=Enter information about the new space then click Create Space. space_rules_description=This view shows you all the rules to be applied to content in this space. warning_inline=This is only recommended for HTML or plain text documents. categories_description=This view allows you to browse and modify the categories hiearchy. @@ -216,7 +216,7 @@ delete_file=Delete File delete_rule=Delete Rule delete_user=Delete User remove_user=Remove User -new_space=Create Space +create_space=Create Space add_content=Add Content create_content=Create Content add_multiple_files=Add Multiple Files @@ -609,20 +609,19 @@ text_content=Plain Text Content html_content=HTML Content # Rule and Action Wizard messages -create_action_title=Custom Action Wizard -create_action_desc=This wizard helps you create a custom action for -create_action_step1_title=Step One - Select Action -create_action_step2_title=Step Two - Action Settings -create_action_finish_instruction=To execute the action click Finish. To review or change your selections click Back. -new_rule_title=New Rule Wizard -new_rule_title_edit=Edit Rule Wizard -new_rule_desc=This wizard helps you create a new rule. -new_rule_desc_edit=This wizard helps you modify a rule. -new_rule_step1_title=Step One - Enter Details -new_rule_step2_title=Step Two - Select Conditions -new_rule_step3_title=Step Three - Select Actions -new_rule_finish_instruction=To create the rule click Finish. To review or change your selections click Back. -new_rule_finish_instruction_edit=To update the rule click Finish. To review or change your selections click Back. +run_action_title=Run Action Wizard +run_action_desc=This wizard helps you run an action +run_action_step1_title=Step One - Select Actions +run_action_finish_instruction=To execute the action click Finish. To review or change your selections click Back. +create_rule_title=Create Rule Wizard +create_rule_desc=This wizard helps you create a new rule. +create_rule_step1_title=Step One - Select Conditions +create_rule_step2_title=Step Two - Select Actions +create_rule_step3_title=Step Three - Enter Details +create_rule_finish_instruction=To create the rule click Finish. To review or change your selections click Back. +edit_rule_title=Edit Rule Wizard +edit_rule_desc=This wizard helps you modify a rule. +edit_rule_finish_instruction=To update the rule click Finish. To review or change your selections click Back. select_action=Select Action select_an_action=Select an action... action=Action @@ -704,16 +703,16 @@ email_message=Email message insert_template=Insert Template discard_template=Discard Template -# New Space Wizard messages -new_space_title=New Space Wizard -new_space_desc=This wizard helps you to create a new space. -new_space_step1_title=Step One - Starting Space -new_space_step1_desc=Choose how you want to create your space. -new_space_step2_title=Step Two - Space Options -new_space_step2_desc=Select space options. -new_space_step3_title=Step Three - Space Details -new_space_step3_desc=Enter information about the space. -new_space_finish_instruction=To close this wizard and create your space click Finish. To review or change your selections click Back. +# Create Space Wizard messages +create_space_title=Create Space Wizard +create_space_desc=This wizard helps you to create a new space. +create_space_step1_title=Step One - Starting Space +create_space_step1_desc=Choose how you want to create your space. +create_space_step2_title=Step Two - Space Options +create_space_step2_desc=Select space options. +create_space_step3_title=Step Three - Space Details +create_space_step3_desc=Enter information about the space. +create_space_finish_instruction=To close this wizard and create your space click Finish. To review or change your selections click Back. scratch=Scratch an_existing_space=An existing space a_template=A template @@ -852,43 +851,24 @@ title_add_content_upload=Add Content - Upload title_create_content=Create New Content title_create_content_props=Create New Content - Properties title_create_content_summary=Create New Content - Summary -title_create_action_action=Create Action - Select Action -title_create_action_add_feature=Create Action - Add Features -title_create_action_remove_feature=Create Action - Remove Features -title_create_action_checkin=Create Action - Check In -title_create_action_checkout=Create Action - Check Out -title_create_action_copy=Create Action - Copy -title_create_action_import=Create Action - Import -title_create_action_email=Create Action - Email -title_create_action_link_category=Create Action - Link Category -title_create_action_move=Create Action - Move -title_create_action_simple_workflow=Create Action - Simple Workflow -title_create_action_transform=Create Action - Transform -title_create_action_transform_image=Create Action - Transform Image -title_create_specialise_action=Create Action - Specialise Type -title_create_action_summary=Create Action - Summary -title_new_rule_action=New Rule - Select Action -title_new_rule_add_feature=New Rule - Add Features -title_new_rule_remove_feature=New Rule - Remove Features -title_specialise_type_action=New Rule - Specialise Type -title_new_rule_checkin=New Rule - Check In -title_new_rule_checkout=New Rule - Check Out -title_new_rule_copy=New Rule - Copy -title_new_rule_email=New Rule - Email -title_new_rule_link_category=New Rule - Link Category -title_new_rule_move=New Rule - Move -title_new_rule_simple_workflow=New Rule - Simple Workflow -title_new_rule_transform=New Rule - Transform -title_new_rule_transform_image=New Rule - Transform Image -title_new_rule_import=New Rule - Import -title_new_rule_condition=New Rule - Conditions -title_new_rule_cond_contains=New Rule - Contains Text -title_new_rule_cond_mimetype=New Rule - Has Mimetype -title_new_rule_cond_category=New Rule - In Category -title_new_rule_cond_subtype=New Rule - Is Subtype -title_new_rule_cond_aspect=New Rule - Has Subtype -title_new_rule_details=New Rule - Details -title_new_rule_summary=New Rule - Summary +title_action_add_feature=Add Feature Action +title_action_remove_feature=Remove Feature Action +title_action_checkin=Check In Action +title_action_checkout=Check Out Action +title_action_copy=Copy Action +title_action_move=Move Action +title_action_import=Import Action +title_action_email=Email Action +title_action_link_category=Link Category Action +title_action_simple_workflow=Simple Workflow Action +title_action_transform=Transform Action +title_action_transform_image=Transform Image Action +title_action_specialise_type=Specialise Type Action +title_condition_contains_text=Contains Text Condition +title_condition_has_mimetype=Has Mimetype Condition +title_condition_in_category=In Category Condition +title_condition_is_subtype=Is Subtype Condition +title_condition_has_aspect=Has Aspect Condition title_new_user_person_props=User - Person Properties title_new_user_user_props=User - User Properties title_new_user_summary=User - Summary @@ -936,7 +916,7 @@ error_paste=Unable to paste item due to system error: error_login_user=Unable to login - unknown username/password. error_login_missing=Must specify username and password. error_delete_rule=Unable to delete Rule due to system error: -error_action=Failed to run Action due to error: {0} +error_actions=Failed to run Actions due to error: {0} error_rule=Failed to create Rule due to error: {0} error_space=Failed to create new space due to error: {0} error_person=Failed to create Person due to error: {0} diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 78490a7051..25390e3ae1 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -327,7 +327,7 @@ CreateChildren - new_space + create_space /images/icons/create_space.gif dialog:createSpace @@ -421,8 +421,7 @@ other_action /images/icons/action.gif - createAction - #{NewActionWizard.startWizard} + wizard:runAction diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index 16d27f0b88..4cff4bd139 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -5,8 +5,8 @@ + icon="/images/icons/create_space_large.gif" title-id="create_space" + description-id="create_space_description" /> - + - + - + + instruction-id="create_space_finish_instruction" /> + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java index 4f82622101..c168596c07 100644 --- a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java +++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java @@ -44,10 +44,10 @@ import org.alfresco.service.namespace.QName; import org.alfresco.web.app.Application; import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.app.servlet.DownloadContentServlet; +import org.alfresco.web.bean.actions.BaseActionWizard; import org.alfresco.web.bean.repository.MapNode; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.bean.wizard.NewRuleWizard; import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.Utils.URLMode; import org.alfresco.web.ui.common.component.UIActionLink; @@ -489,25 +489,25 @@ public class DocumentDetailsBean extends BaseDetailsBean // put the workflow properties in a separate map for use by the JSP this.workflowProperties = new HashMap(7); - this.workflowProperties.put(NewRuleWizard.PROP_APPROVE_STEP_NAME, + this.workflowProperties.put(BaseActionWizard.PROP_APPROVE_STEP_NAME, approveStepName); - this.workflowProperties.put(NewRuleWizard.PROP_APPROVE_ACTION, + this.workflowProperties.put(BaseActionWizard.PROP_APPROVE_ACTION, approveMove ? "move" : "copy"); - this.workflowProperties.put(NewRuleWizard.PROP_APPROVE_FOLDER, approveFolder); + this.workflowProperties.put(BaseActionWizard.PROP_APPROVE_FOLDER, approveFolder); if (rejectStepName == null || rejectMove == null || rejectFolder == null) { - this.workflowProperties.put(NewRuleWizard.PROP_REJECT_STEP_PRESENT, "no"); + this.workflowProperties.put(BaseActionWizard.PROP_REJECT_STEP_PRESENT, "no"); } else { - this.workflowProperties.put(NewRuleWizard.PROP_REJECT_STEP_PRESENT, + this.workflowProperties.put(BaseActionWizard.PROP_REJECT_STEP_PRESENT, "yes"); - this.workflowProperties.put(NewRuleWizard.PROP_REJECT_STEP_NAME, + this.workflowProperties.put(BaseActionWizard.PROP_REJECT_STEP_NAME, rejectStepName); - this.workflowProperties.put(NewRuleWizard.PROP_REJECT_ACTION, + this.workflowProperties.put(BaseActionWizard.PROP_REJECT_ACTION, rejectMove ? "move" : "copy"); - this.workflowProperties.put(NewRuleWizard.PROP_REJECT_FOLDER, + this.workflowProperties.put(BaseActionWizard.PROP_REJECT_FOLDER, rejectFolder); } } @@ -553,11 +553,11 @@ public class DocumentDetailsBean extends BaseDetailsBean // set the approve step name updateProps.put(ContentModel.PROP_APPROVE_STEP, - this.workflowProperties.get(NewRuleWizard.PROP_APPROVE_STEP_NAME)); + this.workflowProperties.get(BaseActionWizard.PROP_APPROVE_STEP_NAME)); // specify whether the approve step will copy or move the content boolean approveMove = true; - String approveAction = (String)this.workflowProperties.get(NewRuleWizard.PROP_APPROVE_ACTION); + String approveAction = (String)this.workflowProperties.get(BaseActionWizard.PROP_APPROVE_ACTION); if (approveAction != null && approveAction.equals("copy")) { approveMove = false; @@ -566,12 +566,12 @@ public class DocumentDetailsBean extends BaseDetailsBean // create node ref representation of the destination folder updateProps.put(ContentModel.PROP_APPROVE_FOLDER, - this.workflowProperties.get(NewRuleWizard.PROP_APPROVE_FOLDER)); + this.workflowProperties.get(BaseActionWizard.PROP_APPROVE_FOLDER)); // determine whether there should be a reject step boolean requireReject = true; String rejectStepPresent = (String)this.workflowProperties.get( - NewRuleWizard.PROP_REJECT_STEP_PRESENT); + BaseActionWizard.PROP_REJECT_STEP_PRESENT); if (rejectStepPresent != null && rejectStepPresent.equals("no")) { requireReject = false; @@ -581,12 +581,12 @@ public class DocumentDetailsBean extends BaseDetailsBean { // set the reject step name updateProps.put(ContentModel.PROP_REJECT_STEP, - this.workflowProperties.get(NewRuleWizard.PROP_REJECT_STEP_NAME)); + this.workflowProperties.get(BaseActionWizard.PROP_REJECT_STEP_NAME)); // specify whether the reject step will copy or move the content boolean rejectMove = true; String rejectAction = (String)this.workflowProperties.get( - NewRuleWizard.PROP_REJECT_ACTION); + BaseActionWizard.PROP_REJECT_ACTION); if (rejectAction != null && rejectAction.equals("copy")) { rejectMove = false; @@ -595,7 +595,7 @@ public class DocumentDetailsBean extends BaseDetailsBean // create node ref representation of the destination folder updateProps.put(ContentModel.PROP_REJECT_FOLDER, - this.workflowProperties.get(NewRuleWizard.PROP_REJECT_FOLDER)); + this.workflowProperties.get(BaseActionWizard.PROP_REJECT_FOLDER)); } else { diff --git a/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java similarity index 67% rename from source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java rename to source/java/org/alfresco/web/bean/actions/BaseActionWizard.java index 541b9650bd..dd72d62abb 100644 --- a/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java +++ b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java @@ -1,20 +1,4 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package org.alfresco.web.bean.wizard; +package org.alfresco.web.bean.actions; import java.io.Serializable; import java.text.MessageFormat; @@ -23,6 +7,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.faces.application.ViewHandler; +import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; import javax.faces.model.DataModel; @@ -63,6 +49,7 @@ import org.alfresco.web.app.Application; import org.alfresco.web.bean.TemplateSupportBean; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; +import org.alfresco.web.bean.wizard.BaseWizardBean; import org.alfresco.web.data.IDataContainer; import org.alfresco.web.data.QuickSort; import org.alfresco.web.ui.common.Utils; @@ -71,15 +58,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * Base handler class containing common code used by the New Space Wizard and New Action Wizard + * Base class for the "Run Action" and "Create Rule" wizards. * - * @author gavinc kevinr + * @author gavinc */ -public abstract class BaseActionWizard extends AbstractWizardBean +public abstract class BaseActionWizard extends BaseWizardBean { - private static final Log logger = LogFactory.getLog(BaseActionWizard.class); - - // parameter names for actions + public static final String PROP_ACTION_NAME = "actionName"; + public static final String PROP_ACTION_SUMMARY = "actionSummary"; public static final String PROP_CATEGORY = "category"; public static final String PROP_ASPECT = "aspect"; public static final String PROP_DESTINATION = "destinationLocation"; @@ -102,13 +88,12 @@ public abstract class BaseActionWizard extends AbstractWizardBean public static final String PROP_FROM = "from"; public static final String PROP_TEMPLATE = "template"; public static final String PROP_OBJECT_TYPE = "objecttype"; - - private static final String IMPORT_ENCODING = "UTF-8"; - - // new rule/action wizard specific properties - protected boolean multiActionMode = false; - protected String action; - protected String usingTemplate = null; + public static final String PROP_PROPERTY = "property"; + public static final String PROP_CONTAINS_TEXT = "containstext"; + public static final String PROP_MODEL_TYPE = "modeltype"; + public static final String PROP_MIMETYPE = "mimetype"; + public static final String PROP_MODEL_ASPECT = "modelaspect"; + public static final String PROP_TYPE_OR_ASPECT = "typeoraspect"; protected ActionService actionService; protected DictionaryService dictionaryService; @@ -122,35 +107,42 @@ public abstract class BaseActionWizard extends AbstractWizardBean protected List aspects; protected List users; protected List encodings; - protected Map actionDescriptions; - protected Map currentActionProperties; protected List objectTypes; + protected List emailRecipients; - /** datamodel for table of selected email recipients */ + protected DataModel allActionsDataModel; protected DataModel emailRecipientsDataModel; - /** selected email recipients */ - protected List emailRecipients; + protected boolean editingAction; + protected String action; + protected String usingTemplate = null; + protected String returnViewId = null; + + protected Map currentActionProperties; + protected List> allActionsProperties; + + protected static final String ACTION_PAGES_LOCATION = "/jsp/actions/"; + + private static final Log logger = LogFactory.getLog(BaseActionWizard.class); + private static final String IMPORT_ENCODING = "UTF-8"; // ------------------------------------------------------------------------------ // Wizard implementation - /** - * Initialises the wizard - */ + @Override public void init() { super.init(); - this.action = "add-features"; + this.action = null; this.users = null; this.actions = null; - this.actionDescriptions = null; this.emailRecipientsDataModel = null; this.emailRecipients = new ArrayList(4); this.usingTemplate = null; + this.allActionsProperties = new ArrayList>(); this.currentActionProperties = new HashMap(3); // default the approve and reject actions @@ -162,6 +154,672 @@ public abstract class BaseActionWizard extends AbstractWizardBean this.currentActionProperties.put(PROP_CHECKIN_MINOR, new Boolean(true)); } + // ------------------------------------------------------------------------------ + // Bean Getters and Setters + + /** + * @return Returns the selected action + */ + public String getAction() + { + return this.action; + } + + /** + * @param action Sets the selected action + */ + public void setAction(String action) + { + this.action = action; + } + + /** + * @return Returns if a template has been inserted by a user for email body. + */ + public String getUsingTemplate() + { + return this.usingTemplate; + } + + /** + * @param usingTemplate Template that has been inserted by a user for the email body. + */ + public void setUsingTemplate(String usingTemplate) + { + this.usingTemplate = usingTemplate; + } + + /** + * Returns the properties for all the actions as a JSF DataModel + * + * @return JSF DataModel representing the action properties + */ + public DataModel getAllActionsDataModel() + { + if (this.allActionsDataModel == null) + { + this.allActionsDataModel = new ListDataModel(); + } + + this.allActionsDataModel.setWrappedData(this.allActionsProperties); + + return this.allActionsDataModel; + } + + /** + * Returns the properties for email recipients JSF DataModel + * + * @return JSF DataModel wrapping the current email recipients + */ + public DataModel getEmailRecipientsDataModel() + { + if (this.emailRecipientsDataModel == null) + { + this.emailRecipientsDataModel = new ListDataModel(); + } + + this.emailRecipientsDataModel.setWrappedData(this.emailRecipients); + + return this.emailRecipientsDataModel; + } + + /** + * @return Gets the action settings + */ + public Map getActionProperties() + { + return this.currentActionProperties; + } + + /** + * @return Returns the list of selectable actions + */ + public List getActions() + { + if (this.actions == null) + { + List ruleActions = this.actionService.getActionDefinitions(); + this.actions = new ArrayList(); + for (ActionDefinition ruleActionDef : ruleActions) + { + this.actions.add(new SelectItem(ruleActionDef.getName(), ruleActionDef.getTitle())); + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.actions, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + + // add the select an action item at the start of the list + this.actions.add(0, new SelectItem("null", + Application.getMessage(FacesContext.getCurrentInstance(), "select_an_action"))); + } + + return this.actions; + } + + /** + * Returns the aspects that are available + * + * @return List of SelectItem objects representing the available aspects + */ + public List getAspects() + { + if (this.aspects == null) + { + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); + Config wizardCfg = svc.getConfig("Action Wizards"); + if (wizardCfg != null) + { + ConfigElement aspectsCfg = wizardCfg.getConfigElement("aspects"); + if (aspectsCfg != null) + { + FacesContext context = FacesContext.getCurrentInstance(); + this.aspects = new ArrayList(); + for (ConfigElement child : aspectsCfg.getChildren()) + { + QName idQName = Repository.resolveToQName(child.getAttribute("name")); + + // try and get the display label from config + String label = Utils.getDisplayLabel(context, child); + + // if there wasn't a client based label try and get it from the dictionary + if (label == null) + { + AspectDefinition aspectDef = this.dictionaryService.getAspect(idQName); + if (aspectDef != null) + { + label = aspectDef.getTitle(); + } + else + { + label = idQName.getLocalName(); + } + } + + this.aspects.add(new SelectItem(idQName.toString(), label)); + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.aspects, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + else + { + logger.warn("Could not find aspects configuration element"); + } + } + else + { + logger.warn("Could not find Action Wizards configuration section"); + } + } + + return this.aspects; + } + + /** + * @return Returns a list of object types to allow the user to select from + */ + public List getObjectTypes() + { + if (this.objectTypes == null) + { + FacesContext context = FacesContext.getCurrentInstance(); + + // add the well known object type to start with + this.objectTypes = new ArrayList(5); + this.objectTypes.add(new SelectItem(ContentModel.TYPE_CONTENT.toString(), + Application.getMessage(context, "content"))); + + // add any configured content sub-types to the list + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); + Config wizardCfg = svc.getConfig("Custom Content Types"); + if (wizardCfg != null) + { + ConfigElement typesCfg = wizardCfg.getConfigElement("content-types"); + if (typesCfg != null) + { + for (ConfigElement child : typesCfg.getChildren()) + { + QName idQName = Repository.resolveToQName(child.getAttribute("name")); + TypeDefinition typeDef = this.dictionaryService.getType(idQName); + + if (typeDef != null && + this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT)) + { + // try and get the display label from config + String label = Utils.getDisplayLabel(context, child); + + // if there wasn't a client based label try and get it from the dictionary + if (label == null) + { + label = typeDef.getTitle(); + } + + // finally, just use the localname + if (label == null) + { + label = idQName.getLocalName(); + } + + this.objectTypes.add(new SelectItem(idQName.toString(), label)); + } + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.objectTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + else + { + logger.warn("Could not find 'content-types' configuration element"); + } + } + else + { + logger.warn("Could not find 'Custom Content Types' configuration section"); + } + + } + + return this.objectTypes; + } + + /** + * @return the List of users in the system wrapped in SelectItem objects + */ + public List getUsers() + { + if (this.users == null) + { + List userNodes = Repository.getUsers( + FacesContext.getCurrentInstance(), + this.nodeService, + this.searchService); + this.users = new ArrayList(); + for (Node user : userNodes) + { + String email = (String)user.getProperties().get("email"); + if (email != null && email.length() > 0) + { + this.users.add(new SelectItem(email, (String)user.getProperties().get("fullName"))); + } + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.users, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + + return this.users; + } + + /** + * Returns the transformers that are available + * + * @return List of SelectItem objects representing the available transformers + */ + public List getTransformers() + { + if (this.transformers == null) + { + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); + Config wizardCfg = svc.getConfig("Action Wizards"); + if (wizardCfg != null) + { + ConfigElement transformersCfg = wizardCfg.getConfigElement("transformers"); + if (transformersCfg != null) + { + FacesContext context = FacesContext.getCurrentInstance(); + Map mimeTypes = this.mimetypeService.getDisplaysByMimetype(); + this.transformers = new ArrayList(); + for (ConfigElement child : transformersCfg.getChildren()) + { + String id = child.getAttribute("name"); + + // try and get the display label from config + String label = Utils.getDisplayLabel(context, child); + + // if there wasn't a client based label get it from the mime type service + if (label == null) + { + label = mimeTypes.get(id); + } + + this.transformers.add(new SelectItem(id, label)); + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.transformers, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + else + { + logger.warn("Could not find transformers configuration element"); + } + } + else + { + logger.warn("Could not find Action Wizards configuration section"); + } + } + + return this.transformers; + } + + /** + * Returns the image transformers that are available + * + * @return List of SelectItem objects representing the available image transformers + */ + public List getImageTransformers() + { + if (this.imageTransformers == null) + { + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); + Config wizardCfg = svc.getConfig("Action Wizards"); + if (wizardCfg != null) + { + ConfigElement transformersCfg = wizardCfg.getConfigElement("image-transformers"); + if (transformersCfg != null) + { + FacesContext context = FacesContext.getCurrentInstance(); + Map mimeTypes = this.mimetypeService.getDisplaysByMimetype(); + this.imageTransformers = new ArrayList(); + for (ConfigElement child : transformersCfg.getChildren()) + { + String id = child.getAttribute("name"); + + // try and get the display label from config + String label = Utils.getDisplayLabel(context, child); + + // if there wasn't a client based label get it from the mime type service + if (label == null) + { + label = mimeTypes.get(id); + } + + this.imageTransformers.add(new SelectItem(id, label)); + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.imageTransformers, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + else + { + logger.warn("Could not find image-transformers configuration element"); + } + } + else + { + logger.warn("Could not find Action Wizards configuration section"); + } + } + + return this.imageTransformers; + } + + // ------------------------------------------------------------------------------ + // Action event handlers + + /** + * Displays the settings page for the current action being added + */ + public void promptForActionValues() + { + // set the flag to show we are creating a new action + this.editingAction = false; + + FacesContext context = FacesContext.getCurrentInstance(); + this.returnViewId = context.getViewRoot().getViewId(); + String viewId = calculateActionViewId(this.action); + + HashMap actionProps = new HashMap(3); + actionProps.put(PROP_ACTION_NAME, this.action); + this.currentActionProperties = actionProps; + + if (SimpleWorkflowActionExecuter.NAME.equals(this.action)) + { + this.currentActionProperties.put("approveAction", "move"); + this.currentActionProperties.put("rejectStepPresent", "yes"); + this.currentActionProperties.put("rejectAction", "move"); + + if (logger.isDebugEnabled()) + logger.debug("Added '" + SimpleWorkflowActionExecuter.NAME + + "' action to list"); + } + else if (CheckInActionExecuter.NAME.equals(this.action)) + { + this.currentActionProperties.put(PROP_CHECKIN_MINOR, new Boolean(true)); + + if (logger.isDebugEnabled()) + logger.debug("Added '" + CheckInActionExecuter.NAME + + "' action to list"); + } + else if ("extract-metadata".equals(this.action)) + { + // This one (currently) has no parameters, so just add it... + actionProps.put(PROP_ACTION_SUMMARY, buildActionSummary(actionProps)); + this.allActionsProperties.add(actionProps); + + // come back to the same page we're on now + viewId = this.returnViewId; + + if (logger.isDebugEnabled()) + logger.debug("Added 'extract-metadata' action to list"); + } + else + { + if (logger.isDebugEnabled()) + logger.debug("Added '" + this.action + "' action to list"); + } + + // reset the selected action drop down + this.action = null; + + // go to the page to collect the settings + goToPage(context, viewId); + } + + /** + * Sets up the context for editing existing action values + */ + @SuppressWarnings("unchecked") + public void editAction() + { + // use the built in JSF support for retrieving the object for the + // row that was clicked by the user + Map actionToEdit = (Map)this.allActionsDataModel.getRowData(); + this.action = (String)actionToEdit.get(PROP_ACTION_NAME); + this.currentActionProperties = actionToEdit; + + // set the flag to show we are editing an action + this.editingAction = true; + + // remember the page we're on + FacesContext context = FacesContext.getCurrentInstance(); + this.returnViewId = context.getViewRoot().getViewId(); + + // refresh the wizard + goToPage(context, calculateActionViewId(this.action)); + } + + /** + * Adds the action just setup by the user to the list of actions for the rule + */ + public void addAction() + { + FacesContext context = FacesContext.getCurrentInstance(); + String summary = buildActionSummary(this.currentActionProperties); + + if (summary != null) + { + this.currentActionProperties.put(PROP_ACTION_SUMMARY, summary); + } + + if (this.editingAction) + { + this.action = null; + } + else + { + this.allActionsProperties.add(this.currentActionProperties); + } + + // refresh the wizard + goToPage(context, this.returnViewId); + } + + /** + * Removes the requested action from the list + */ + public void removeAction() + { + // use the built in JSF support for retrieving the object for the + // row that was clicked by the user + Map actionToRemove = (Map)this.allActionsDataModel.getRowData(); + this.allActionsProperties.remove(actionToRemove); + + // reset the action drop down + this.action = null; + + // refresh the wizard + FacesContext context = FacesContext.getCurrentInstance(); + goToPage(context, context.getViewRoot().getViewId()); + } + + /** + * Cancels the addition of the action + */ + public void cancelAddAction() + { + if (this.editingAction) + { + this.action = null; + } + else + { + this.currentActionProperties.clear(); + } + + // refresh the wizard + goToPage(FacesContext.getCurrentInstance(), this.returnViewId); + } + + /** + * Action handler called when the Add button is pressed to add an email recipient + */ + public void addRecipient(ActionEvent event) + { + UIGenericPicker picker = (UIGenericPicker)event.getComponent(); + String[] results = picker.getSelectedResults(); + if (results != null && results.length != 0) + { + for (String authority : results) + { + // first check the authority has not already been added to the list + boolean alreadyAdded = false; + for (int i=0; i actionProps) + protected String buildActionSummary(Map props) { - if (this.action.equals(AddFeaturesActionExecuter.NAME)) + String summaryResult = null; + + String actionName = (String)this.currentActionProperties.get(PROP_ACTION_NAME); + if (actionName != null) { - QName aspect = (QName)actionProps.get(AddFeaturesActionExecuter.PARAM_ASPECT_NAME); - this.currentActionProperties.put(PROP_ASPECT, aspect.toString()); - } - else if (this.action.equals(RemoveFeaturesActionExecuter.NAME)) - { - QName aspect = (QName)actionProps.get(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME); - this.currentActionProperties.put(PROP_ASPECT, aspect.toString()); - } - else if (this.action.equals(CopyActionExecuter.NAME)) - { - NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER); - this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); - } - else if (this.action.equals(MoveActionExecuter.NAME)) - { - NodeRef destNodeRef = (NodeRef)actionProps.get(MoveActionExecuter.PARAM_DESTINATION_FOLDER); - this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); - } - else if (this.action.equals(SimpleWorkflowActionExecuter.NAME)) - { - String approveStep = (String)actionProps.get(SimpleWorkflowActionExecuter.PARAM_APPROVE_STEP); - Boolean approveMove = (Boolean)actionProps.get(SimpleWorkflowActionExecuter.PARAM_APPROVE_MOVE); - NodeRef approveFolderNode = (NodeRef)actionProps.get( - SimpleWorkflowActionExecuter.PARAM_APPROVE_FOLDER); + StringBuilder summary = new StringBuilder(); + summary.append(Application.getMessage(FacesContext.getCurrentInstance(), + "action_" + actionName.replace('-', '_'))); + summary.append(" "); - String rejectStep = (String)actionProps.get(SimpleWorkflowActionExecuter.PARAM_REJECT_STEP); - Boolean rejectMove = (Boolean)actionProps.get(SimpleWorkflowActionExecuter.PARAM_REJECT_MOVE); - NodeRef rejectFolderNode = (NodeRef)actionProps.get( - SimpleWorkflowActionExecuter.PARAM_REJECT_FOLDER); - - this.currentActionProperties.put(PROP_APPROVE_STEP_NAME, approveStep); - this.currentActionProperties.put(PROP_APPROVE_ACTION, approveMove ? "move" : "copy"); - this.currentActionProperties.put(PROP_APPROVE_FOLDER, approveFolderNode); - - if (rejectStep == null && rejectMove == null && rejectFolderNode == null) + // define a summary to be added for each action + if (AddFeaturesActionExecuter.NAME.equals(actionName) || RemoveFeaturesActionExecuter.NAME.equals(actionName)) { - this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "no"); - } - else - { - this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "yes"); - this.currentActionProperties.put(PROP_REJECT_STEP_NAME, rejectStep); - this.currentActionProperties.put(PROP_REJECT_ACTION, rejectMove ? "move" : "copy"); - this.currentActionProperties.put(PROP_REJECT_FOLDER, rejectFolderNode); - } - } - else if (this.action.equals(LinkCategoryActionExecuter.NAME)) - { - NodeRef catNodeRef = (NodeRef)actionProps.get(LinkCategoryActionExecuter.PARAM_CATEGORY_VALUE); - this.currentActionProperties.put(PROP_CATEGORY, catNodeRef); - } - else if (this.action.equals(CheckOutActionExecuter.NAME)) - { - NodeRef destNodeRef = (NodeRef)actionProps.get(CheckOutActionExecuter.PARAM_DESTINATION_FOLDER); - this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); - } - else if (this.action.equals(CheckInActionExecuter.NAME)) - { - String checkDesc = (String)actionProps.get(CheckInActionExecuter.PARAM_DESCRIPTION); - this.currentActionProperties.put(PROP_CHECKIN_DESC, checkDesc); - - Boolean minorChange = (Boolean)actionProps.get(CheckInActionExecuter.PARAM_MINOR_CHANGE); - this.currentActionProperties.put(PROP_CHECKIN_MINOR, minorChange); - } - else if (this.action.equals(TransformActionExecuter.NAME)) - { - String transformer = (String)actionProps.get(TransformActionExecuter.PARAM_MIME_TYPE); - this.currentActionProperties.put(PROP_TRANSFORMER, transformer); - - NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER); - this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); - } - else if (this.action.equals(ImageTransformActionExecuter.NAME)) - { - String transformer = (String)actionProps.get(TransformActionExecuter.PARAM_MIME_TYPE); - this.currentActionProperties.put(PROP_IMAGE_TRANSFORMER, transformer); - - String options = (String)actionProps.get(ImageTransformActionExecuter.PARAM_CONVERT_COMMAND); - this.currentActionProperties.put(PROP_TRANSFORM_OPTIONS, options != null ? options : ""); - - NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER); - this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); - } - else if (this.action.equals(MailActionExecuter.NAME)) - { - String subject = (String)actionProps.get(MailActionExecuter.PARAM_SUBJECT); - this.currentActionProperties.put(PROP_SUBJECT, subject); - - String message = (String)actionProps.get(MailActionExecuter.PARAM_TEXT); - this.currentActionProperties.put(PROP_MESSAGE, message); - - // handle single email or multiple authority recipients - String to = (String)actionProps.get(MailActionExecuter.PARAM_TO); - if (to != null) - { - this.currentActionProperties.put(PROP_TO, to); - } - else - { - List recipients = (List)actionProps.get(MailActionExecuter.PARAM_TO_MANY); - if (recipients != null && recipients.size() != 0) + String aspect = (String)this.currentActionProperties.get(PROP_ASPECT); + + // find the label used by looking through the SelectItem list + for (SelectItem item : this.getAspects()) { - // rebuild the list of RecipientWrapper objects from the stored action - for (String authority : recipients) + if (item.getValue().equals(aspect)) { - this.emailRecipients.add( - new RecipientWrapper(displayLabelForAuthority(authority), authority)); + summary.append("'").append(item.getLabel()).append("'"); + break; } } } - - NodeRef templateRef = (NodeRef)actionProps.get(MailActionExecuter.PARAM_TEMPLATE); - if (templateRef != null) + else if (SimpleWorkflowActionExecuter.NAME.equals(actionName)) { - this.currentActionProperties.put(PROP_TEMPLATE, templateRef.getId()); - this.usingTemplate = templateRef.getId(); - } - } - else if (this.action.equals(ImporterActionExecuter.NAME)) - { - NodeRef destNodeRef = (NodeRef)actionProps.get(ImporterActionExecuter.PARAM_DESTINATION_FOLDER); - this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); - } - else if (this.action.equals(SpecialiseTypeActionExecuter.NAME) == true) - { - QName specialiseType = (QName)actionProps.get(SpecialiseTypeActionExecuter.PARAM_TYPE_NAME); - this.currentActionProperties.put(PROP_OBJECT_TYPE, specialiseType.toString()); - } - } - - - // ------------------------------------------------------------------------------ - // Bean Getters and Setters - - /** - * @return Returns the selected action - */ - public String getAction() - { - return this.action; - } - - /** - * @param action Sets the selected action - */ - public void setAction(String action) - { - this.action = action; - } - - /** - * Sets the action service - * - * @param actionRegistration the action service - */ - public void setActionService(ActionService actionService) - { - this.actionService = actionService; - } - - /** - * Sets the dictionary service - * - * @param dictionaryService The dictionary service - */ - public void setDictionaryService(DictionaryService dictionaryService) - { - this.dictionaryService = dictionaryService; - } - - /** - * Sets the mimetype service - * - * @param mimetypeService The mimetype service - */ - public void setMimetypeService(MimetypeService mimetypeService) - { - this.mimetypeService = mimetypeService; - } - - /** - * @param personService The personService to set. - */ - public void setPersonService(PersonService personService) - { - this.personService = personService; - } - - /** - * @param authorityService The authorityService to set. - */ - public void setAuthorityService(AuthorityService authorityService) - { - this.authorityService = authorityService; - } - - /** - * Returns the properties for email recipients JSF DataModel - * - * @return JSF DataModel wrapping the current email recipients - */ - public DataModel getEmailRecipientsDataModel() - { - if (this.emailRecipientsDataModel == null) - { - this.emailRecipientsDataModel = new ListDataModel(); - } - - this.emailRecipientsDataModel.setWrappedData(this.emailRecipients); - - return this.emailRecipientsDataModel; - } - - /** - * @return Returns the list of selectable actions - */ - public List getActions() - { - if (this.actions == null) - { - List ruleActions = this.actionService.getActionDefinitions(); - this.actions = new ArrayList(); - for (ActionDefinition ruleActionDef : ruleActions) - { - this.actions.add(new SelectItem(ruleActionDef.getName(), ruleActionDef.getTitle())); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.actions, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - - return this.actions; - } - - /** - * @return Returns a map of all the action descriptions - */ - public Map getActionDescriptions() - { - if (this.actionDescriptions == null) - { - List ruleActions = this.actionService.getActionDefinitions(); - this.actionDescriptions = new HashMap(); - for (ActionDefinition ruleActionDef : ruleActions) - { - this.actionDescriptions.put(ruleActionDef.getName(), ruleActionDef.getDescription()); - } - } - - return this.actionDescriptions; - } - - /** - * @return Gets the action settings - */ - public Map getActionProperties() - { - return this.currentActionProperties; - } - - /** - * Returns a list of encodings the import and export actions can use - * - * @return List of SelectItem objects representing the available encodings - */ - public List getEncodings() - { - if (this.encodings == null) - { - ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); - Config wizardCfg = svc.getConfig("Action Wizards"); - if (wizardCfg != null) - { - ConfigElement encodingsCfg = wizardCfg.getConfigElement("encodings"); - if (encodingsCfg != null) + // just leave the summary as the title for now + String approveStepName = (String)this.currentActionProperties.get(PROP_APPROVE_STEP_NAME); + String approveAction = (String)this.currentActionProperties.get(PROP_APPROVE_ACTION); + NodeRef approveFolder = (NodeRef)this.currentActionProperties.get(PROP_APPROVE_FOLDER); + String approveFolderName = Repository.getNameForNode(this.nodeService, approveFolder); + String approveMsg = MessageFormat.format(summary.toString(), + new Object[] {Application.getMessage(FacesContext.getCurrentInstance(), approveAction), + approveFolderName, approveStepName}); + + String rejectStep = (String)this.currentActionProperties.get(PROP_REJECT_STEP_PRESENT); + + String rejectMsg = null; + if (rejectStep != null && "yes".equals(rejectStep)) { - FacesContext context = FacesContext.getCurrentInstance(); - this.encodings = new ArrayList(); - for (ConfigElement child : encodingsCfg.getChildren()) + String rejectStepName = (String)this.currentActionProperties.get(PROP_REJECT_STEP_NAME); + String rejectAction = (String)this.currentActionProperties.get(PROP_REJECT_ACTION); + NodeRef rejectFolder = (NodeRef)this.currentActionProperties.get(PROP_REJECT_FOLDER); + String rejectFolderName = Repository.getNameForNode(this.nodeService, rejectFolder); + rejectMsg = MessageFormat.format(summary.toString(), + new Object[] {Application.getMessage(FacesContext.getCurrentInstance(), rejectAction), + rejectFolderName, rejectStepName}); + } + + summary = new StringBuilder(approveMsg); + if (rejectMsg != null) + { + summary.append(" "); + summary.append(rejectMsg); + } + } + else if (LinkCategoryActionExecuter.NAME.equals(actionName)) + { + NodeRef cat = (NodeRef)this.currentActionProperties.get(PROP_CATEGORY); + String name = Repository.getNameForNode(this.nodeService, cat); + summary.append("'").append(name).append("'"); + } + else if (TransformActionExecuter.NAME.equals(actionName)) + { + NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION); + String name = Repository.getNameForNode(this.nodeService, space); + String transformer = (String)this.currentActionProperties.get(PROP_TRANSFORMER); + + // find the label used by looking through the SelectItem list + for (SelectItem item : this.getTransformers()) + { + if (item.getValue().equals(transformer)) { - String id = child.getAttribute("name"); - - // try and get the display label from config - String label = Utils.getDisplayLabel(context, child); - this.encodings.add(new SelectItem(id, label)); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.encodings, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - else - { - logger.warn("Could not find encodings configuration element"); - } - } - else - { - logger.warn("Could not find Action Wizards configuration section"); - } - } - - return this.encodings; - } - - /** - * Returns the transformers that are available - * - * @return List of SelectItem objects representing the available transformers - */ - public List getTransformers() - { - if (this.transformers == null) - { - ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); - Config wizardCfg = svc.getConfig("Action Wizards"); - if (wizardCfg != null) - { - ConfigElement transformersCfg = wizardCfg.getConfigElement("transformers"); - if (transformersCfg != null) - { - FacesContext context = FacesContext.getCurrentInstance(); - Map mimeTypes = this.mimetypeService.getDisplaysByMimetype(); - this.transformers = new ArrayList(); - for (ConfigElement child : transformersCfg.getChildren()) - { - String id = child.getAttribute("name"); - - // try and get the display label from config - String label = Utils.getDisplayLabel(context, child); - - // if there wasn't a client based label get it from the mime type service - if (label == null) - { - label = mimeTypes.get(id); - } - - this.transformers.add(new SelectItem(id, label)); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.transformers, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - else - { - logger.warn("Could not find transformers configuration element"); - } - } - else - { - logger.warn("Could not find Action Wizards configuration section"); - } - } - - return this.transformers; - } - - /** - * Returns the image transformers that are available - * - * @return List of SelectItem objects representing the available image transformers - */ - public List getImageTransformers() - { - if (this.imageTransformers == null) - { - ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); - Config wizardCfg = svc.getConfig("Action Wizards"); - if (wizardCfg != null) - { - ConfigElement transformersCfg = wizardCfg.getConfigElement("image-transformers"); - if (transformersCfg != null) - { - FacesContext context = FacesContext.getCurrentInstance(); - Map mimeTypes = this.mimetypeService.getDisplaysByMimetype(); - this.imageTransformers = new ArrayList(); - for (ConfigElement child : transformersCfg.getChildren()) - { - String id = child.getAttribute("name"); - - // try and get the display label from config - String label = Utils.getDisplayLabel(context, child); - - // if there wasn't a client based label get it from the mime type service - if (label == null) - { - label = mimeTypes.get(id); - } - - this.imageTransformers.add(new SelectItem(id, label)); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.imageTransformers, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - else - { - logger.warn("Could not find image-transformers configuration element"); - } - } - else - { - logger.warn("Could not find Action Wizards configuration section"); - } - } - - return this.imageTransformers; - } - - /** - * Returns the aspects that are available - * - * @return List of SelectItem objects representing the available aspects - */ - public List getAspects() - { - if (this.aspects == null) - { - ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); - Config wizardCfg = svc.getConfig("Action Wizards"); - if (wizardCfg != null) - { - ConfigElement aspectsCfg = wizardCfg.getConfigElement("aspects"); - if (aspectsCfg != null) - { - FacesContext context = FacesContext.getCurrentInstance(); - this.aspects = new ArrayList(); - for (ConfigElement child : aspectsCfg.getChildren()) - { - QName idQName = Repository.resolveToQName(child.getAttribute("name")); - - // try and get the display label from config - String label = Utils.getDisplayLabel(context, child); - - // if there wasn't a client based label try and get it from the dictionary - if (label == null) - { - AspectDefinition aspectDef = this.dictionaryService.getAspect(idQName); - if (aspectDef != null) - { - label = aspectDef.getTitle(); - } - else - { - label = idQName.getLocalName(); - } - } - - this.aspects.add(new SelectItem(idQName.toString(), label)); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.aspects, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - else - { - logger.warn("Could not find aspects configuration element"); - } - } - else - { - logger.warn("Could not find Action Wizards configuration section"); - } - } - - return this.aspects; - } - - /** - * @return Returns a list of object types to allow the user to select from - */ - public List getObjectTypes() - { - if (this.objectTypes == null) - { - FacesContext context = FacesContext.getCurrentInstance(); - - // add the well known object type to start with - this.objectTypes = new ArrayList(5); - this.objectTypes.add(new SelectItem(ContentModel.TYPE_CONTENT.toString(), - Application.getMessage(context, "content"))); - - // add any configured content sub-types to the list - ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); - Config wizardCfg = svc.getConfig("Custom Content Types"); - if (wizardCfg != null) - { - ConfigElement typesCfg = wizardCfg.getConfigElement("content-types"); - if (typesCfg != null) - { - for (ConfigElement child : typesCfg.getChildren()) - { - QName idQName = Repository.resolveToQName(child.getAttribute("name")); - TypeDefinition typeDef = this.dictionaryService.getType(idQName); - - if (typeDef != null && - this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT)) - { - // try and get the display label from config - String label = Utils.getDisplayLabel(context, child); - - // if there wasn't a client based label try and get it from the dictionary - if (label == null) - { - label = typeDef.getTitle(); - } - - // finally, just use the localname - if (label == null) - { - label = idQName.getLocalName(); - } - - this.objectTypes.add(new SelectItem(idQName.toString(), label)); - } - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.objectTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - else - { - logger.warn("Could not find 'content-types' configuration element"); - } - } - else - { - logger.warn("Could not find 'Custom Content Types' configuration section"); - } - - } - - return this.objectTypes; - } - - /** - * @return the List of users in the system wrapped in SelectItem objects - */ - public List getUsers() - { - if (this.users == null) - { - List userNodes = Repository.getUsers( - FacesContext.getCurrentInstance(), - this.nodeService, - this.searchService); - this.users = new ArrayList(); - for (Node user : userNodes) - { - String email = (String)user.getProperties().get("email"); - if (email != null && email.length() > 0) - { - this.users.add(new SelectItem(email, (String)user.getProperties().get("fullName"))); - } - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.users, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - - return this.users; - } - - /** - * @return Returns if a template has been inserted by a user for email body. - */ - public String getUsingTemplate() - { - return this.usingTemplate; - } - - /** - * @param usingTemplate Template that has been inserted by a user for the email body. - */ - public void setUsingTemplate(String usingTemplate) - { - this.usingTemplate = usingTemplate; - } - - - // ------------------------------------------------------------------------------ - // Action event handlers - - /** - * Action handler called when the Add button is pressed to add an email recipient - */ - public void addRecipient(ActionEvent event) - { - UIGenericPicker picker = (UIGenericPicker)event.getComponent(); - String[] results = picker.getSelectedResults(); - if (results != null && results.length != 0) - { - for (String authority : results) - { - // first check the authority has not already been added to the list - boolean alreadyAdded = false; - for (int i=0; i actionParams : this.allActionsProperties) + { + // use the base class version of buildActionParams(), but for this we need + // to setup the currentActionProperties and action variables + String actionName = (String)actionParams.get(PROP_ACTION_NAME); + this.action = actionName; + this.currentActionProperties = actionParams; + Map repoActionParams = buildActionParams(); + + // add the action to the rule + Action action = this.actionService.createAction(actionName); + action.setParameterValues(repoActionParams); + + // execute the action on the current document node + this.actionService.executeAction(action, this.browseBean.getDocument().getNodeRef()); + } + + return outcome; + } + + @Override + protected String doPostCommitProcessing(FacesContext context, String outcome) + { + // reset the current document properties/aspects in case we have changed them + // during the execution of the custom action + this.browseBean.getDocument().reset(); + + return outcome; + } + + @Override + protected String getErrorMessageId() + { + return "error_actions"; + } + + /** + * @return Returns the summary data for the wizard. + */ + public String getSummary() + { + // create the summary using all the actions + StringBuilder actionsSummary = new StringBuilder(); + for (Map props : this.allActionsProperties) + { + actionsSummary.append(props.get(PROP_ACTION_SUMMARY)); + actionsSummary.append("
"); + } + + ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance()); + + return buildSummary( + new String[] {bundle.getString("actions")}, + new String[] {actionsSummary.toString()}); + } + + @Override + public boolean getNextButtonDisabled() + { + return (this.allActionsDataModel.getRowCount() == 0); + } + + @Override + public boolean getFinishButtonDisabled() + { + return (this.allActionsDataModel.getRowCount() == 0); + } +} diff --git a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java index adc41bcaaa..e3de0e8814 100644 --- a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java +++ b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java @@ -23,8 +23,6 @@ import org.alfresco.web.ui.common.Utils; */ public abstract class BaseDialogBean implements IDialogBean { - protected static final String ERROR_ID = "error_generic"; - // services common to most dialogs protected BrowseBean browseBean; protected NavigationBean navigator; @@ -177,6 +175,14 @@ public abstract class BaseDialogBean implements IDialogBean return outcome; } + /** + * @return The error message lookup id + */ + protected String getErrorMessageId() + { + return "error_generic"; + } + /** * Returns a formatted exception string for the given exception * @@ -186,7 +192,7 @@ public abstract class BaseDialogBean implements IDialogBean protected String formatErrorMessage(Throwable exception) { return MessageFormat.format(Application.getMessage( - FacesContext.getCurrentInstance(), ERROR_ID), + FacesContext.getCurrentInstance(), getErrorMessageId()), exception.getMessage()); } } diff --git a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java new file mode 100644 index 0000000000..39b55761d2 --- /dev/null +++ b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java @@ -0,0 +1,811 @@ +package org.alfresco.web.bean.rules; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; + +import javax.faces.context.FacesContext; +import javax.faces.model.DataModel; +import javax.faces.model.ListDataModel; +import javax.faces.model.SelectItem; + +import org.alfresco.config.Config; +import org.alfresco.config.ConfigElement; +import org.alfresco.config.ConfigService; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator; +import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator; +import org.alfresco.repo.action.evaluator.HasAspectEvaluator; +import org.alfresco.repo.action.evaluator.InCategoryEvaluator; +import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.action.ActionCondition; +import org.alfresco.service.cmr.action.ActionConditionDefinition; +import org.alfresco.service.cmr.dictionary.TypeDefinition; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.rule.Rule; +import org.alfresco.service.cmr.rule.RuleService; +import org.alfresco.service.cmr.rule.RuleType; +import org.alfresco.service.namespace.QName; +import org.alfresco.web.app.Application; +import org.alfresco.web.bean.actions.BaseActionWizard; +import org.alfresco.web.bean.repository.Node; +import org.alfresco.web.bean.repository.Repository; +import org.alfresco.web.data.IDataContainer; +import org.alfresco.web.data.QuickSort; +import org.alfresco.web.ui.common.Utils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Bean implementation for the "Create Rule" wizard + * + * @author gavinc + */ +public class CreateRuleWizard extends BaseActionWizard +{ + public static final String PROP_CONDITION_NAME = "conditionName"; + public static final String PROP_CONDITION_SUMMARY = "conditionSummary"; + public static final String PROP_CONDITION_NOT = "notcondition"; + + protected RuleService ruleService; + protected RulesBean rulesBean; + + private List modelTypes; + private List mimeTypes; + private List types; + private List conditions; + + protected Map currentConditionProperties; + protected List> allConditionsProperties; + + protected DataModel allConditionsDataModel; + + protected String title; + protected String description; + protected String type; + protected String condition; + protected boolean runInBackground; + protected boolean applyToSubSpaces; + protected boolean editingCondition; + + protected static final String CONDITION_PAGES_LOCATION = "/jsp/rules/"; + + private static final Log logger = LogFactory.getLog(CreateRuleWizard.class); + + // ------------------------------------------------------------------------------ + // Wizard implementation + + @Override + public void init() + { + super.init(); + + this.title = null; + this.description = null; + this.type = "inbound"; + this.condition = null; + this.applyToSubSpaces = false; + this.runInBackground = false; + this.conditions = null; + + this.allConditionsProperties = new ArrayList>(); + } + + @Override + protected String finishImpl(FacesContext context, String outcome) + throws Exception + { + // get hold of the space the rule will apply to and make sure + // it is actionable + Node currentSpace = this.browseBean.getActionSpace(); + + // create the new rule + Rule rule = this.ruleService.createRule(this.getType()); + + // setup the rule + outcome = setupRule(context, rule, outcome); + + // Save the rule + this.ruleService.saveRule(currentSpace.getNodeRef(), rule); + + if (logger.isDebugEnabled()) + logger.debug("Added rule '" + this.title + "'"); + + return outcome; + } + + @Override + public boolean getNextButtonDisabled() + { + // TODO: Allow the next button state to be configured so that + // wizard implementations don't have to worry about + // checking step numbers + + boolean disabled = true; + int step = Application.getWizardManager().getCurrentStep(); + switch(step) + { + case 1: + { + disabled = (this.allConditionsDataModel == null || + this.allConditionsDataModel.getRowCount() == 0); + break; + } + case 2: + { + disabled = (this.allActionsDataModel == null || + this.allActionsDataModel.getRowCount() == 0); + break; + } + case 3: + { + disabled = (this.title == null || this.title.length() == 0); + break; + } + } + + return disabled; + } + + @Override + public boolean getFinishButtonDisabled() + { + if (this.allActionsDataModel != null && + this.allActionsDataModel.getRowCount() > 0 && + this.allConditionsDataModel != null && + this.allConditionsDataModel.getRowCount() > 0 && + this.title != null && this.title.length() > 0) + { + return false; + } + else + { + return true; + } + } + + /** + * @return Returns the summary data for the wizard. + */ + public String getSummary() + { + // create the summary using all the conditions + StringBuilder conditionsSummary = new StringBuilder(); + for (Map props : this.allConditionsProperties) + { + conditionsSummary.append(props.get(PROP_CONDITION_SUMMARY)); + conditionsSummary.append("
"); + } + + // create the summary using all the actions + StringBuilder actionsSummary = new StringBuilder(); + for (Map props : this.allActionsProperties) + { + actionsSummary.append(props.get(PROP_ACTION_SUMMARY)); + actionsSummary.append("
"); + } + + ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance()); + + String backgroundYesNo = this.runInBackground ? bundle.getString("yes") : bundle.getString("no"); + String subSpacesYesNo = this.applyToSubSpaces ? bundle.getString("yes") : bundle.getString("no"); + + return buildSummary( + new String[] {bundle.getString("rule_type"), bundle.getString("name"), bundle.getString("description"), + bundle.getString("apply_to_sub_spaces"), bundle.getString("run_in_background"), + bundle.getString("conditions"), bundle.getString("actions")}, + new String[] {this.type, this.title, this.description, subSpacesYesNo, backgroundYesNo, + conditionsSummary.toString(), actionsSummary.toString()}); + } + + @Override + protected String getErrorMessageId() + { + return "error_rule"; + } + + /** + * Sets up the given rule using the current state of the wizard + * + * @param context FacesContext + * @param rule The rule to setup + * @param outcome The default outcome + * @return The outcome + */ + protected String setupRule(FacesContext context, Rule rule, String outcome) + { + // setup the rule and add it to the space + rule.setTitle(this.title); + rule.setDescription(this.description); + rule.applyToChildren(this.applyToSubSpaces); + rule.setExecuteAsynchronously(this.runInBackground); + + // add all the conditions to the rule + for (Map condParams : this.allConditionsProperties) + { + Map repoCondParams = buildConditionParams(condParams); + + // add the condition to the rule + ActionCondition condition = this.actionService.createActionCondition( + (String)condParams.get(PROP_CONDITION_NAME)); + condition.setParameterValues(repoCondParams); + + // specify whether the condition result should be inverted + Boolean not = (Boolean)condParams.get(PROP_CONDITION_NOT); + condition.setInvertCondition(((Boolean)not).booleanValue()); + + rule.addActionCondition(condition); + } + + // add all the actions to the rule + for (Map actionParams : this.allActionsProperties) + { + // use the base class version of buildActionParams(), but for this we need + // to setup the currentActionProperties and action variables + String actionName = (String)actionParams.get(PROP_ACTION_NAME); + this.action = actionName; + this.currentActionProperties = actionParams; + Map repoActionParams = buildActionParams(); + + // add the action to the rule + Action action = this.actionService.createAction(actionName); + action.setParameterValues(repoActionParams); + rule.addAction(action); + } + + return outcome; + } + + // ------------------------------------------------------------------------------ + // Bean Getters and Setters + + /** + * Returns the properties for all the conditions as a JSF DataModel + * + * @return JSF DataModel representing the condition properties + */ + public DataModel getAllConditionsDataModel() + { + if (this.allConditionsDataModel == null) + { + this.allConditionsDataModel = new ListDataModel(); + } + + this.allConditionsDataModel.setWrappedData(this.allConditionsProperties); + + return this.allConditionsDataModel; + } + + /** + * Returns a list of the types available in the repository + * + * @return List of SelectItem objects + */ + public List getModelTypes() + { + if (this.modelTypes == null) + { + FacesContext context = FacesContext.getCurrentInstance(); + ConfigService svc = Application.getConfigService(context); + Config wizardCfg = svc.getConfig("Action Wizards"); + if (wizardCfg != null) + { + ConfigElement typesCfg = wizardCfg.getConfigElement("types"); + if (typesCfg != null) + { + this.modelTypes = new ArrayList(); + for (ConfigElement child : typesCfg.getChildren()) + { + QName idQName = Repository.resolveToQName(child.getAttribute("name")); + + // get the display label from config + String label = Utils.getDisplayLabel(context, child); + + // if there wasn't a client based label try and get it from the dictionary + if (label == null) + { + TypeDefinition typeDef = this.dictionaryService.getType(idQName); + if (typeDef != null) + { + label = typeDef.getTitle(); + } + else + { + label = idQName.getLocalName(); + } + } + + this.modelTypes.add(new SelectItem(idQName.toString(), label)); + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.modelTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + else + { + logger.warn("Could not find types configuration element"); + } + } + else + { + logger.warn("Could not find Action Wizards configuration section"); + } + } + + return this.modelTypes; + } + + /** + * Returns a list of mime types in the system + * + * @return List of mime types + */ + public List getMimeTypes() + { + if (this.mimeTypes == null) + { + this.mimeTypes = new ArrayList(50); + + Map mimeTypes = mimetypeService.getDisplaysByMimetype(); + for (String mimeType : mimeTypes.keySet()) + { + this.mimeTypes.add(new SelectItem(mimeType, mimeTypes.get(mimeType))); + } + + // make sure the list is sorted by the values + QuickSort sorter = new QuickSort(this.mimeTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + } + + return this.mimeTypes; + } + + /** + * @return Returns the list of selectable conditions + */ + public List getConditions() + { + if (this.conditions == null) + { + List ruleConditions = this.actionService.getActionConditionDefinitions(); + this.conditions = new ArrayList(ruleConditions.size()); + for (ActionConditionDefinition ruleConditionDef : ruleConditions) + { + // add to SelectItem list + this.conditions.add(new SelectItem(ruleConditionDef.getName(), + ruleConditionDef.getTitle())); + } + + // make sure the list is sorted by the label + QuickSort sorter = new QuickSort(this.conditions, "label", true, IDataContainer.SORT_CASEINSENSITIVE); + sorter.sort(); + + // add the "Select a condition" entry at the beginning of the list + this.conditions.add(0, new SelectItem("null", + Application.getMessage(FacesContext.getCurrentInstance(), "select_a_condition"))); + } + + return this.conditions; + } + + /** + * @return Returns the types of rules that can be defined + */ + public List getTypes() + { + if (this.types == null) + { + List ruleTypes = this.ruleService.getRuleTypes(); + this.types = new ArrayList(ruleTypes.size()); + for (RuleType ruleType : ruleTypes) + { + this.types.add(new SelectItem(ruleType.getName(), ruleType.getDisplayLabel())); + } + } + + return this.types; + } + + /** + * @return Gets the condition settings + */ + public Map getConditionProperties() + { + return this.currentConditionProperties; + } + + /** + * @return Returns the description. + */ + public String getDescription() + { + return description; + } + + /** + * @param description The description to set. + */ + public void setDescription(String description) + { + this.description = description; + } + + /** + * @return Returns the title. + */ + public String getTitle() + { + return title; + } + + /** + * @param title The title to set. + */ + public void setTitle(String title) + { + this.title = title; + } + + /** + * @return Returns whether the rule should run in the background + */ + public boolean getRunInBackground() + { + return this.runInBackground; + } + + /** + * @param runInBackground Sets whether the rule should run in the background + */ + public void setRunInBackground(boolean runInBackground) + { + this.runInBackground = runInBackground; + } + + /** + * @return Returns whether the rule should be applied to sub spaces i.e. if it gets inherited + */ + public boolean getApplyToSubSpaces() + { + return this.applyToSubSpaces; + } + + /** + * @param applyToSubSpaces Sets whether the rule will get applied to sub spaces + */ + public void setApplyToSubSpaces(boolean applyToSubSpaces) + { + this.applyToSubSpaces = applyToSubSpaces; + } + + /** + * @return Returns the type. + */ + public String getType() + { + return type; + } + + /** + * @param type The type to set + */ + public void setType(String type) + { + this.type = type; + } + + /** + * @return Returns the selected condition + */ + public String getCondition() + { + return this.condition; + } + + /** + * @param condition Sets the selected condition + */ + public void setCondition(String condition) + { + this.condition = condition; + } + + // ------------------------------------------------------------------------------ + // Action event handlers + + /** + * Displays the settings page for the current condition being added (if required) + */ + public void promptForConditionValues() + { + // set the flag to show we are creating a new condition + this.editingCondition = false; + + FacesContext context = FacesContext.getCurrentInstance(); + this.returnViewId = context.getViewRoot().getViewId(); + String viewId = calculateConditionViewId(this.condition); + + HashMap condProps = new HashMap(3); + condProps.put(PROP_CONDITION_NAME, this.condition); + + if ("no-condition".equals(this.condition)) + { + condProps.put(PROP_CONDITION_SUMMARY, Application.getMessage( + FacesContext.getCurrentInstance(), "condition_no_condition")); + condProps.put(PROP_CONDITION_NOT, Boolean.FALSE); + this.allConditionsProperties.add(condProps); + + // come back to the same page we're on now + viewId = this.returnViewId; + + if (logger.isDebugEnabled()) + logger.debug("Add 'no-condition' condition to list"); + } + else if (this.condition != null) + { + this.currentConditionProperties = condProps; + + if (logger.isDebugEnabled()) + logger.debug("Added '" + this.condition + "' condition to list"); + } + + // reset the selected condition drop down + this.condition = null; + + // go to the page to collect the settings + goToPage(context, viewId); + } + + /** + * Sets up the context for editing existing condition values + */ + @SuppressWarnings("unchecked") + public void editCondition() + { + // use the built in JSF support for retrieving the object for the + // row that was clicked by the user + Map conditionToEdit = (Map)this.allConditionsDataModel.getRowData(); + this.condition = (String)conditionToEdit.get(PROP_CONDITION_NAME); + this.currentConditionProperties = conditionToEdit; + + // set the flag to show we are editing a condition + this.editingCondition = true; + + // remember the page we're on + FacesContext context = FacesContext.getCurrentInstance(); + this.returnViewId = context.getViewRoot().getViewId(); + + // refresh the wizard + goToPage(context, calculateConditionViewId(this.condition)); + } + + /** + * Adds the condition just setup by the user to the list of conditions for the rule + */ + public void addCondition() + { + FacesContext context = FacesContext.getCurrentInstance(); + String summary = buildConditionSummary(this.currentConditionProperties); + + if (summary != null) + { + this.currentConditionProperties.put(PROP_CONDITION_SUMMARY, summary); + } + + if (this.editingCondition) + { + this.condition = null; + } + else + { + this.allConditionsProperties.add(this.currentConditionProperties); + } + + // refresh the wizard + goToPage(context, this.returnViewId); + } + + /** + * Removes the requested condition from the list + */ + public void removeCondition() + { + // use the built in JSF support for retrieving the object for the + // row that was clicked by the user + Map conditionToRemove = (Map)this.allConditionsDataModel.getRowData(); + this.allConditionsProperties.remove(conditionToRemove); + + // reset the action drop down + this.condition = null; + + // refresh the wizard + FacesContext context = FacesContext.getCurrentInstance(); + goToPage(context, context.getViewRoot().getViewId()); + } + + /** + * Cancels the addition of the condition + */ + public void cancelAddCondition() + { + if (this.editingCondition) + { + this.condition = null; + } + else + { + this.currentConditionProperties.clear(); + } + + // refresh the wizard + goToPage(FacesContext.getCurrentInstance(), this.returnViewId); + } + + // ------------------------------------------------------------------------------ + // Service Injection + + /** + * @param ruleService Sets the rule service to use + */ + public void setRuleService(RuleService ruleService) + { + this.ruleService = ruleService; + } + + /** + * Sets the RulesBean instance to be used by the wizard in edit mode + * + * @param rulesBean The RulesBean + */ + public void setRulesBean(RulesBean rulesBean) + { + this.rulesBean = rulesBean; + } + + // ------------------------------------------------------------------------------ + // Helper methods + + /** + * Builds the Map of properties for the given condition in the format the repo is expecting + * + * @param params The Map of properties built from the UI + * @return The Map the repo is expecting + */ + protected Map buildConditionParams(Map params) + { + Map repoParams = new HashMap(params.size()); + + String condName = (String)params.get(PROP_CONDITION_NAME); + if (ComparePropertyValueEvaluator.NAME.equals(condName)) + { + repoParams.put(ComparePropertyValueEvaluator.PARAM_VALUE, params.get(PROP_CONTAINS_TEXT)); + } + else if (InCategoryEvaluator.NAME.equals(condName)) + { + // put the selected category in the condition params + repoParams.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, params.get(PROP_CATEGORY)); + + // add the classifiable aspect + repoParams.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE); + } + else if (IsSubTypeEvaluator.NAME.equals(condName)) + { + // add the model type + repoParams.put(IsSubTypeEvaluator.PARAM_TYPE, QName.createQName((String)params.get(PROP_MODEL_TYPE))); + } + else if (HasAspectEvaluator.NAME.equals(condName)) + { + // add the aspect + repoParams.put(HasAspectEvaluator.PARAM_ASPECT, QName.createQName((String)params.get(PROP_ASPECT))); + } + else if (CompareMimeTypeEvaluator.NAME.equals(condName)) + { + repoParams.put(CompareMimeTypeEvaluator.PARAM_VALUE, params.get(PROP_MIMETYPE)); + } + + return repoParams; + } + + /** + * Returns a summary string for the given condition parameters + * + * @return The summary or null if a summary could not be built + */ + protected String buildConditionSummary(Map props) + { + String summaryResult = null; + + String condName = (String)props.get(PROP_CONDITION_NAME); + if (condName != null) + { + StringBuilder summary = new StringBuilder(); + + String msgId = "condition_" + condName.replace('-', '_'); + + // JSF is putting the boolean into the map as a Boolean object so we + // need to handle that - adding a converter doesn't seem to help! + Boolean not = (Boolean)props.get(PROP_CONDITION_NOT); + if (not.booleanValue()) + { + msgId = msgId + "_not"; + } + + if (logger.isDebugEnabled()) + logger.debug("Looking up condition summary string: " + msgId); + + summary.append(Application.getMessage(FacesContext.getCurrentInstance(), msgId)); + summary.append(" "); + + // define a summary to be added for each condition + if (InCategoryEvaluator.NAME.equals(condName)) + { + String name = Repository.getNameForNode(this.nodeService, (NodeRef)props.get(PROP_CATEGORY)); + summary.append("'").append(name).append("'"); + } + else if (ComparePropertyValueEvaluator.NAME.equals(condName)) + { + summary.append("'"); + summary.append(props.get(PROP_CONTAINS_TEXT)); + summary.append("'"); + } + else if (IsSubTypeEvaluator.NAME.equals(condName)) + { + // find the label used by looking through the SelectItem list + String typeName = (String)props.get(PROP_MODEL_TYPE); + for (SelectItem item : this.getModelTypes()) + { + if (item.getValue().equals(typeName)) + { + summary.append("'").append(item.getLabel()).append("'"); + break; + } + } + } + else if (HasAspectEvaluator.NAME.equals(condName)) + { + // find the label used by looking through the SelectItem list + String aspectName = (String)props.get(PROP_ASPECT); + for (SelectItem item : this.getAspects()) + { + if (item.getValue().equals(aspectName)) + { + summary.append("'").append(item.getLabel()).append("'"); + break; + } + } + } + else if (CompareMimeTypeEvaluator.NAME.equals(condName)) + { + String mimetype = (String)props.get(PROP_MIMETYPE); + for (SelectItem item : this.getMimeTypes()) + { + if (item.getValue().equals(mimetype)) + { + summary.append("'").append(item.getLabel()).append("'"); + break; + } + } + } + + summaryResult = summary.toString(); + } + + return summaryResult; + } + + /** + * Calculates the viewId for the given condition id + * + * @param conditionId The id of the condition to generate the view id for + * @return The view id + */ + protected String calculateConditionViewId(String conditionId) + { + return CONDITION_PAGES_LOCATION + conditionId + ".jsp"; + } +} diff --git a/source/java/org/alfresco/web/bean/rules/EditRuleWizard.java b/source/java/org/alfresco/web/bean/rules/EditRuleWizard.java new file mode 100644 index 0000000000..4a2e598f41 --- /dev/null +++ b/source/java/org/alfresco/web/bean/rules/EditRuleWizard.java @@ -0,0 +1,310 @@ +package org.alfresco.web.bean.rules; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator; +import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator; +import org.alfresco.repo.action.evaluator.HasAspectEvaluator; +import org.alfresco.repo.action.evaluator.InCategoryEvaluator; +import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator; +import org.alfresco.repo.action.executer.AddFeaturesActionExecuter; +import org.alfresco.repo.action.executer.CheckInActionExecuter; +import org.alfresco.repo.action.executer.CheckOutActionExecuter; +import org.alfresco.repo.action.executer.CopyActionExecuter; +import org.alfresco.repo.action.executer.ImageTransformActionExecuter; +import org.alfresco.repo.action.executer.ImporterActionExecuter; +import org.alfresco.repo.action.executer.LinkCategoryActionExecuter; +import org.alfresco.repo.action.executer.MailActionExecuter; +import org.alfresco.repo.action.executer.MoveActionExecuter; +import org.alfresco.repo.action.executer.RemoveFeaturesActionExecuter; +import org.alfresco.repo.action.executer.SimpleWorkflowActionExecuter; +import org.alfresco.repo.action.executer.SpecialiseTypeActionExecuter; +import org.alfresco.repo.action.executer.TransformActionExecuter; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.action.ActionCondition; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.rule.Rule; +import org.alfresco.service.namespace.QName; +import org.alfresco.web.bean.repository.Node; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + + +/** + * Bean implementation for the "Edit Rule" wizard + * + * @author gavinc + */ +public class EditRuleWizard extends CreateRuleWizard +{ + private static final Log logger = LogFactory.getLog(EditRuleWizard.class); + + @Override + protected String finishImpl(FacesContext context, String outcome) throws Exception + { + // get hold of the space the rule will apply to and make sure + // it is actionable + Node currentSpace = browseBean.getActionSpace(); + + // get the existing rule + Rule rule = this.rulesBean.getCurrentRule(); + + // remove all the conditions and actions from the current rule + rule.removeAllActionConditions(); + rule.removeAllActions(); + + // re-setup the rule + outcome = setupRule(context, rule, outcome); + + // Save the rule + this.ruleService.saveRule(currentSpace.getNodeRef(), rule); + + if (logger.isDebugEnabled()) + logger.debug("Updated rule '" + this.title + "'"); + + return outcome; + } + + @Override + public void init() + { + super.init(); + + // get hold of the current rule details + Rule rule = this.rulesBean.getCurrentRule(); + + if (rule == null) + { + throw new AlfrescoRuntimeException("Failed to locate the current rule"); + } + + // populate the bean with current values + this.type = rule.getRuleTypeName(); + this.title = rule.getTitle(); + this.description = rule.getDescription(); + this.applyToSubSpaces = rule.isAppliedToChildren(); + this.runInBackground = rule.getExecuteAsychronously(); + + // populate the conditions list with maps of properties representing each condition + List conditions = rule.getActionConditions(); + for (ActionCondition condition : conditions) + { + Map params = populateCondition(condition); + this.allConditionsProperties.add(params); + } + + List actions = rule.getActions(); + for (Action action : actions) + { + // use the base class version of populateActionFromProperties(), + // but for this we need to setup the currentActionProperties and + // action variables + this.currentActionProperties = new HashMap(3); + this.action = action.getActionDefinitionName(); + populateAction(action.getParameterValues()); + + // also add the name and summary + this.currentActionProperties.put(PROP_ACTION_NAME, this.action); + // generate the summary + this.currentActionProperties.put(PROP_ACTION_SUMMARY, + buildActionSummary(this.currentActionProperties)); + + // add the populated currentActionProperties to the list + this.allActionsProperties.add(this.currentActionProperties); + } + + // reset the current action + this.action = null; + } + + /** + * Populates a Map of properties the wizard is expecting for the given condition + * + * @param condition The condition to build the map for + */ + protected Map populateCondition(ActionCondition condition) + { + // find out what the condition is called + Map condProps = new HashMap(3); + String name = condition.getActionConditionDefinitionName(); + condProps.put(PROP_CONDITION_NAME, name); + + // add the appropriate properties + Map repoCondProps = condition.getParameterValues(); + if (name.equals(ComparePropertyValueEvaluator.NAME)) + { + condProps.put(PROP_CONTAINS_TEXT, (String)repoCondProps.get(ComparePropertyValueEvaluator.PARAM_VALUE)); + } + else if (name.equals(InCategoryEvaluator.NAME)) + { + NodeRef catNodeRef = (NodeRef)repoCondProps.get(InCategoryEvaluator.PARAM_CATEGORY_VALUE); + condProps.put(PROP_CATEGORY, catNodeRef); + } + else if (name.equals(IsSubTypeEvaluator.NAME)) + { + condProps.put(PROP_MODEL_TYPE, ((QName)repoCondProps.get(IsSubTypeEvaluator.PARAM_TYPE)).toString()); + } + else if (name.equals(HasAspectEvaluator.NAME)) + { + condProps.put(PROP_ASPECT, ((QName)repoCondProps.get(HasAspectEvaluator.PARAM_ASPECT)).toString()); + } + else if (name.equals(CompareMimeTypeEvaluator.NAME)) + { + condProps.put(PROP_MIMETYPE, repoCondProps.get(CompareMimeTypeEvaluator.PARAM_VALUE)); + } + + // specify whether the condition result should be inverted + condProps.put(PROP_CONDITION_NOT, Boolean.valueOf(condition.getInvertCondition())); + + // generate the summary + condProps.put(PROP_CONDITION_SUMMARY, buildConditionSummary(condProps)); + + return condProps; + } + + /** + * Populate the actionProperties member variable with correct props for the current action + * using the supplied property map. + * + * @param actionProps Map to retrieve props appropriate to the current action from + */ + protected void populateAction(Map actionProps) + { + if (this.action.equals(AddFeaturesActionExecuter.NAME)) + { + QName aspect = (QName)actionProps.get(AddFeaturesActionExecuter.PARAM_ASPECT_NAME); + this.currentActionProperties.put(PROP_ASPECT, aspect.toString()); + } + else if (this.action.equals(RemoveFeaturesActionExecuter.NAME)) + { + QName aspect = (QName)actionProps.get(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME); + this.currentActionProperties.put(PROP_ASPECT, aspect.toString()); + } + else if (this.action.equals(CopyActionExecuter.NAME)) + { + NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER); + this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); + } + else if (this.action.equals(MoveActionExecuter.NAME)) + { + NodeRef destNodeRef = (NodeRef)actionProps.get(MoveActionExecuter.PARAM_DESTINATION_FOLDER); + this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); + } + else if (this.action.equals(SimpleWorkflowActionExecuter.NAME)) + { + String approveStep = (String)actionProps.get(SimpleWorkflowActionExecuter.PARAM_APPROVE_STEP); + Boolean approveMove = (Boolean)actionProps.get(SimpleWorkflowActionExecuter.PARAM_APPROVE_MOVE); + NodeRef approveFolderNode = (NodeRef)actionProps.get( + SimpleWorkflowActionExecuter.PARAM_APPROVE_FOLDER); + + String rejectStep = (String)actionProps.get(SimpleWorkflowActionExecuter.PARAM_REJECT_STEP); + Boolean rejectMove = (Boolean)actionProps.get(SimpleWorkflowActionExecuter.PARAM_REJECT_MOVE); + NodeRef rejectFolderNode = (NodeRef)actionProps.get( + SimpleWorkflowActionExecuter.PARAM_REJECT_FOLDER); + + this.currentActionProperties.put(PROP_APPROVE_STEP_NAME, approveStep); + this.currentActionProperties.put(PROP_APPROVE_ACTION, approveMove ? "move" : "copy"); + this.currentActionProperties.put(PROP_APPROVE_FOLDER, approveFolderNode); + + if (rejectStep == null && rejectMove == null && rejectFolderNode == null) + { + this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "no"); + } + else + { + this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "yes"); + this.currentActionProperties.put(PROP_REJECT_STEP_NAME, rejectStep); + this.currentActionProperties.put(PROP_REJECT_ACTION, rejectMove ? "move" : "copy"); + this.currentActionProperties.put(PROP_REJECT_FOLDER, rejectFolderNode); + } + } + else if (this.action.equals(LinkCategoryActionExecuter.NAME)) + { + NodeRef catNodeRef = (NodeRef)actionProps.get(LinkCategoryActionExecuter.PARAM_CATEGORY_VALUE); + this.currentActionProperties.put(PROP_CATEGORY, catNodeRef); + } + else if (this.action.equals(CheckOutActionExecuter.NAME)) + { + NodeRef destNodeRef = (NodeRef)actionProps.get(CheckOutActionExecuter.PARAM_DESTINATION_FOLDER); + this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); + } + else if (this.action.equals(CheckInActionExecuter.NAME)) + { + String checkDesc = (String)actionProps.get(CheckInActionExecuter.PARAM_DESCRIPTION); + this.currentActionProperties.put(PROP_CHECKIN_DESC, checkDesc); + + Boolean minorChange = (Boolean)actionProps.get(CheckInActionExecuter.PARAM_MINOR_CHANGE); + this.currentActionProperties.put(PROP_CHECKIN_MINOR, minorChange); + } + else if (this.action.equals(TransformActionExecuter.NAME)) + { + String transformer = (String)actionProps.get(TransformActionExecuter.PARAM_MIME_TYPE); + this.currentActionProperties.put(PROP_TRANSFORMER, transformer); + + NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER); + this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); + } + else if (this.action.equals(ImageTransformActionExecuter.NAME)) + { + String transformer = (String)actionProps.get(TransformActionExecuter.PARAM_MIME_TYPE); + this.currentActionProperties.put(PROP_IMAGE_TRANSFORMER, transformer); + + String options = (String)actionProps.get(ImageTransformActionExecuter.PARAM_CONVERT_COMMAND); + this.currentActionProperties.put(PROP_TRANSFORM_OPTIONS, options != null ? options : ""); + + NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER); + this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); + } + else if (this.action.equals(MailActionExecuter.NAME)) + { + String subject = (String)actionProps.get(MailActionExecuter.PARAM_SUBJECT); + this.currentActionProperties.put(PROP_SUBJECT, subject); + + String message = (String)actionProps.get(MailActionExecuter.PARAM_TEXT); + this.currentActionProperties.put(PROP_MESSAGE, message); + + // handle single email or multiple authority recipients + String to = (String)actionProps.get(MailActionExecuter.PARAM_TO); + if (to != null) + { + this.currentActionProperties.put(PROP_TO, to); + } + else + { + List recipients = (List)actionProps.get(MailActionExecuter.PARAM_TO_MANY); + if (recipients != null && recipients.size() != 0) + { + // rebuild the list of RecipientWrapper objects from the stored action + for (String authority : recipients) + { + this.emailRecipients.add( + new RecipientWrapper(displayLabelForAuthority(authority), authority)); + } + } + } + + NodeRef templateRef = (NodeRef)actionProps.get(MailActionExecuter.PARAM_TEMPLATE); + if (templateRef != null) + { + this.currentActionProperties.put(PROP_TEMPLATE, templateRef.getId()); + this.usingTemplate = templateRef.getId(); + } + } + else if (this.action.equals(ImporterActionExecuter.NAME)) + { + NodeRef destNodeRef = (NodeRef)actionProps.get(ImporterActionExecuter.PARAM_DESTINATION_FOLDER); + this.currentActionProperties.put(PROP_DESTINATION, destNodeRef); + } + else if (this.action.equals(SpecialiseTypeActionExecuter.NAME) == true) + { + QName specialiseType = (QName)actionProps.get(SpecialiseTypeActionExecuter.PARAM_TYPE_NAME); + this.currentActionProperties.put(PROP_OBJECT_TYPE, specialiseType.toString()); + } + } +} diff --git a/source/java/org/alfresco/web/bean/RulesBean.java b/source/java/org/alfresco/web/bean/rules/RulesBean.java similarity index 94% rename from source/java/org/alfresco/web/bean/RulesBean.java rename to source/java/org/alfresco/web/bean/rules/RulesBean.java index 1a29521510..00f8140f48 100644 --- a/source/java/org/alfresco/web/bean/RulesBean.java +++ b/source/java/org/alfresco/web/bean/rules/RulesBean.java @@ -14,9 +14,8 @@ * language governing permissions and limitations under the * License. */ -package org.alfresco.web.bean; +package org.alfresco.web.bean.rules; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,14 +24,13 @@ import java.util.Map; import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -import org.alfresco.service.cmr.action.Action; -import org.alfresco.service.cmr.action.ActionCondition; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.rule.Rule; import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.web.app.Application; import org.alfresco.web.app.context.IContextListener; import org.alfresco.web.app.context.UIContextService; +import org.alfresco.web.bean.BrowseBean; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.component.UIActionLink; diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java index c8d789a51a..9d30d4e059 100644 --- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java @@ -17,7 +17,7 @@ public class CreateSpaceDialog extends CreateSpaceWizard @Override public String getFinishButtonLabel() { - return Application.getMessage(FacesContext.getCurrentInstance(), "new_space"); + return Application.getMessage(FacesContext.getCurrentInstance(), "create_space"); } @Override diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java index 1a4508d4f3..d8a73a316a 100644 --- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java +++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java @@ -682,7 +682,7 @@ public class CreateSpaceWizard extends BaseWizardBean { return MessageFormat.format(Application.getMessage( FacesContext.getCurrentInstance(), "error_space"), - ((FileExistsException)exception).getExisting().getName()); + exception.getMessage()); } } } diff --git a/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java b/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java deleted file mode 100644 index c3f7786313..0000000000 --- a/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package org.alfresco.web.bean.wizard; - -import java.io.Serializable; -import java.text.MessageFormat; -import java.util.Map; - -import javax.faces.context.FacesContext; -import javax.transaction.UserTransaction; - -import org.alfresco.service.cmr.action.Action; -import org.alfresco.web.app.Application; -import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.ui.common.Utils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Handler class used by the New Action Wizard - * - * @author Kevin Roast - */ -public class NewActionWizard extends BaseActionWizard -{ - private static Log logger = LogFactory.getLog(NewActionWizard.class); - - private static final String ERROR = "error_action"; - - // TODO: retrieve these from the config service - private static final String WIZARD_TITLE_ID = "create_action_title"; - private static final String WIZARD_DESC_ID = "create_action_desc"; - private static final String STEP1_TITLE_ID = "create_action_step1_title"; - private static final String STEP2_TITLE_ID = "create_action_step2_title"; - private static final String FINISH_INSTRUCTION_ID = "create_action_finish_instruction"; - - /** - * Deals with the finish button being pressed - * - * @return outcome - */ - public String finish() - { - String outcome = FINISH_OUTCOME; - - UserTransaction tx = null; - - try - { - tx = Repository.getUserTransaction(FacesContext.getCurrentInstance()); - tx.begin(); - - // build the action params map based on the selected action instance - Map actionParams = buildActionParams(); - - // build the action to execute - Action action = this.actionService.createAction(getAction()); - action.setParameterValues(actionParams); - - // execute the action on the current document node - this.actionService.executeAction(action, this.browseBean.getDocument().getNodeRef()); - - if (logger.isDebugEnabled()) - { - logger.debug("Executed action '" + this.action + - "' with action params of " + - this.currentActionProperties); - } - - // reset the current document properties/aspects in case we have changed them - // during the execution of the custom action - this.browseBean.getDocument().reset(); - - // commit the transaction - tx.commit(); - } - catch (Throwable e) - { - // rollback the transaction - try { if (tx != null) {tx.rollback();} } catch (Exception ex) {} - Utils.addErrorMessage(MessageFormat.format(Application.getMessage( - FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e); - outcome = null; - } - - return outcome; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription() - */ - public String getWizardDescription() - { - return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID); - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle() - */ - public String getWizardTitle() - { - return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID); - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription() - */ - public String getStepDescription() - { - return ""; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle() - */ - public String getStepTitle() - { - String stepTitle = null; - - switch (this.currentStep) - { - case 1: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID); - break; - } - case 2: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID); - break; - } - case 3: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID); - break; - } - default: - { - stepTitle = ""; - } - } - - return stepTitle; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions() - */ - public String getStepInstructions() - { - String stepInstruction = null; - - switch (this.currentStep) - { - case 3: - { - stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID); - break; - } - default: - { - stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID); - } - } - - return stepInstruction; - } - - /** - * Initialises the wizard - */ - public void init() - { - super.init(); - } - - /** - * @return Returns the summary data for the wizard. - */ - public String getSummary() - { - String summaryAction = this.actionService.getActionDefinition( - this.action).getTitle(); - - return buildSummary( - new String[] {"Action"}, - new String[] {summaryAction}); - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int) - */ - protected String determineOutcomeForStep(int step) - { - String outcome = null; - - switch(step) - { - case 1: - { - outcome = "action"; - break; - } - case 2: - { - outcome = this.action; - break; - } - case 3: - { - outcome = "summary"; - break; - } - default: - { - outcome = CANCEL_OUTCOME; - } - } - - return outcome; - } -} diff --git a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java deleted file mode 100644 index 2f51f1548e..0000000000 --- a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java +++ /dev/null @@ -1,1516 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package org.alfresco.web.bean.wizard; - -import java.io.Serializable; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.ResourceBundle; - -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; -import javax.faces.model.SelectItem; -import javax.transaction.UserTransaction; - -import org.alfresco.config.Config; -import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigService; -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator; -import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator; -import org.alfresco.repo.action.evaluator.HasAspectEvaluator; -import org.alfresco.repo.action.evaluator.InCategoryEvaluator; -import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator; -import org.alfresco.repo.action.executer.AddFeaturesActionExecuter; -import org.alfresco.repo.action.executer.CheckInActionExecuter; -import org.alfresco.repo.action.executer.CopyActionExecuter; -import org.alfresco.repo.action.executer.ImageTransformActionExecuter; -import org.alfresco.repo.action.executer.ImporterActionExecuter; -import org.alfresco.repo.action.executer.LinkCategoryActionExecuter; -import org.alfresco.repo.action.executer.MailActionExecuter; -import org.alfresco.repo.action.executer.RemoveFeaturesActionExecuter; -import org.alfresco.repo.action.executer.SimpleWorkflowActionExecuter; -import org.alfresco.repo.action.executer.SpecialiseTypeActionExecuter; -import org.alfresco.repo.action.executer.TransformActionExecuter; -import org.alfresco.service.cmr.action.Action; -import org.alfresco.service.cmr.action.ActionCondition; -import org.alfresco.service.cmr.action.ActionConditionDefinition; -import org.alfresco.service.cmr.dictionary.TypeDefinition; -import org.alfresco.service.cmr.repository.MimetypeService; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.rule.Rule; -import org.alfresco.service.cmr.rule.RuleService; -import org.alfresco.service.cmr.rule.RuleType; -import org.alfresco.service.namespace.QName; -import org.alfresco.web.app.Application; -import org.alfresco.web.bean.RulesBean; -import org.alfresco.web.bean.repository.Node; -import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.data.IDataContainer; -import org.alfresco.web.data.QuickSort; -import org.alfresco.web.ui.common.Utils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Handler class used by the New Space Wizard - * - * @author gavinc - */ -public class NewRuleWizard extends BaseActionWizard -{ - // parameter names for actions - public static final String PROP_ACTION_NAME = "actionName"; - public static final String PROP_ACTION_SUMMARY = "actionSummary"; - - // parameter names for conditions - public static final String PROP_CONDITION_NAME = "conditionName"; - public static final String PROP_CONDITION_SUMMARY = "conditionSummary"; - public static final String PROP_CONDITION_NOT = "notcondition"; - public static final String PROP_PROPERTY = "property"; - public static final String PROP_CONTAINS_TEXT = "containstext"; - public static final String PROP_MODEL_TYPE = "modeltype"; - public static final String PROP_MIMETYPE = "mimetype"; - public static final String PROP_MODEL_ASPECT = "modelaspect"; - public static final String PROP_TYPE_OR_ASPECT = "typeoraspect"; - - private static Log logger = LogFactory.getLog(NewRuleWizard.class); - - private static final String ERROR = "error_rule"; - - // TODO: retrieve these from the config service - private static final String WIZARD_TITLE_ID = "new_rule_title"; - private static final String WIZARD_TITLE_EDIT_ID = "new_rule_title_edit"; - private static final String WIZARD_DESC_ID = "new_rule_desc"; - private static final String WIZARD_DESC_EDIT_ID = "new_rule_desc_edit"; - private static final String STEP1_TITLE_ID = "new_rule_step1_title"; - private static final String STEP2_TITLE_ID = "new_rule_step2_title"; - private static final String STEP3_TITLE_ID = "new_rule_step3_title"; - private static final String FINISH_INSTRUCTION_ID = "new_rule_finish_instruction"; - private static final String FINISH_INSTRUCTION_EDIT_ID = "new_rule_finish_instruction_edit"; - - // new rule wizard specific properties - private String title; - private String description; - private String type; - private String condition; - private boolean runInBackground; - private boolean applyToSubSpaces; - private boolean editingAction; - private boolean editingCondition; - - protected RuleService ruleService; - protected RulesBean rulesBean; - - private List modelTypes; - private List mimeTypes; - private List types; - private List conditions; - private List typesAndAspects; - private Map conditionDescriptions; - private Map currentConditionProperties; - - private List> allActionsProperties; - private List> allConditionsProperties; - - private DataModel allActionsDataModel; - private DataModel allConditionsDataModel; - - private boolean isFinished = false; - - /** - * Deals with the finish button being pressed - * - * @return outcome - */ - public synchronized String finish() - { - String outcome = FINISH_OUTCOME; - - if (isFinished == false) - { - isFinished = true; - - UserTransaction tx = null; - - try - { - tx = Repository.getUserTransaction(FacesContext.getCurrentInstance()); - tx.begin(); - - // get hold of the space the rule will apply to and make sure - // it is actionable - Node currentSpace = browseBean.getActionSpace(); - - Rule rule = null; - - if (this.editMode) - { - // update the existing rule in the repository - rule = this.rulesBean.getCurrentRule(); - - // remove all the conditions and actions from the current rule - rule.removeAllActionConditions(); - rule.removeAllActions(); - } - else - { - rule = this.ruleService.createRule(this.getType()); - } - - // setup the rule and add it to the space - rule.setTitle(this.title); - rule.setDescription(this.description); - rule.applyToChildren(this.applyToSubSpaces); - rule.setExecuteAsynchronously(this.runInBackground); - - // add all the conditions to the rule - for (Map condParams : this.allConditionsProperties) - { - Map repoCondParams = buildConditionParams(condParams); - - // add the condition to the rule - ActionCondition condition = this.actionService.createActionCondition( - (String)condParams.get(PROP_CONDITION_NAME)); - condition.setParameterValues(repoCondParams); - - // specify whether the condition result should be inverted - Boolean not = (Boolean)condParams.get(PROP_CONDITION_NOT); - condition.setInvertCondition(((Boolean)not).booleanValue()); - - rule.addActionCondition(condition); - } - - // add all the actions to the rule - for (Map actionParams : this.allActionsProperties) - { - // use the base class version of buildActionParams(), but for this we need - // to setup the currentActionProperties and action variables - String actionName = (String)actionParams.get(PROP_ACTION_NAME); - this.action = actionName; - this.currentActionProperties = actionParams; - Map repoActionParams = buildActionParams(); - - // add the action to the rule - Action action = this.actionService.createAction(actionName); - action.setParameterValues(repoActionParams); - rule.addAction(action); - } - - // Save the rule - this.ruleService.saveRule(currentSpace.getNodeRef(), rule); - - if (logger.isDebugEnabled()) - { - logger.debug(this.editMode ? "Updated" : "Added" + " rule '" + this.title + "'"); - } - - // commit the transaction - tx.commit(); - } - catch (Throwable e) - { - // rollback the transaction - try { if (tx != null) {tx.rollback();} } catch (Exception ex) {} - Utils.addErrorMessage(MessageFormat.format(Application.getMessage( - FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e); - outcome = null; - - isFinished = false; - } - } - - return outcome; - } - - /** - * Returns the properties for all the conditions as a JSF DataModel - * - * @return JSF DataModel representing the condition properties - */ - public DataModel getAllConditionsDataModel() - { - if (this.allConditionsDataModel == null) - { - this.allConditionsDataModel = new ListDataModel(); - } - - this.allConditionsDataModel.setWrappedData(this.allConditionsProperties); - - return this.allConditionsDataModel; - } - - /** - * Displays the settings page for the current condition being added (if required) - * - * @return The outcome - */ - public String promptForConditionValues() - { - String outcome = null; - - // set the flag to show we are creating a new condition - this.editingCondition = false; - - if ("no-condition".equals(this.condition)) - { - HashMap condProps = new HashMap(3); - condProps.put(PROP_CONDITION_NAME, this.condition); - condProps.put(PROP_CONDITION_SUMMARY, Application.getMessage( - FacesContext.getCurrentInstance(), "condition_no_condition")); - condProps.put(PROP_CONDITION_NOT, Boolean.FALSE); - this.allConditionsProperties.add(condProps); - - // NOTE: we don't set an outcome to stay on the same page as there are - // no settings related to 'no-condition' - - if (logger.isDebugEnabled()) - logger.debug("Add 'no-condition' condition to list"); - } - else if (this.condition != null) - { - HashMap condProps = new HashMap(3); - condProps.put(PROP_CONDITION_NAME, this.condition); - this.currentConditionProperties = condProps; - outcome = this.condition; - - if (logger.isDebugEnabled()) - logger.debug("Added '" + this.condition + "' condition to list"); - } - - // reset the selected condition drop down - this.condition = null; - - return outcome; - } - - /** - * Sets up the context for editing existing condition values - * - * @return The outcome - */ - public String editCondition() - { - // use the built in JSF support for retrieving the object for the - // row that was clicked by the user - Map conditionToEdit = (Map)this.allConditionsDataModel.getRowData(); - this.condition = (String)conditionToEdit.get(PROP_CONDITION_NAME); - this.currentConditionProperties = conditionToEdit; - - // set the flag to show we are editing a condition - this.editingCondition = true; - - return this.condition; - } - - /** - * Adds the condition just setup by the user to the list of conditions for the rule - * - * @return The outcome - */ - public String addCondition() - { - String summary = buildConditionSummary(this.currentConditionProperties); - - if (summary != null) - { - this.currentConditionProperties.put(PROP_CONDITION_SUMMARY, summary); - } - - if (this.editingCondition) - { - this.condition = null; - } - else - { - this.allConditionsProperties.add(this.currentConditionProperties); - } - - // re-display the conditions step - return "condition"; - } - - /** - * Removes the requested condition from the list - * - * @return The outcome - */ - public String removeCondition() - { - // use the built in JSF support for retrieving the object for the - // row that was clicked by the user - Map conditionToRemove = (Map)this.allConditionsDataModel.getRowData(); - this.allConditionsProperties.remove(conditionToRemove); - - // reset the action drop down - this.condition = null; - - // return no outcome to refresh page - return null; - } - - /** - * Cancels the addition of the condition - * - * @return The outcome - */ - public String cancelAddCondition() - { - if (this.editingCondition) - { - this.condition = null; - } - else - { - this.currentConditionProperties.clear(); - } - - - return "condition"; - } - - /** - * Returns the properties for all the actions as a JSF DataModel - * - * @return JSF DataModel representing the action properties - */ - public DataModel getAllActionsDataModel() - { - if (this.allActionsDataModel == null) - { - this.allActionsDataModel = new ListDataModel(); - } - - this.allActionsDataModel.setWrappedData(this.allActionsProperties); - - return this.allActionsDataModel; - } - - /** - * Displays the settings page for the current action being added - * - * @return The outcome - */ - public String promptForActionValues() - { - // set the flag to show we are creating a new action - this.editingAction = false; - - HashMap actionProps = new HashMap(3); - actionProps.put(PROP_ACTION_NAME, this.action); - this.currentActionProperties = actionProps; - - String outcome = this.action; - - if (SimpleWorkflowActionExecuter.NAME.equals(this.action)) - { - this.currentActionProperties.put("approveAction", "move"); - this.currentActionProperties.put("rejectStepPresent", "yes"); - this.currentActionProperties.put("rejectAction", "move"); - - if (logger.isDebugEnabled()) - logger.debug("Added '" + SimpleWorkflowActionExecuter.NAME + - "' action to list"); - } - else if (CheckInActionExecuter.NAME.equals(this.action)) - { - this.currentActionProperties.put(PROP_CHECKIN_MINOR, new Boolean(true)); - - if (logger.isDebugEnabled()) - logger.debug("Added '" + CheckInActionExecuter.NAME + - "' action to list"); - } - else if ("extract-metadata".equals(this.action)) - { - // This one (currently) has no parameters, so just add it... - actionProps.put(PROP_ACTION_SUMMARY, buildActionSummary(actionProps)); - this.allActionsProperties.add(actionProps); - - outcome = null; - - if (logger.isDebugEnabled()) - logger.debug("Added 'extract-metadata' action to list"); - } - else - { - if (logger.isDebugEnabled()) - logger.debug("Added '" + this.action + "' action to list"); - } - - // reset the selected action drop down - this.action = null; - - return outcome; - } - - /** - * Sets up the context for editing existing action values - * - * @return The outcome - */ - public String editAction() - { - // use the built in JSF support for retrieving the object for the - // row that was clicked by the user - Map actionToEdit = (Map)this.allActionsDataModel.getRowData(); - this.action = (String)actionToEdit.get(PROP_ACTION_NAME); - this.currentActionProperties = actionToEdit; - - // set the flag to show we are editing an action - this.editingAction = true; - - return this.action; - } - - /** - * Adds the action just setup by the user to the list of actions for the rule - * - * @return The outcome - */ - public String addAction() - { - String summary = buildActionSummary(this.currentActionProperties); - - if (summary != null) - { - this.currentActionProperties.put(PROP_ACTION_SUMMARY, summary); - } - - if (this.editingAction) - { - this.action = null; - } - else - { - this.allActionsProperties.add(this.currentActionProperties); - } - - // re-display the actions step - return "action"; - } - - /** - * Removes the requested action from the list - * - * @return The outcome - */ - public String removeAction() - { - // use the built in JSF support for retrieving the object for the - // row that was clicked by the user - Map actionToRemove = (Map)this.allActionsDataModel.getRowData(); - this.allActionsProperties.remove(actionToRemove); - - // reset the action drop down - this.action = null; - - // return no outcome to refresh page - return null; - } - - /** - * Cancels the addition of the action - * - * @return The outcome - */ - public String cancelAddAction() - { - if (this.editingAction) - { - this.condition = null; - } - else - { - this.currentActionProperties.clear(); - } - - return "action"; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription() - */ - public String getWizardDescription() - { - if (this.editMode) - { - return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_EDIT_ID); - } - else - { - return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID); - } - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle() - */ - public String getWizardTitle() - { - if (this.editMode) - { - return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_EDIT_ID); - } - else - { - return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID); - } - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription() - */ - public String getStepDescription() - { - String stepDesc = null; - - switch (this.currentStep) - { - case 4: - { - stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_DESCRIPTION_ID); - break; - } - default: - { - stepDesc = ""; - } - } - - return stepDesc; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle() - */ - public String getStepTitle() - { - String stepTitle = null; - - switch (this.currentStep) - { - case 1: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID); - break; - } - case 2: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID); - break; - } - case 3: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP3_TITLE_ID); - break; - } - case 4: - { - stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID); - break; - } - default: - { - stepTitle = ""; - } - } - - return stepTitle; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions() - */ - public String getStepInstructions() - { - String stepInstruction = null; - - switch (this.currentStep) - { - case 4: - { - if (this.editMode) - { - stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_EDIT_ID); - } - else - { - stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID); - } - break; - } - default: - { - stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID); - } - } - - return stepInstruction; - } - - /** - * Initialises the wizard - */ - public void init() - { - super.init(); - - this.title = null; - this.description = null; - this.type = "inbound"; - this.condition = null; - this.action = null; - this.applyToSubSpaces = false; - this.runInBackground = false; - this.conditions = null; - this.conditionDescriptions = null; - - this.allConditionsProperties = new ArrayList>(); - this.allActionsProperties = new ArrayList>(); - - this.isFinished = false; - } - - /** - * Sets the context of the rule up before performing the - * standard wizard editing steps - * - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#startWizardForEdit(javax.faces.event.ActionEvent) - */ - public void startWizardForEdit(ActionEvent event) - { - // setup context for rule to be edited - this.rulesBean.setupRuleAction(event); - - // perform the usual edit processing - super.startWizardForEdit(event); - } - - /** - * Populates the values of the backing bean ready for editing the rule - * - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#populate() - */ - public void populate() - { - // get hold of the current rule details - Rule rule = this.rulesBean.getCurrentRule(); - - if (rule == null) - { - throw new AlfrescoRuntimeException("Failed to locate the current rule"); - } - - // populate the bean with current values - this.type = rule.getRuleTypeName(); - this.title = rule.getTitle(); - this.description = rule.getDescription(); - this.applyToSubSpaces = rule.isAppliedToChildren(); - this.runInBackground = rule.getExecuteAsychronously(); - - // populate the conditions list with maps of properties representing each condition - List conditions = rule.getActionConditions(); - for (ActionCondition condition : conditions) - { - Map params = populateCondition(condition); - this.allConditionsProperties.add(params); - } - - List actions = rule.getActions(); - for (Action action : actions) - { - // use the base class version of populateActionFromProperties(), - // but for this we need to setup the currentActionProperties and - // action variables - this.currentActionProperties = new HashMap(3); - this.action = action.getActionDefinitionName(); - populateActionFromProperties(action.getParameterValues()); - - // also add the name and summary - this.currentActionProperties.put(PROP_ACTION_NAME, this.action); - // generate the summary - this.currentActionProperties.put(PROP_ACTION_SUMMARY, - buildActionSummary(this.currentActionProperties)); - - // add the populated currentActionProperties to the list - this.allActionsProperties.add(this.currentActionProperties); - } - - // reset the current action - this.action = null; - } - - /** - * @return Returns the summary data for the wizard. - */ - public String getSummary() - { - // create the summary using all the conditions - StringBuilder conditionsSummary = new StringBuilder(); - for (Map props : this.allConditionsProperties) - { - conditionsSummary.append(props.get(PROP_CONDITION_SUMMARY)); - conditionsSummary.append("
"); - } - - // create the summary using all the actions - StringBuilder actionsSummary = new StringBuilder(); - for (Map props : this.allActionsProperties) - { - actionsSummary.append(props.get(PROP_ACTION_SUMMARY)); - actionsSummary.append("
"); - } - - ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance()); - - String backgroundYesNo = this.runInBackground ? bundle.getString("yes") : bundle.getString("no"); - String subSpacesYesNo = this.applyToSubSpaces ? bundle.getString("yes") : bundle.getString("no"); - - return buildSummary( - new String[] {bundle.getString("rule_type"), bundle.getString("name"), bundle.getString("description"), - bundle.getString("apply_to_sub_spaces"), bundle.getString("run_in_background"), - bundle.getString("conditions"), bundle.getString("actions")}, - new String[] {this.type, this.title, this.description, subSpacesYesNo, backgroundYesNo, - conditionsSummary.toString(), actionsSummary.toString()}); - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#back() - */ - public String back() - { - // reset the drop downs when back is clicked - this.action = null; - this.condition = null; - - return super.back(); - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#next() - */ - public String next() - { - // reset the drop downs when next is clicked - this.action = null; - this.condition = null; - - return super.next(); - } - - /** - * @return Returns the description. - */ - public String getDescription() - { - return description; - } - - /** - * @param description The description to set. - */ - public void setDescription(String description) - { - this.description = description; - } - - /** - * @return Returns the title. - */ - public String getTitle() - { - return title; - } - - /** - * @param title The title to set. - */ - public void setTitle(String title) - { - this.title = title; - } - - /** - * @return Returns whether the rule should run in the background - */ - public boolean getRunInBackground() - { - return this.runInBackground; - } - - /** - * @param runInBackground Sets whether the rule should run in the background - */ - public void setRunInBackground(boolean runInBackground) - { - this.runInBackground = runInBackground; - } - - /** - * @return Returns whether the rule should be applied to sub spaces i.e. if it gets inherited - */ - public boolean getApplyToSubSpaces() - { - return this.applyToSubSpaces; - } - - /** - * @param applyToSubSpaces Sets whether the rule will get applied to sub spaces - */ - public void setApplyToSubSpaces(boolean applyToSubSpaces) - { - this.applyToSubSpaces = applyToSubSpaces; - } - - /** - * @return Returns the type. - */ - public String getType() - { - return type; - } - - /** - * @param type The type to set - */ - public void setType(String type) - { - this.type = type; - } - - /** - * @return Returns the selected condition - */ - public String getCondition() - { - return this.condition; - } - - /** - * @param condition Sets the selected condition - */ - public void setCondition(String condition) - { - this.condition = condition; - } - - /** - * @param ruleService Sets the rule service to use - */ - public void setRuleService(RuleService ruleService) - { - this.ruleService = ruleService; - } - - /** - * @param mimetypeService Sets the mimetype service to use - */ - public void setMimetypeService(MimetypeService mimetypeService) - { - this.mimetypeService = mimetypeService; - } - - /** - * Sets the RulesBean instance to be used by the wizard in edit mode - * - * @param rulesBean The RulesBean - */ - public void setRulesBean(RulesBean rulesBean) - { - this.rulesBean = rulesBean; - } - - /** - * @return Returns the list of selectable actions - */ - public List getActions() - { - if (this.actions == null) - { - super.getActions(); - - // add the "Select an action" entry at the beginning of the list - this.actions.add(0, new SelectItem("null", - Application.getMessage(FacesContext.getCurrentInstance(), "select_an_action"))); - } - - return this.actions; - } - - /** - * Returns a list of the types available in the repository - * - * @return List of SelectItem objects - */ - public List getModelTypes() - { - if (this.modelTypes == null) - { - FacesContext context = FacesContext.getCurrentInstance(); - ConfigService svc = Application.getConfigService(context); - Config wizardCfg = svc.getConfig("Action Wizards"); - if (wizardCfg != null) - { - ConfigElement typesCfg = wizardCfg.getConfigElement("types"); - if (typesCfg != null) - { - this.modelTypes = new ArrayList(); - for (ConfigElement child : typesCfg.getChildren()) - { - QName idQName = Repository.resolveToQName(child.getAttribute("name")); - - // get the display label from config - String label = Utils.getDisplayLabel(context, child); - - // if there wasn't a client based label try and get it from the dictionary - if (label == null) - { - TypeDefinition typeDef = this.dictionaryService.getType(idQName); - if (typeDef != null) - { - label = typeDef.getTitle(); - } - else - { - label = idQName.getLocalName(); - } - } - - this.modelTypes.add(new SelectItem(idQName.toString(), label)); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.modelTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - else - { - logger.warn("Could not find types configuration element"); - } - } - else - { - logger.warn("Could not find Action Wizards configuration section"); - } - } - - return this.modelTypes; - } - - /** - * Returns a list of mime types in the system - * - * @return List of mime types - */ - public List getMimeTypes() - { - if (this.mimeTypes == null) - { - this.mimeTypes = new ArrayList(50); - - Map mimeTypes = mimetypeService.getDisplaysByMimetype(); - for (String mimeType : mimeTypes.keySet()) - { - this.mimeTypes.add(new SelectItem(mimeType, mimeTypes.get(mimeType))); - } - - // make sure the list is sorted by the values - QuickSort sorter = new QuickSort(this.mimeTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - } - - return this.mimeTypes; - } - - /** - * @return Returns the list of selectable conditions - */ - public List getConditions() - { - if (this.conditions == null) - { - List ruleConditions = this.actionService.getActionConditionDefinitions(); - this.conditions = new ArrayList(ruleConditions.size()); - for (ActionConditionDefinition ruleConditionDef : ruleConditions) - { - // add to SelectItem list - this.conditions.add(new SelectItem(ruleConditionDef.getName(), - ruleConditionDef.getTitle())); - } - - // make sure the list is sorted by the label - QuickSort sorter = new QuickSort(this.conditions, "label", true, IDataContainer.SORT_CASEINSENSITIVE); - sorter.sort(); - - // add the "Select a condition" entry at the beginning of the list - this.conditions.add(0, new SelectItem("null", - Application.getMessage(FacesContext.getCurrentInstance(), "select_a_condition"))); - } - - return this.conditions; - } - - /** - * @return Returns a map of all the condition descriptions - */ - public Map getConditionDescriptions() - { - if (this.conditionDescriptions == null) - { - List ruleConditions = this.actionService.getActionConditionDefinitions(); - this.conditionDescriptions = new HashMap(ruleConditions.size()); - for (ActionConditionDefinition ruleConditionDef : ruleConditions) - { - this.conditionDescriptions.put(ruleConditionDef.getName(), - ruleConditionDef.getDescription()); - } - } - - return this.conditionDescriptions; - } - - /** - * @return Returns the types of rules that can be defined - */ - public List getTypes() - { - if (this.types == null) - { - List ruleTypes = this.ruleService.getRuleTypes(); - this.types = new ArrayList(ruleTypes.size()); - for (RuleType ruleType : ruleTypes) - { - this.types.add(new SelectItem(ruleType.getName(), ruleType.getDisplayLabel())); - } - } - - return this.types; - } - - /** - * @return Gets the condition settings - */ - public Map getConditionProperties() - { - return this.currentConditionProperties; - } - - /** - * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int) - */ - protected String determineOutcomeForStep(int step) - { - String outcome = null; - - switch(step) - { - case 1: - { - outcome = "details"; - break; - } - case 2: - { - outcome = "condition"; - break; - } - case 3: - { - outcome = "action"; - break; - } - case 4: - { - outcome = "summary"; - break; - } - default: - { - outcome = CANCEL_OUTCOME; - } - } - - return outcome; - } - - /** - * Builds the Map of properties for the given condition in the format the repo is expecting - * - * @param params The Map of properties built from the UI - * @return The Map the repo is expecting - */ - protected Map buildConditionParams(Map params) - { - Map repoParams = new HashMap(params.size()); - - String condName = (String)params.get(PROP_CONDITION_NAME); - if (condName.equals(ComparePropertyValueEvaluator.NAME)) - { - repoParams.put(ComparePropertyValueEvaluator.PARAM_VALUE, params.get(PROP_CONTAINS_TEXT)); - } - else if (condName.equals(InCategoryEvaluator.NAME)) - { - // put the selected category in the condition params - repoParams.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, params.get(PROP_CATEGORY)); - - // add the classifiable aspect - repoParams.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE); - } - else if (condName.equals(IsSubTypeEvaluator.NAME)) - { - // add the model type - repoParams.put(IsSubTypeEvaluator.PARAM_TYPE, QName.createQName((String)params.get(PROP_MODEL_TYPE))); - } - else if (condName.equals(HasAspectEvaluator.NAME)) - { - // add the aspect - repoParams.put(HasAspectEvaluator.PARAM_ASPECT, QName.createQName((String)params.get(PROP_ASPECT))); - } - else if (condName.equals(CompareMimeTypeEvaluator.NAME)) - { - repoParams.put(CompareMimeTypeEvaluator.PARAM_VALUE, params.get(PROP_MIMETYPE)); - } - - return repoParams; - } - - /** - * Populates a Map of properties the wizard is expecting for the given condition - * - * @param condition The condition to build the map for - */ - protected Map populateCondition(ActionCondition condition) - { - // find out what the condition is called - Map condProps = new HashMap(3); - String name = condition.getActionConditionDefinitionName(); - condProps.put(PROP_CONDITION_NAME, name); - - // add the appropriate properties - Map repoCondProps = condition.getParameterValues(); - if (name.equals(ComparePropertyValueEvaluator.NAME)) - { - condProps.put(PROP_CONTAINS_TEXT, (String)repoCondProps.get(ComparePropertyValueEvaluator.PARAM_VALUE)); - } - else if (name.equals(InCategoryEvaluator.NAME)) - { - NodeRef catNodeRef = (NodeRef)repoCondProps.get(InCategoryEvaluator.PARAM_CATEGORY_VALUE); - condProps.put(PROP_CATEGORY, catNodeRef); - } - else if (name.equals(IsSubTypeEvaluator.NAME)) - { - condProps.put(PROP_MODEL_TYPE, ((QName)repoCondProps.get(IsSubTypeEvaluator.PARAM_TYPE)).toString()); - } - else if (name.equals(HasAspectEvaluator.NAME)) - { - condProps.put(PROP_ASPECT, ((QName)repoCondProps.get(HasAspectEvaluator.PARAM_ASPECT)).toString()); - } - else if (name.equals(CompareMimeTypeEvaluator.NAME)) - { - condProps.put(PROP_MIMETYPE, repoCondProps.get(CompareMimeTypeEvaluator.PARAM_VALUE)); - } - - // specify whether the condition result should be inverted - condProps.put(PROP_CONDITION_NOT, Boolean.valueOf(condition.getInvertCondition())); - - // generate the summary - condProps.put(PROP_CONDITION_SUMMARY, buildConditionSummary(condProps)); - - return condProps; - } - - /** - * Returns a summary string for the given condition parameters - * - * @return The summary or null if a summary could not be built - */ - protected String buildConditionSummary(Map props) - { - String summaryResult = null; - - String condName = (String)props.get(PROP_CONDITION_NAME); - if (condName != null) - { - StringBuilder summary = new StringBuilder(); - - String msgId = "condition_" + condName.replace('-', '_'); - - // JSF is putting the boolean into the map as a Boolean object so we - // need to handle that - adding a converter doesn't seem to help! - Boolean not = (Boolean)props.get(PROP_CONDITION_NOT); - if (not.booleanValue()) - { - msgId = msgId + "_not"; - } - - if (logger.isDebugEnabled()) - logger.debug("Looking up condition summary string: " + msgId); - - summary.append(Application.getMessage(FacesContext.getCurrentInstance(), msgId)); - summary.append(" "); - - // define a summary to be added for each condition - if ("in-category".equals(condName)) - { - String name = Repository.getNameForNode(this.nodeService, (NodeRef)props.get(PROP_CATEGORY)); - summary.append("'").append(name).append("'"); - } - else if ("compare-property-value".equals(condName)) - { - summary.append("'"); - summary.append(props.get(PROP_CONTAINS_TEXT)); - summary.append("'"); - } - else if ("is-subtype".equals(condName)) - { - // find the label used by looking through the SelectItem list - String typeName = (String)props.get(PROP_MODEL_TYPE); - for (SelectItem item : this.getModelTypes()) - { - if (item.getValue().equals(typeName)) - { - summary.append("'").append(item.getLabel()).append("'"); - break; - } - } - } - else if ("has-aspect".equals(condName)) - { - // find the label used by looking through the SelectItem list - String aspectName = (String)props.get(PROP_ASPECT); - for (SelectItem item : this.getAspects()) - { - if (item.getValue().equals(aspectName)) - { - summary.append("'").append(item.getLabel()).append("'"); - break; - } - } - } - else if (CompareMimeTypeEvaluator.NAME.equals(condName)) - { - String mimetype = (String)props.get(PROP_MIMETYPE); - for (SelectItem item : this.getMimeTypes()) - { - if (item.getValue().equals(mimetype)) - { - summary.append("'").append(item.getLabel()).append("'"); - break; - } - } - } - - summaryResult = summary.toString(); - } - - return summaryResult; - } - - /** - * Returns a summary string for the given action parameters - * - * @return The summary or null if a summary could not be built - */ - protected String buildActionSummary(Map props) - { - String summaryResult = null; - - String actionName = (String)this.currentActionProperties.get(PROP_ACTION_NAME); - if (actionName != null) - { - StringBuilder summary = new StringBuilder(); - summary.append(Application.getMessage(FacesContext.getCurrentInstance(), - "action_" + actionName.replace('-', '_'))); - summary.append(" "); - - // define a summary to be added for each action - if (AddFeaturesActionExecuter.NAME.equals(actionName) || RemoveFeaturesActionExecuter.NAME.equals(actionName)) - { - String aspect = (String)this.currentActionProperties.get(PROP_ASPECT); - - // find the label used by looking through the SelectItem list - for (SelectItem item : this.getAspects()) - { - if (item.getValue().equals(aspect)) - { - summary.append("'").append(item.getLabel()).append("'"); - break; - } - } - } - else if (SimpleWorkflowActionExecuter.NAME.equals(actionName)) - { - // just leave the summary as the title for now - String approveStepName = (String)this.currentActionProperties.get(PROP_APPROVE_STEP_NAME); - String approveAction = (String)this.currentActionProperties.get(PROP_APPROVE_ACTION); - NodeRef approveFolder = (NodeRef)this.currentActionProperties.get(PROP_APPROVE_FOLDER); - String approveFolderName = Repository.getNameForNode(this.nodeService, approveFolder); - String approveMsg = MessageFormat.format(summary.toString(), - new Object[] {Application.getMessage(FacesContext.getCurrentInstance(), approveAction), - approveFolderName, approveStepName}); - - String rejectStep = (String)this.currentActionProperties.get(PROP_REJECT_STEP_PRESENT); - - String rejectMsg = null; - if (rejectStep != null && "yes".equals(rejectStep)) - { - String rejectStepName = (String)this.currentActionProperties.get(PROP_REJECT_STEP_NAME); - String rejectAction = (String)this.currentActionProperties.get(PROP_REJECT_ACTION); - NodeRef rejectFolder = (NodeRef)this.currentActionProperties.get(PROP_REJECT_FOLDER); - String rejectFolderName = Repository.getNameForNode(this.nodeService, rejectFolder); - rejectMsg = MessageFormat.format(summary.toString(), - new Object[] {Application.getMessage(FacesContext.getCurrentInstance(), rejectAction), - rejectFolderName, rejectStepName}); - } - - summary = new StringBuilder(approveMsg); - if (rejectMsg != null) - { - summary.append(" "); - summary.append(rejectMsg); - } - } - else if (LinkCategoryActionExecuter.NAME.equals(actionName)) - { - NodeRef cat = (NodeRef)this.currentActionProperties.get(PROP_CATEGORY); - String name = Repository.getNameForNode(this.nodeService, cat); - summary.append("'").append(name).append("'"); - } - else if (TransformActionExecuter.NAME.equals(actionName)) - { - NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION); - String name = Repository.getNameForNode(this.nodeService, space); - String transformer = (String)this.currentActionProperties.get(PROP_TRANSFORMER); - - // find the label used by looking through the SelectItem list - for (SelectItem item : this.getTransformers()) - { - if (item.getValue().equals(transformer)) - { - transformer = item.getLabel(); - break; - } - } - - // recreate the summary object as it contains parameters - String msg = MessageFormat.format(summary.toString(), new Object[] {name, transformer}); - summary = new StringBuilder(msg); - } - else if (ImageTransformActionExecuter.NAME.equals(actionName)) - { - NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION); - String name = Repository.getNameForNode(this.nodeService, space); - String transformer = (String)this.currentActionProperties.get(PROP_IMAGE_TRANSFORMER); - String option = (String)this.currentActionProperties.get(PROP_TRANSFORM_OPTIONS); - - // find the label used by looking through the SelectItem list - for (SelectItem item : this.getImageTransformers()) - { - if (item.getValue().equals(transformer)) - { - transformer = item.getLabel(); - break; - } - } - - // recreate the summary object as it contains parameters - String msg = MessageFormat.format(summary.toString(), new Object[] {name, transformer, option}); - summary = new StringBuilder(msg); - } - else if (CopyActionExecuter.NAME.equals(actionName) || "move".equals(actionName) || "check-out".equals(actionName)) - { - NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION); - String spaceName = Repository.getNameForNode(this.nodeService, space); - summary.append("'").append(spaceName).append("'"); - } - else if (MailActionExecuter.NAME.equals(actionName)) - { - String address = (String)this.currentActionProperties.get(PROP_TO); - if (address != null && address.length() != 0) - { - summary.append("'").append(address).append("'"); - } - else - { - if (this.emailRecipients.size() != 0) - { - summary.append("'"); - for (int i=0; i - The bean that backs up the New Rule Wizard + The bean that backs up the Create Rule Wizard - NewRuleWizard - org.alfresco.web.bean.wizard.NewRuleWizard + CreateRuleWizard + org.alfresco.web.bean.rules.CreateRuleWizard session nodeService @@ -529,10 +529,63 @@ - The bean that backs up the New Action Wizard + The bean that backs up the Edit Rule Wizard - NewActionWizard - org.alfresco.web.bean.wizard.NewActionWizard + EditRuleWizard + org.alfresco.web.bean.rules.EditRuleWizard + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + ruleService + #{RuleService} + + + actionService + #{ActionService} + + + dictionaryService + #{DictionaryService} + + + mimetypeService + #{MimetypeService} + + + rulesBean + #{RulesBean} + + + personService + #{PersonService} + + + authorityService + #{AuthorityService} + + + + + + The bean that backs up the Run Action Wizard + + RunActionWizard + org.alfresco.web.bean.actions.RunActionWizard session nodeService @@ -803,7 +856,7 @@ The bean that holds manage content rules state RulesBean - org.alfresco.web.bean.RulesBean + org.alfresco.web.bean.rules.RulesBean session browseBean diff --git a/source/web/jsp/actions/actions.jsp b/source/web/jsp/actions/actions.jsp new file mode 100644 index 0000000000..fddd5b8c59 --- /dev/null +++ b/source/web/jsp/actions/actions.jsp @@ -0,0 +1,154 @@ +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + + + + + +<%-- TODO: Move this to the container page and add error-message-id attribute to dialog config --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1. + + + +
  + + + + + +
2. + + + +
  + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-remove-features.jsp b/source/web/jsp/actions/add-features.jsp similarity index 91% rename from source/web/jsp/wizard/new-rule/action-remove-features.jsp rename to source/web/jsp/actions/add-features.jsp index 723353dd01..5e263a6675 100644 --- a/source/web/jsp/wizard/new-rule/action-remove-features.jsp +++ b/source/web/jsp/actions/add-features.jsp @@ -24,14 +24,14 @@ <%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - + <%-- load a bundle of properties with I18N strings --%> - + <%-- Main outer table --%> @@ -39,7 +39,7 @@ <%-- Title bar --%> @@ -47,14 +47,14 @@ <%-- Shelf --%> <%-- Work Area --%> @@ -120,12 +120,12 @@
- <%@ include file="../../parts/titlebar.jsp" %> + <%@ include file="../parts/titlebar.jsp" %>
- <%@ include file="../../parts/shelf.jsp" %> + <%@ include file="../parts/shelf.jsp" %> <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> + <%@ include file="../parts/breadcrumb.jsp" %> <%-- Status and Actions --%> @@ -69,8 +69,8 @@
-
-
+
+
@@ -105,8 +105,8 @@
- - + +
diff --git a/source/web/jsp/wizard/new-rule/action-check-in.jsp b/source/web/jsp/actions/check-in.jsp similarity index 90% rename from source/web/jsp/wizard/new-rule/action-check-in.jsp rename to source/web/jsp/actions/check-in.jsp index a0f85df742..9959aee40a 100644 --- a/source/web/jsp/wizard/new-rule/action-check-in.jsp +++ b/source/web/jsp/actions/check-in.jsp @@ -1,163 +1,163 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> -
- +
-
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - -
: - -
  - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + +
: + +
  + + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-check-out.jsp b/source/web/jsp/actions/check-out.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/action-check-out.jsp rename to source/web/jsp/actions/check-out.jsp index acbd1e7e33..29e5712420 100644 --- a/source/web/jsp/wizard/new-rule/action-check-out.jsp +++ b/source/web/jsp/actions/check-out.jsp @@ -1,159 +1,159 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + +
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-move.jsp b/source/web/jsp/actions/copy.jsp similarity index 90% rename from source/web/jsp/wizard/new-rule/action-move.jsp rename to source/web/jsp/actions/copy.jsp index c8a02455dd..f7664d4063 100644 --- a/source/web/jsp/wizard/new-rule/action-move.jsp +++ b/source/web/jsp/actions/copy.jsp @@ -1,159 +1,159 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + +
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-import.jsp b/source/web/jsp/actions/import.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/action-import.jsp rename to source/web/jsp/actions/import.jsp index 2814eaafcd..ddf916b1fc 100644 --- a/source/web/jsp/wizard/new-rule/action-import.jsp +++ b/source/web/jsp/actions/import.jsp @@ -1,171 +1,171 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - <%-- - - - - - - --%> - -
: - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + <%-- + + + + + + --%> + +
: + +
: + + + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-link-category.jsp b/source/web/jsp/actions/link-category.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/action-link-category.jsp rename to source/web/jsp/actions/link-category.jsp index d6a2cc3760..e7ab519e47 100644 --- a/source/web/jsp/wizard/new-rule/action-link-category.jsp +++ b/source/web/jsp/actions/link-category.jsp @@ -1,158 +1,158 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + +
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-email.jsp b/source/web/jsp/actions/mail.jsp similarity index 85% rename from source/web/jsp/wizard/new-rule/action-email.jsp rename to source/web/jsp/actions/mail.jsp index d9f2a3ee00..92f5024e64 100644 --- a/source/web/jsp/wizard/new-rule/action-email.jsp +++ b/source/web/jsp/actions/mail.jsp @@ -1,257 +1,257 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - <%-- Select the email receipients --%> - - - - - <%-- Generic Picker to select Users/Groups --%> - - - - - - - - - <%-- Enter the message subject and body --%> - - - - - - - - - - - - - - - - - - -
1.
- -
2.
- - - - - - - - - - - - - - - - - - - -
- -
: -  * -
- - - - - - -
: - <%-- Templates drop-down selector --%> - - - -
-
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + <%-- Select the email receipients --%> + + + + + <%-- Generic Picker to select Users/Groups --%> + + + + + + + + + <%-- Enter the message subject and body --%> + + + + + + + + + + + + + + + + + + +
1.
+ +
2.
+ + + + + + + + + + + + + + + + + + + +
+ +
: +  * +
+ + + + + + + +
: + <%-- Templates drop-down selector --%> + + + +
+
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-copy.jsp b/source/web/jsp/actions/move.jsp similarity index 90% rename from source/web/jsp/wizard/new-rule/action-copy.jsp rename to source/web/jsp/actions/move.jsp index 4cc5ca8fd5..12ae446b68 100644 --- a/source/web/jsp/wizard/new-rule/action-copy.jsp +++ b/source/web/jsp/actions/move.jsp @@ -1,159 +1,159 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + +
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-specialise-type.jsp b/source/web/jsp/actions/remove-features.jsp similarity index 91% rename from source/web/jsp/wizard/new-rule/action-specialise-type.jsp rename to source/web/jsp/actions/remove-features.jsp index ae3795e62e..e88f3ebfaa 100644 --- a/source/web/jsp/wizard/new-rule/action-specialise-type.jsp +++ b/source/web/jsp/actions/remove-features.jsp @@ -24,14 +24,14 @@ <%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - + <%-- load a bundle of properties with I18N strings --%> - + <%-- Main outer table --%> @@ -39,7 +39,7 @@ <%-- Title bar --%> @@ -47,14 +47,14 @@ <%-- Shelf --%> <%-- Work Area --%> @@ -120,12 +120,12 @@
- <%@ include file="../../parts/titlebar.jsp" %> + <%@ include file="../parts/titlebar.jsp" %>
- <%@ include file="../../parts/shelf.jsp" %> + <%@ include file="../parts/shelf.jsp" %> <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> + <%@ include file="../parts/breadcrumb.jsp" %> <%-- Status and Actions --%> @@ -69,8 +69,8 @@
-
-
+
+
@@ -105,8 +105,8 @@
- - + +
diff --git a/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp b/source/web/jsp/actions/simple-workflow.jsp similarity index 86% rename from source/web/jsp/wizard/new-rule/action-simple-workflow.jsp rename to source/web/jsp/actions/simple-workflow.jsp index d57cb57a5c..08efb80c72 100644 --- a/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp +++ b/source/web/jsp/actions/simple-workflow.jsp @@ -1,288 +1,288 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> -
- +
-
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
- - - - - - - - -
- - - - - : - -
-
- - - - -
- - - - - -
- - - - - - - - - -
- : - -
- - - - - - - - -
- - - - - : - -
-
-
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
+ + + + + + + + +
+ + + + + : + +
+
+ + + + +
+ + + + + +
+ + + + + + + + + +
+ : + +
+ + + + + + + + +
+ + + + + : + +
+
+
+
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-add-features.jsp b/source/web/jsp/actions/specialise-type.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/action-add-features.jsp rename to source/web/jsp/actions/specialise-type.jsp index b1a9cfca14..443b807e67 100644 --- a/source/web/jsp/wizard/new-rule/action-add-features.jsp +++ b/source/web/jsp/actions/specialise-type.jsp @@ -1,157 +1,157 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - -
- - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + +
+ + + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-transform-image.jsp b/source/web/jsp/actions/transform-image.jsp similarity index 88% rename from source/web/jsp/wizard/new-rule/action-transform-image.jsp rename to source/web/jsp/actions/transform-image.jsp index bb1af92509..c7636f7e76 100644 --- a/source/web/jsp/wizard/new-rule/action-transform-image.jsp +++ b/source/web/jsp/actions/transform-image.jsp @@ -1,174 +1,174 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - -
: - - - -
: - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + + + + + + +
: + + + +
: + +
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action-transform.jsp b/source/web/jsp/actions/transform.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/action-transform.jsp rename to source/web/jsp/actions/transform.jsp index 12c716cd5d..dd17ba1b4e 100644 --- a/source/web/jsp/wizard/new-rule/action-transform.jsp +++ b/source/web/jsp/actions/transform.jsp @@ -1,168 +1,168 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - -
: - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + + +
: + + + +
: + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp index 2f9e7d1c1d..23adf470ad 100644 --- a/source/web/jsp/browse/browse.jsp +++ b/source/web/jsp/browse/browse.jsp @@ -193,7 +193,7 @@ <%-- TODO: either build complete message in BrowseBean or have no icon... --%> - + diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp index ce54e874af..aaafc07119 100644 --- a/source/web/jsp/dialog/rules.jsp +++ b/source/web/jsp/dialog/rules.jsp @@ -74,7 +74,7 @@ <%-- Current object actions --%> - + @@ -125,7 +125,7 @@ @@ -136,8 +136,8 @@ - + @@ -197,7 +197,7 @@ + actionListener="#{RulesBean.setupRuleAction}" action="wizard:editRule"> diff --git a/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp b/source/web/jsp/rules/compare-mime-type.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/condition-is-subtype.jsp rename to source/web/jsp/rules/compare-mime-type.jsp index e8c0f4672d..f3023b263d 100644 --- a/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp +++ b/source/web/jsp/rules/compare-mime-type.jsp @@ -1,166 +1,166 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - -
: - - - -
- - - -
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + +
: + + + +
+ + + +
+
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/condition-contains-text.jsp b/source/web/jsp/rules/compare-property-value.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/condition-contains-text.jsp rename to source/web/jsp/rules/compare-property-value.jsp index bf4be2a857..6db6ce09c1 100644 --- a/source/web/jsp/wizard/new-rule/condition-contains-text.jsp +++ b/source/web/jsp/rules/compare-property-value.jsp @@ -1,183 +1,183 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - -
- :  - -
- - - -
-
:
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + + + + + + + + +
+ :  + +
+ + + +
+
:
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/rules/conditions.jsp b/source/web/jsp/rules/conditions.jsp new file mode 100644 index 0000000000..79f4e71668 --- /dev/null +++ b/source/web/jsp/rules/conditions.jsp @@ -0,0 +1,154 @@ +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + + + + + +<%-- TODO: Move this to the container page and add error-message-id attribute to dialog config --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1. + + + +
  + + + + + +
2. + + + +
  + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ diff --git a/source/web/jsp/rules/details.jsp b/source/web/jsp/rules/details.jsp new file mode 100644 index 0000000000..21ed32b499 --- /dev/null +++ b/source/web/jsp/rules/details.jsp @@ -0,0 +1,127 @@ +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + + + + + +<%-- TODO: Move this to the container page and add error-message-id attribute to dialog config --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + <%-- + disabled="#{WizardManager.bean.inEditMode}" + --%> + + + + +
+ + + + + +  * +
+ + + + + + + +
+ + + +
+ + + + + + +
+ + + + + + +
+
+ + + + + +
+
+ \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp b/source/web/jsp/rules/has-aspect.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/condition-has-aspect.jsp rename to source/web/jsp/rules/has-aspect.jsp index 2742d9cdcf..9d6b76c2b7 100644 --- a/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp +++ b/source/web/jsp/rules/has-aspect.jsp @@ -1,166 +1,166 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - -
: - - - -
- - - -
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + +
: + + + +
+ + + +
+
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/condition-in-category.jsp b/source/web/jsp/rules/in-category.jsp similarity index 89% rename from source/web/jsp/wizard/new-rule/condition-in-category.jsp rename to source/web/jsp/rules/in-category.jsp index f8e25bfb22..7c7f76680b 100644 --- a/source/web/jsp/wizard/new-rule/condition-in-category.jsp +++ b/source/web/jsp/rules/in-category.jsp @@ -1,167 +1,167 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - -
: - -
- - - -
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ 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" %> + +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored="false" %> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + <%-- load a bundle of properties with I18N strings --%> + + + + + <%-- Main outer table --%> + + + <%-- Title bar --%> + + + + + <%-- Main area --%> + + <%-- Shelf --%> + + + <%-- Work Area --%> + + +
+ <%@ include file="../parts/titlebar.jsp" %> +
+ <%@ include file="../parts/shelf.jsp" %> + + + <%-- Breadcrumb --%> + <%@ include file="../parts/breadcrumb.jsp" %> + + <%-- Status and Actions --%> + + + + + + + <%-- separator row with gradient shadow --%> + + + + + + + <%-- Details --%> + + + + + + + <%-- separator row with bottom panel graphics --%> + + + + + + +
+ + <%-- Status and Actions inner contents table --%> + <%-- Generally this consists of an icon, textual summary and actions for the current object --%> + + + + + +
+ +
+
+
+ +
+ + + + + + +
+ + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + +
: + +
+ + + +
+
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + 		+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> + + + + + + + +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> +
+
+
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp b/source/web/jsp/rules/is-subtype.jsp similarity index 91% rename from source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp rename to source/web/jsp/rules/is-subtype.jsp index 4cb6a17d0d..f3b9a3c4cf 100644 --- a/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp +++ b/source/web/jsp/rules/is-subtype.jsp @@ -24,14 +24,14 @@ <%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - + <%-- load a bundle of properties with I18N strings --%> - + <%-- Main outer table --%> @@ -39,7 +39,7 @@ <%-- Title bar --%> @@ -47,14 +47,14 @@ <%-- Shelf --%> <%-- Work Area --%> @@ -114,7 +114,7 @@ @@ -129,12 +129,12 @@
- <%@ include file="../../parts/titlebar.jsp" %> + <%@ include file="../parts/titlebar.jsp" %>
- <%@ include file="../../parts/shelf.jsp" %> + <%@ include file="../parts/shelf.jsp" %> <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> + <%@ include file="../parts/breadcrumb.jsp" %> <%-- Status and Actions --%> @@ -69,8 +69,8 @@
-
-
+
+
@@ -105,8 +105,8 @@
: - - + +
- +
diff --git a/source/web/jsp/test/_template.jsp b/source/web/jsp/test/_template.jsp deleted file mode 100644 index 8c10accc58..0000000000 --- a/source/web/jsp/test/_template.jsp +++ /dev/null @@ -1,157 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - -<%-- REPLACE ME: set the title I18N message Id here --%> - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- REPLACE ME: set the form name here --%> - - - <%-- Main outer table --%> -
- +
-
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Toolbar --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - - - - - -
- <%-- REPLACE ME: icon here --%> - - <%-- Summary --%> - <%-- REPLACE ME: summary here --%> - - <%-- Current object actions --%> - <%-- REPLACE ME: object actions --%> - - <%-- Details View settings --%> - <%-- REPLACE ME: views --%> -
- -
- - - - -
- <%-- Toolbar actions --%> - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "bluetoolbar", "#E9F0F4"); %> - <%-- REPLACE ME: toolbar actions --%> - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "bluetoolbar"); %> -
-
- - <%-- Details inner components --%> - <%-- REPLACE ME: details components --%> - -
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/test/adduser.jsp b/source/web/jsp/test/adduser.jsp deleted file mode 100644 index 6a1b70345b..0000000000 --- a/source/web/jsp/test/adduser.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - - - <%-- load a bundle of properties I18N strings here --%> - - - - -

New User details:

- - <%@ include file="userform.jsp" %> - -

- - - <%-- Use of the 'immediate' attribute forces the cancel action impl to execute - in the Apply Request Values processing phase - it would normally be deferred to - the Invoke Application phase. This means is fires before the form validation - occurs - allow pure UI events to either navigate or change the UI without - seeing validation errors etc. --%> - - - - diff --git a/source/web/jsp/test/edituser.jsp b/source/web/jsp/test/edituser.jsp deleted file mode 100644 index f2fb27a5fc..0000000000 --- a/source/web/jsp/test/edituser.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - - - <%-- load a bundle of properties I18N strings here --%> - - - - -

Edit User details:

- - <%@ include file="userform.jsp" %> - -

- - - <%-- Use of the 'immediate' attribute forces the cancel action impl to execute - in the Apply Request Values processing phase - it would normally be deferred to - the Invoke Application phase. This means is fires before the form validation - occurs - allow pure UI events to either navigate or change the UI without - seeing validation errors etc. --%> - - - - diff --git a/source/web/jsp/test/userform.jsp b/source/web/jsp/test/userform.jsp deleted file mode 100644 index 413c91472f..0000000000 --- a/source/web/jsp/test/userform.jsp +++ /dev/null @@ -1,89 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%-- JSP fragment - included directly by other complete JSP pages --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- <%-- use an I18N message --%> - : - - <%-- example of the 'disabled' attribute bound to a form bean property --%> - - - - <%-- message tag to show errors for the 'username' field --%> - -
- : - - - - - -
- : - - - -
- : - - <%-- Example of a tag utilising an Input Component with a custom renderer. - The renderer handles encoding and decoding of date values to UI elements --%> - -
- : - - <%-- Show an example of a listbox populated by a server-side List of SelectItem - objects. The preselection is controlled by the selectItems tag which contains - a list of values that the control will try to select. - Also shows an example of a valueChangedListener which uses onchange() Javascript - to submit the form immediately to update the UI. --%> - - - - -
- <%-- Example of a direct component binding. The setting method on the bean - is called and the OutputText component can be programmically modified --%> - -
diff --git a/source/web/jsp/test/userlist.jsp b/source/web/jsp/test/userlist.jsp deleted file mode 100644 index c30b9f38be..0000000000 --- a/source/web/jsp/test/userlist.jsp +++ /dev/null @@ -1,108 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page isELIgnored="false" %> - - - - - <%-- load a bundle of properties I18N strings here --%> - - - - -

UserList Test

- - <%-- use JSTL as simple example way to list the users --%> - <%-- TODO: find out how to get this working - currently it can't find the JSF bean - in the session scope. Using useBean tag creates a new copy --%> - <%----%> - <%-- -
    - -
  1. Username: ${u.username}, Name: ${u.name}, Roles: ${u.roles}
    2. -     -
- -

- --%> - - <%-- example of using a JSF DataTable to list the users --%> - <%-- iterates around the List of User objects in the UserListBean --%> - JSF dataTable component test.
- - - - <%-- NOTE: You cannot insert plain HTML text here, due to the way that some JSF - components are architected, the plain HTML would get displayed before - the body of the datatable tag is output. This is also true of the - other container tags including 'panel'. - The datatable is considerably inferior to our portal data tags - or even the freely available 'displaytag' tag library --%> - <%-- You can also use the nasty 'f:verbatim' tag to wrap any non JSF elements --%> - - - - - - - - - - - - - - - - <%-- example of a DateTime converter --%> - <%-- can be used to convert both input and output text --%> - - - - - - - - - - - - - - <%-- inline command link - has an action listener which will decode which - item in the grid it was clicked using the param tag below - Then the action listener will delegate to the action view --%> - - - - - - -

- - - -

- - - - - diff --git a/source/web/jsp/wizard/container.jsp b/source/web/jsp/wizard/container.jsp index 70e677d089..f2a42990f7 100644 --- a/source/web/jsp/wizard/container.jsp +++ b/source/web/jsp/wizard/container.jsp @@ -112,9 +112,10 @@ <%-- Externalise the error message into an error-message-id attribute on the wizard config --%> - + <%-- - + --%> + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> diff --git a/source/web/jsp/wizard/create-action/action-add-features.jsp b/source/web/jsp/wizard/create-action/action-add-features.jsp deleted file mode 100644 index a4f224a3ff..0000000000 --- a/source/web/jsp/wizard/create-action/action-add-features.jsp +++ /dev/null @@ -1,182 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> -
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-check-in.jsp b/source/web/jsp/wizard/create-action/action-check-in.jsp deleted file mode 100644 index a4d3293425..0000000000 --- a/source/web/jsp/wizard/create-action/action-check-in.jsp +++ /dev/null @@ -1,188 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - -
: - -
  - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-check-out.jsp b/source/web/jsp/wizard/create-action/action-check-out.jsp deleted file mode 100644 index a50630b038..0000000000 --- a/source/web/jsp/wizard/create-action/action-check-out.jsp +++ /dev/null @@ -1,185 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-copy.jsp b/source/web/jsp/wizard/create-action/action-copy.jsp deleted file mode 100644 index 92d11599ef..0000000000 --- a/source/web/jsp/wizard/create-action/action-copy.jsp +++ /dev/null @@ -1,185 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-email.jsp b/source/web/jsp/wizard/create-action/action-email.jsp deleted file mode 100644 index 2537e96721..0000000000 --- a/source/web/jsp/wizard/create-action/action-email.jsp +++ /dev/null @@ -1,283 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - <%-- Select the email receipients --%> - - - - - <%-- Generic Picker to select Users/Groups --%> - - - - - - - - - <%-- Enter the message subject and body --%> - - - - - - - - - - - - - - - - - - - - - -
1.
- -
2.
- - - - - - - - - - - - - - - - - - - -
- -
: -  * -
- - - - - - -
: - <%-- Templates drop-down selector --%> - - - -
-
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-import.jsp b/source/web/jsp/wizard/create-action/action-import.jsp deleted file mode 100644 index 463168fc76..0000000000 --- a/source/web/jsp/wizard/create-action/action-import.jsp +++ /dev/null @@ -1,196 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - <%-- - - - - - - --%> - - - - -
: - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-link-category.jsp b/source/web/jsp/wizard/create-action/action-link-category.jsp deleted file mode 100644 index 78132e65b9..0000000000 --- a/source/web/jsp/wizard/create-action/action-link-category.jsp +++ /dev/null @@ -1,184 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-move.jsp b/source/web/jsp/wizard/create-action/action-move.jsp deleted file mode 100644 index 10431b7603..0000000000 --- a/source/web/jsp/wizard/create-action/action-move.jsp +++ /dev/null @@ -1,185 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-remove-features.jsp b/source/web/jsp/wizard/create-action/action-remove-features.jsp deleted file mode 100644 index da40ca7557..0000000000 --- a/source/web/jsp/wizard/create-action/action-remove-features.jsp +++ /dev/null @@ -1,182 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-simple-workflow.jsp b/source/web/jsp/wizard/create-action/action-simple-workflow.jsp deleted file mode 100644 index 3221cc6612..0000000000 --- a/source/web/jsp/wizard/create-action/action-simple-workflow.jsp +++ /dev/null @@ -1,316 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
- - - - - - - - -
- - - - - : - -
-
- - - - -
- - - - - -
- - - - - - - - - -
- : - -
- - - - - - - - -
- - - - - : - -
-
-
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-specialise-type.jsp b/source/web/jsp/wizard/create-action/action-specialise-type.jsp deleted file mode 100644 index ee75503bfb..0000000000 --- a/source/web/jsp/wizard/create-action/action-specialise-type.jsp +++ /dev/null @@ -1,182 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-transform-image.jsp b/source/web/jsp/wizard/create-action/action-transform-image.jsp deleted file mode 100644 index b779e60b98..0000000000 --- a/source/web/jsp/wizard/create-action/action-transform-image.jsp +++ /dev/null @@ -1,200 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - -
: - - - -
: - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action-transform.jsp b/source/web/jsp/wizard/create-action/action-transform.jsp deleted file mode 100644 index 4488712794..0000000000 --- a/source/web/jsp/wizard/create-action/action-transform.jsp +++ /dev/null @@ -1,194 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - -
: - - - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/action.jsp b/source/web/jsp/wizard/create-action/action.jsp deleted file mode 100644 index a36000cfa1..0000000000 --- a/source/web/jsp/wizard/create-action/action.jsp +++ /dev/null @@ -1,195 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - -
: - - - -
: -
- - - -
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/create-action/summary.jsp b/source/web/jsp/wizard/create-action/summary.jsp deleted file mode 100644 index cb7d484b4a..0000000000 --- a/source/web/jsp/wizard/create-action/summary.jsp +++ /dev/null @@ -1,174 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
''
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/action.jsp b/source/web/jsp/wizard/new-rule/action.jsp deleted file mode 100644 index 9b8276839b..0000000000 --- a/source/web/jsp/wizard/new-rule/action.jsp +++ /dev/null @@ -1,265 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - <%-- - - - - - - --%> - - - - - - - - - - - - - - - - - - - - -
1.
  - - - -
: -
- - - -
-
2.
 
- - - - - - - - - - - - - - - - - - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/condition.jsp b/source/web/jsp/wizard/new-rule/condition.jsp deleted file mode 100644 index fb64561912..0000000000 --- a/source/web/jsp/wizard/new-rule/condition.jsp +++ /dev/null @@ -1,283 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - <%-- - - - - - - --%> - - - - - - - - - - - - - - - - - - - - -
1.
  - - - -
  -
- - - -
-
2.
 
- - - - - - - - - - - - - - - - - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - - - - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/details.jsp b/source/web/jsp/wizard/new-rule/details.jsp deleted file mode 100644 index 0dc03a6789..0000000000 --- a/source/web/jsp/wizard/new-rule/details.jsp +++ /dev/null @@ -1,229 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - - - -
: -  * -
: - -
- - - -
-
- - - -
-
-
-   - -
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/wizard/new-rule/summary.jsp b/source/web/jsp/wizard/new-rule/summary.jsp deleted file mode 100644 index 5667f9e6ba..0000000000 --- a/source/web/jsp/wizard/new-rule/summary.jsp +++ /dev/null @@ -1,175 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ 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" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../../parts/titlebar.jsp" %> -
- <%@ include file="../../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> -
- - - - - - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> - 		- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> - - - - - - - - - - - -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %> -
-
-
- - - - - - \ No newline at end of file