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

Yet another merge from head to WCM-DEV2.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-12 18:55:07 +00:00
parent cac41478d2
commit f20136237d
27 changed files with 6524 additions and 6061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ 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. categories_description=This view allows you to browse and modify the categories hiearchy.
new_category_description=Enter information about the new Category then click Create Category. new_category_description=Enter information about the new Category then click Create Category.
status_message_default=No messages. status_message_default=No messages.
no_icons_found=No icons found
# UI Component messages # UI Component messages
yes=Yes yes=Yes
@@ -104,7 +105,7 @@ search_results=Search Results
search_detail=Search for \"{0}\" results shown below search_detail=Search for \"{0}\" results shown below
close_search=Close Search close_search=Close Search
browse_spaces=Browse Spaces browse_spaces=Browse Spaces
browse_content=Content items browse_content=Content Items
location=Location location=Location
toggle_shelf=Hide or Show the Shelf toggle_shelf=Hide or Show the Shelf
shelf=Shelf shelf=Shelf
@@ -988,6 +989,7 @@ start_workflow_options_title=Workflow Options
start_workflow_options_desc=Select options for the workflow start_workflow_options_desc=Select options for the workflow
start_workflow_finish_instruction=To start the workflow press Finish. To review or change your selections click Back. start_workflow_finish_instruction=To start the workflow press Finish. To review or change your selections click Back.
start_workflow_no_metadata=There is no metadata to collect for this particular workflow. start_workflow_no_metadata=There is no metadata to collect for this particular workflow.
start_workflow_no_workflows=There are no workflows currently deployed in the repository, press Cancel to exit the wizard.
users_and_roles=Users and their Roles users_and_roles=Users and their Roles
resources=Resources resources=Resources
manage_task=Manage Task manage_task=Manage Task

304
config/alfresco/web-client-config-properties.xml
View File

@@ -11,7 +11,7 @@
<show-property name="title" display-label-id="title" <show-property name="title" display-label-id="title"
ignore-if-missing="false" /> ignore-if-missing="false" />
<show-property name="description" display-label-id="description" <show-property name="description" display-label-id="description"
ignore-if-missing="false" /> ignore-if-missing="false" component-generator="TextAreaGenerator" />
<show-property name="author" display-label-id="author" <show-property name="author" display-label-id="author"
ignore-if-missing="false" /> ignore-if-missing="false" />
<show-property name="size" display-label-id="size" <show-property name="size" display-label-id="size"
@@ -36,6 +36,30 @@
</property-sheet> </property-sheet>
</config> </config>
<config evaluator="node-type" condition="dictionaryModel">
<property-sheet>
<show-property name="name" />
<show-property name="mimetype" display-label-id="content_type"
component-generator="MimeTypeSelectorGenerator" />
<show-property name="title" />
<show-property name="description" />
<show-property name="size" display-label-id="size"
converter="org.alfresco.faces.ByteSizeConverter"
show-in-edit-mode="false" />
<show-property name="modelActive"/>
<!-- NOTE: The following 3 properties are defined here to cover -->
<!-- the scenario where folders are created via CIFS or FTP -->
<!-- and so the properties are missing -->
<show-property name="title" display-label-id="title"
ignore-if-missing="false" />
<show-property name="description" display-label-id="description"
ignore-if-missing="false" component-generator="TextAreaGenerator" />
<show-property name="app:icon" show-in-view-mode="false" display-label-id="icon"
component-generator="SpaceIconPickerGenerator"
ignore-if-missing="false" />
</property-sheet>
</config>
<config evaluator="node-type" condition="dictionaryModel"> <config evaluator="node-type" condition="dictionaryModel">
<property-sheet> <property-sheet>
<show-property name="name" /> <show-property name="name" />
@@ -54,7 +78,7 @@
<property-sheet> <property-sheet>
<show-property name="name" /> <show-property name="name" />
<show-property name="title" /> <show-property name="title" />
<show-property name="description" /> <show-property name="description" component-generator="TextAreaGenerator" />
<show-property name="destination" converter="org.alfresco.faces.DisplayPathConverter"/> <show-property name="destination" converter="org.alfresco.faces.DisplayPathConverter"/>
</property-sheet> </property-sheet>
</config> </config>
@@ -62,7 +86,7 @@
<config evaluator="node-type" condition="app:folderlink"> <config evaluator="node-type" condition="app:folderlink">
<property-sheet> <property-sheet>
<show-property name="name" /> <show-property name="name" />
<show-property name="description" /> <show-property name="description" component-generator="TextAreaGenerator" />
<show-property name="destination" converter="org.alfresco.faces.DisplayPathConverter"/> <show-property name="destination" converter="org.alfresco.faces.DisplayPathConverter"/>
</property-sheet> </property-sheet>
</config> </config>
@@ -75,7 +99,7 @@
<!-- web-client-config-custom.xml --> <!-- web-client-config-custom.xml -->
<show-property name="name" /> <show-property name="name" />
<show-property name="title" /> <show-property name="title" />
<show-property name="description" /> <show-property name="description" component-generator="TextAreaGenerator" />
</property-sheet> </property-sheet>
</config> </config>
@@ -87,7 +111,7 @@
<!-- web-client-config-custom.xml --> <!-- web-client-config-custom.xml -->
<show-property name="name" /> <show-property name="name" />
<show-property name="title" /> <show-property name="title" />
<show-property name="description" /> <show-property name="description" component-generator="TextAreaGenerator" />
<show-property name="app:icon" show-in-view-mode="false" display-label-id="icon" <show-property name="app:icon" show-in-view-mode="false" display-label-id="icon"
component-generator="SpaceIconPickerGenerator" /> component-generator="SpaceIconPickerGenerator" />
</property-sheet> </property-sheet>
@@ -282,4 +306,274 @@
</property-sheet> </property-sheet>
</config> </config>
<config evaluator="aspect-name" condition="sys:archived">
<property-sheet>
<show-property name="sys:archivedBy" />
<show-property name="sys:archivedDate" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="emailed">
<property-sheet>
<separator name="sepem1" display-label="Email Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="originator" show-in-edit-mode="false"/>
<show-property name="addressee" show-in-edit-mode="false"/>
<show-property name="addressees" show-in-edit-mode="false"/>
<show-property name="sentdate" show-in-edit-mode="false"/>
<show-property name="subjectline" show-in-edit-mode="false"/>
</property-sheet>
</config>
<!-- ********************************** -->
<!-- Configuration for discussion types -->
<!-- ********************************** -->
<config evaluator="node-type" condition="fm:forums">
<property-sheet>
<show-property name="name"/>
<show-property name="description"/>
<show-property name="app:icon" show-in-view-mode="false" display-label-id="icon"
component-generator="SpaceIconPickerGenerator" />
<!-- hide the title property -->
<show-property name="title" show-in-view-mode="false" show-in-edit-mode="false" />
</property-sheet>
</config>
<config evaluator="node-type" condition="fm:forum">
<property-sheet>
<show-property name="name"/>
<show-property name="description"/>
<show-property name="app:icon" show-in-view-mode="false" display-label-id="icon"
component-generator="SpaceIconPickerGenerator" />
<!-- hide the title property -->
<show-property name="title" show-in-view-mode="false" show-in-edit-mode="false" />
</property-sheet>
</config>
<config evaluator="node-type" condition="fm:topic">
<property-sheet>
<show-property name="name" display-label-id="subject" />
<show-property name="app:icon" show-in-view-mode="false" display-label-id="icon"
component-generator="SpaceIconPickerGenerator" />
<!-- hide the description and title properties -->
<show-property name="description" show-in-view-mode="false" show-in-edit-mode="false" />
<show-property name="title" show-in-view-mode="false" show-in-edit-mode="false" />
</property-sheet>
</config>
<!-- ******************************** -->
<!-- Configuration for workflow types -->
<!-- ******************************** -->
<!-- Generic workflow task -->
<config evaluator="node-type" condition="bpm:workflowTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="bpm:status" />
<show-property name="bpm:dueDate" />
<show-property name="bpm:priority" />
</property-sheet>
</config>
<!-- Review and Approve workflow tasks -->
<config evaluator="node-type" condition="wf:reviewTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="bpm:status" />
<show-property name="bpm:dueDate" />
<show-property name="bpm:priority" />
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:submitReviewTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="wf:reviewPriority" />
<show-property name="wf:reviewDueDate" />
<separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
<show-association name="wf:reviewer" />
</property-sheet>
</config>
<!-- Ad hoc workflow tasks -->
<config evaluator="node-type" condition="wf:submitAdhocTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="wf:adhocDescription" component-generator="TextAreaGenerator" />
<show-property name="wf:adhocPriority" />
<show-property name="wf:adhocDueDate" />
<show-property name="wf:notifyMe" />
<separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
<show-association name="wf:assignee" />
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:adhocTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="wf:adhocDescription" ignore-if-missing="false" component-generator="TextAreaGenerator" />
<show-property name="bpm:status" />
<show-property name="bpm:dueDate" />
<show-property name="bpm:priority" />
</property-sheet>
</config>
<config evaluator="node-type" condition="wf:completedAdhocTask" replace="true">
<property-sheet>
<separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
<show-property name="bpm:taskId" />
<show-property name="wf:adhocDescription" component-generator="TextAreaGenerator" />
<show-property name="bpm:dueDate" />
<show-property name="bpm:priority" />
</property-sheet>
</config>
<!-- BEGIN RECORDS MANAGEMENT MODEL -->
<!-- Model supporting the DoD 5015.2 Standard -->
<config evaluator="aspect-name" condition="rma:filePlan">
<property-sheet>
<separator name="sepfp1" display-label="File Plan" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:recordCategoryIdentifier" />
<show-property name="rma:dispositionAuthority" />
<show-property name="rma:dispositionInstructions" component-generator="TextAreaGenerator" />
<show-property name="rma:permanentRecordIndicator" />
<show-property name="rma:containsRecordFolders" />
<show-property name="rma:defaultMediaType" />
<show-property name="rma:defaultMarkingList" />
<show-property name="rma:defaultOriginatingOrganization" />
<show-property name="rma:recordCounter" />
<separator name="sepfp2" display-label="Process Vital Records" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:vitalRecordIndicator" />
<show-property name="rma:vitalRecordReviewPeriod" />
<separator name="sepfp3" display-label="Process Cutoff" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:processCutoff" />
<show-property name="rma:eventTrigger" />
<show-property name="rma:cutoffPeriod" />
<show-property name="rma:cutoffOnObsolete" />
<show-property name="rma:cutoffOnSuperseded" />
<separator name="sepfp4" display-label="Process Hold / Retention Period" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:processHold" />
<show-property name="rma:holdPeriod" />
<show-property name="rma:discretionaryHold" />
<separator name="sepfp5" display-label="Process Transfer" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:processTransfer" />
<show-property name="rma:defaultTransferLocation" />
<show-property name="rma:transferBlockSize" />
<separator name="sepfp6" display-label="Process Accession to National Archives" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:processAccession" />
<show-property name="rma:accessionPeriod" />
<show-property name="rma:accessionLocation" />
<show-property name="rma:accessionBlockSize" />
<separator name="sepfp7" display-label="Process Destruction" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:processDestruction" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:record">
<property-sheet>
<separator name="seprm1" display-label="Record Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:recordIdentifier" show-in-edit-mode="false"/>
<show-property name="rma:subject" />
<show-property name="rma:format" show-in-edit-mode="false"/>
<show-property name="rma:dateFiled" />
<show-property name="rma:publicationDate" />
<show-property name="rma:dateReceived" />
<show-property name="rma:originator" />
<show-property name="rma:originatingOrganization" />
<show-property name="rma:addressee" />
<show-property name="rma:otherAddressee" />
<show-property name="rma:supplementalMarkingList" />
<show-property name="rma:isObsolete" />
<show-property name="rma:recordNote" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:vitalrecord">
<property-sheet>
<separator name="seprm3" display-label="Vital Record Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:isVitalRecord" />
<show-property name="rma:prevReviewDate" />
<show-property name="rma:nextReviewDate" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:cutoffable">
<property-sheet>
<separator name="seprm4" display-label="Record Cutoff Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:cutoffExecuted" />
<show-property name="rma:cutoffNow" />
<show-property name="rma:cutoffDateTime" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:holdable">
<property-sheet>
<separator name="seprm5" display-label="Record Hold Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:holdExecuted" />
<show-property name="rma:holdUntil" />
<show-property name="rma:holdUntilEvent" />
<show-property name="rma:freeze" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:transferable">
<property-sheet>
<separator name="seprm6" display-label="Record Transfer Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:transferExecuted" />
<show-property name="rma:transferDate" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:accessionable">
<property-sheet>
<separator name="seprm7" display-label="Record Accession Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:accessionExecuted" />
<show-property name="rma:accessionDate" />
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:destroyable">
<property-sheet>
<separator name="seprm8" display-label="Record Destruction Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:destructionDate" />
</property-sheet>
</config>
<!-- Put these at the end since they take up so much room -->
<config evaluator="aspect-name" condition="referencing">
<property-sheet>
<separator name="seprm9" />
<show-association name="references"/>
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:superseded">
<property-sheet>
<separator name="seprm10" />
<show-association name="rma:superseding"/>
</property-sheet>
</config>
<config evaluator="aspect-name" condition="rma:userSpecifiedData">
<property-sheet>
<separator name="seprm11" display-label="User-Specified Record Data" component-generator="HeaderSeparatorGenerator" />
<show-property name="rma:privacyActSystem" />
</property-sheet>
</config>
<!-- END RECORDS MANAGEMENT MODEL -->
</alfresco-config> </alfresco-config>

50
config/alfresco/web-client-config-wizards.xml
View File

@@ -265,6 +265,56 @@
</step> </step>
</wizard> </wizard>
<!-- Definition of the Dashboard Layout wizard -->
<wizard name="configureDashboard" managed-bean="DashboardWizard"
title-id="configure_dashboard_title" description-id="configure_dashboard_desc"
icon="/images/icons/configure_dashboard_large.gif">
<step name="layout" title-id="step_layout" description-id="configure_dashboard_step1_desc">
<page path="/jsp/dashboards/wizard/layout.jsp"
title-id="configure_dashboard_step1_title"
description-id="configure_dashboard_step1_desc"
instruction-id="default_instruction" />
</step>
<step name="columns" title-id="step_columns" description-id="configure_dashboard_step2_desc">
<page path="/jsp/dashboards/wizard/columns.jsp"
title-id="configure_dashboard_step2_title"
description-id="configure_dashboard_step2_desc"
instruction-id="default_instruction" />
</step>
<step name="summary" title-id="summary" description-id="summary_step_description">
<page path="/jsp/wizard/summary.jsp"
title-id="summary"
description-id="summary_desc"
instruction-id="configure_dashboard_finish_instruction" />
</step>
</wizard>
<!-- Definition of the Start Workflow wizard -->
<wizard name="startWorkflow" managed-bean="StartWorkflowWizard"
title-id="start_workflow_wizard" description-id="start_workflow_desc"
icon="/images/icons/new_workflow_large.gif">
<step name="choose-workflow" title-id="step_choose_workflow"
description-id="start_workflow_choose_desc">
<page path="/jsp/workflow/start-workflow-wizard/choose-workflow.jsp"
title-id="start_workflow_choose_title"
description-id="start_workflow_choose_desc"
instruction-id="default_instruction" />
</step>
<step name="options" title-id="step_workflow_options"
description-id="start_workflow_options_desc">
<page path="/jsp/workflow/start-workflow-wizard/workflow-options.jsp"
title-id="start_workflow_options_title"
description-id="start_workflow_options_desc"
instruction-id="default_instruction" />
</step>
<step name="summary" title-id="summary" description-id="summary_step_description">
<page path="/jsp/wizard/summary.jsp"
title-id="summary"
description-id="summary_desc"
instruction-id="start_workflow_finish_instruction" />
</step>
</wizard>
</wizards> </wizards>
</config> </config>

4
config/alfresco/web-client-config-workflow-actions.xml
View File

@@ -5,6 +5,7 @@
<action id="start_workflow"> <action id="start_workflow">
<label-id>start_workflow</label-id> <label-id>start_workflow</label-id>
<image>/images/icons/new_workflow.gif</image> <image>/images/icons/new_workflow.gif</image>
<evaluator>org.alfresco.web.action.evaluator.StartWorkflowEvaluator</evaluator>
<action>wizard:startWorkflow</action> <action>wizard:startWorkflow</action>
<action-listener>#{WizardManager.setupParameters}</action-listener> <action-listener>#{WizardManager.setupParameters}</action-listener>
<params> <params>
@@ -59,6 +60,9 @@
</action> </action>
<action id="edit_content_properties"> <action id="edit_content_properties">
<permissions>
<permission allow="true">Write</permission>
</permissions>
<label-id>edit_properties</label-id> <label-id>edit_properties</label-id>
<image>/images/icons/Change_details.gif</image> <image>/images/icons/Change_details.gif</image>
<action>dialog:editContentProperties</action> <action>dialog:editContentProperties</action>

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

@@ -162,6 +162,13 @@
</folder-types> </folder-types>
<!-- custom properties to be shown in the More Options panel --> <!-- custom properties to be shown in the More Options panel -->
<custom-properties> <custom-properties>
<meta-data aspect="rma:filePlan" property="rma:recordCategoryName" />
<meta-data aspect="rma:filePlan" property="rma:recordCategoryIdentifier" />
<meta-data aspect="rma:record" property="rma:recordIdentifier" />
<meta-data aspect="rma:record" property="rma:orginator" />
<meta-data aspect="rma:record" property="rma:orginatingOrganization" />
<meta-data aspect="rma:record" property="rma:dateReceived" />
<meta-data aspect="rma:record" property="rma:supplementalMarkingList" />
</custom-properties> </custom-properties>
</advanced-search> </advanced-search>
</config> </config>
@@ -190,6 +197,11 @@
<dashlet id="getting-started" label-id="dashlet_gettingstarted_label" <dashlet id="getting-started" label-id="dashlet_gettingstarted_label"
description-id="dashlet_gettingstarted_desc" description-id="dashlet_gettingstarted_desc"
jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" /> jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" />
<!-- this dashlet 'tasks-todo' is also shown by default for all users -->
<dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
<dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
<dashlet id="my-docs-template" label-id="dashlet_mydocuments" <dashlet id="my-docs-template" label-id="dashlet_mydocuments"
description-id="dashlet_mydocuments_desc" description-id="dashlet_mydocuments_desc"
jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" /> jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
@@ -199,10 +211,6 @@
<dashlet id="my-images" label-id="dashlet_myimages" <dashlet id="my-images" label-id="dashlet_myimages"
description-id="dashlet_myimages_desc" description-id="dashlet_myimages_desc"
jsp="/jsp/dashboards/dashlets/my-images.jsp" allow-narrow="false" /> jsp="/jsp/dashboards/dashlets/my-images.jsp" allow-narrow="false" />
<dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
<dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
</dashlets> </dashlets>
<!-- set true allow the Guest user to configure the dashboard view - false by default --> <!-- set true allow the Guest user to configure the dashboard view - false by default -->
<allow-guest-config>false</allow-guest-config> <allow-guest-config>false</allow-guest-config>
@@ -255,6 +263,13 @@
<aspect name="translatable"/> <aspect name="translatable"/>
<aspect name="localizable"/> <aspect name="localizable"/>
<aspect name="emailed"/> <aspect name="emailed"/>
<aspect name="rma:record"/>
<aspect name="rma:filePlan"/>
<aspect name="rma:cutoffable"/>
<aspect name="rma:holdable"/>
<aspect name="rma:transferable"/>
<aspect name="rma:accessionable"/>
<aspect name="rma:destroyable"/>
</aspects> </aspects>
<!-- List of aspects to only show in the add features action --> <!-- List of aspects to only show in the add features action -->
<aspects-add> <aspects-add>

42
source/java/org/alfresco/web/action/evaluator/StartWorkflowEvaluator.java Normal file
View File

@@ -0,0 +1,42 @@
/*
* 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.action.evaluator;
import javax.faces.context.FacesContext;
import org.alfresco.web.action.ActionEvaluator;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.NavigationBean;
import org.alfresco.web.bean.repository.Node;
/**
* UI Action Evaluator - Start workflow on a node.
*
* @author gavinc
*/
public class StartWorkflowEvaluator implements ActionEvaluator
{
/**
* @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
*/
public boolean evaluate(Node node)
{
NavigationBean nav =
(NavigationBean)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "NavigationBean");
return (nav.getIsGuest() == false);
}
}

8
source/java/org/alfresco/web/app/Application.java
View File

@@ -63,7 +63,7 @@ public class Application
public static final String MESSAGE_BUNDLE = "alfresco.messages.webclient"; public static final String MESSAGE_BUNDLE = "alfresco.messages.webclient";
private static ThreadLocal<Boolean> inPortalServer = new ThreadLocal<Boolean>(); private static boolean inPortalServer = false;
private static StoreRef repoStoreRef; private static StoreRef repoStoreRef;
private static String rootPath; private static String rootPath;
private static String companyRootId; private static String companyRootId;
@@ -91,7 +91,7 @@ public class Application
*/ */
public static void setInPortalServer(boolean inPortal) public static void setInPortalServer(boolean inPortal)
{ {
inPortalServer.set(inPortal); inPortalServer = inPortal;
} }
/** /**
@@ -101,7 +101,7 @@ public class Application
*/ */
public static boolean inPortalServer() public static boolean inPortalServer()
{ {
return (inPortalServer.get() != null ? inPortalServer.get() : false); return inPortalServer;
} }
/** /**
@@ -488,7 +488,7 @@ public class Application
{ {
Locale locale = parseLocale(code); Locale locale = parseLocale(code);
session.setAttribute(LOCALE, locale); session.putValue(LOCALE, locale);
session.removeAttribute(MESSAGE_BUNDLE); session.removeAttribute(MESSAGE_BUNDLE);
} }

45
source/java/org/alfresco/web/bean/BrowseBean.java
View File

@@ -19,6 +19,7 @@ package org.alfresco.web.bean;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -70,6 +71,7 @@ import org.alfresco.web.ui.common.component.UIActionLink;
import org.alfresco.web.ui.common.component.UIBreadcrumb; import org.alfresco.web.ui.common.component.UIBreadcrumb;
import org.alfresco.web.ui.common.component.UIModeList; import org.alfresco.web.ui.common.component.UIModeList;
import org.alfresco.web.ui.common.component.UIStatusMessage; import org.alfresco.web.ui.common.component.UIStatusMessage;
import org.alfresco.web.ui.common.component.UIPanel.ExpandedEvent;
import org.alfresco.web.ui.common.component.data.UIRichList; import org.alfresco.web.ui.common.component.data.UIRichList;
import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler; import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
import org.alfresco.web.ui.repo.component.UINodeDescendants; import org.alfresco.web.ui.repo.component.UINodeDescendants;
@@ -239,6 +241,22 @@ public class BrowseBean implements IContextListener
getSearchMinimum(); getSearchMinimum();
} }
/**
* @return Returns the panels expanded state map.
*/
public Map<String, Boolean> getPanels()
{
return this.panels;
}
/**
* @param panels The panels expanded state map.
*/
public void setPanels(Map<String, Boolean> panels)
{
this.panels = panels;
}
/** /**
* @return Returns the Space Node being used for the current browse screen action. * @return Returns the Space Node being used for the current browse screen action.
*/ */
@@ -1394,6 +1412,18 @@ public class BrowseBean implements IContextListener
this.externalForceRefresh = true; this.externalForceRefresh = true;
} }
/**
* Save the state of the panel that was expanded/collapsed
*/
public void expandPanel(ActionEvent event)
{
if (event instanceof ExpandedEvent)
{
String id = event.getComponent().getId();
this.panels.put(id, ((ExpandedEvent)event).State);
}
}
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Private helpers // Private helpers
@@ -1560,7 +1590,7 @@ public class BrowseBean implements IContextListener
/** /**
* Perform navigation to the browse screen if it is not already the current View * Perform navigation to the browse screen if it is not already the current View
*/ */
public void navigateBrowseScreen() private void navigateBrowseScreen()
{ {
String outcome = null; String outcome = null;
@@ -1672,7 +1702,10 @@ public class BrowseBean implements IContextListener
protected ViewsConfigElement viewsConfig = null; protected ViewsConfigElement viewsConfig = null;
/** Listeners for Node events */ /** Listeners for Node events */
private Set<NodeEventListener> nodeEventListeners = null; protected Set<NodeEventListener> nodeEventListeners = null;
/** Collapsable Panel state */
private Map<String, Boolean> panels = new HashMap<String, Boolean>(4, 1.0f);
/** Component references */ /** Component references */
protected UIRichList spacesRichList; protected UIRichList spacesRichList;
@@ -1680,14 +1713,14 @@ public class BrowseBean implements IContextListener
private UIStatusMessage statusMessage; private UIStatusMessage statusMessage;
/** Transient lists of container and content nodes for display */ /** Transient lists of container and content nodes for display */
private List<Node> containerNodes = null; protected List<Node> containerNodes = null;
private List<Node> contentNodes = null; protected List<Node> contentNodes = null;
/** The current space and it's properties - if any */ /** The current space and it's properties - if any */
private Node actionSpace; protected Node actionSpace;
/** The current document */ /** The current document */
private Node document; protected Node document;
/** Special message to display when user deleting certain folders e.g. Company Home */ /** Special message to display when user deleting certain folders e.g. Company Home */
private String deleteMessage; private String deleteMessage;

48
source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
View File

@@ -377,8 +377,8 @@ public class CheckinCheckoutBean
*/ */
private Node setupContentDocument(String id) private Node setupContentDocument(String id)
{ {
if (LOGGER.isDebugEnabled()) if (logger.isDebugEnabled())
LOGGER.debug("Setup for action, setting current document to: " + id); logger.debug("Setup for action, setting current document to: " + id);
Node node = null; Node node = null;
@@ -428,14 +428,14 @@ public class CheckinCheckoutBean
tx = Repository.getUserTransaction(FacesContext.getCurrentInstance()); tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
tx.begin(); tx.begin();
if (LOGGER.isDebugEnabled()) if (logger.isDebugEnabled())
LOGGER.debug("Trying to checkout content node Id: " + node.getId()); logger.debug("Trying to checkout content node Id: " + node.getId());
// checkout the node content to create a working copy // checkout the node content to create a working copy
if (LOGGER.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
LOGGER.debug("Checkout copy location: " + getCopyLocation()); logger.debug("Checkout copy location: " + getCopyLocation());
LOGGER.debug("Selected Space Id: " + this.selectedSpaceId); logger.debug("Selected Space Id: " + this.selectedSpaceId);
} }
NodeRef workingCopyRef; NodeRef workingCopyRef;
if (getCopyLocation().equals(COPYLOCATION_OTHER) && this.selectedSpaceId != null) if (getCopyLocation().equals(COPYLOCATION_OTHER) && this.selectedSpaceId != null)
@@ -479,7 +479,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: checkoutFile called without a current Document!"); logger.warn("WARNING: checkoutFile called without a current Document!");
} }
return outcome; return outcome;
@@ -510,7 +510,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: checkoutFileOK called without a current WorkingDocument!"); logger.warn("WARNING: checkoutFileOK called without a current WorkingDocument!");
} }
return outcome; return outcome;
@@ -535,7 +535,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: editFileOK called without a current Document!"); logger.warn("WARNING: editFileOK called without a current Document!");
} }
return outcome; return outcome;
@@ -574,9 +574,7 @@ public class CheckinCheckoutBean
MimetypeMap.MIMETYPE_JAVASCRIPT.equals(mimetype)) MimetypeMap.MIMETYPE_JAVASCRIPT.equals(mimetype))
{ {
// make content available to the editing screen // make content available to the editing screen
String contentString = reader.getContentString(); setEditorOutput(reader.getContentString());
setDocumentContent(contentString);
setEditorOutput(contentString);
// navigate to appropriate screen // navigate to appropriate screen
FacesContext fc = FacesContext.getCurrentInstance(); FacesContext fc = FacesContext.getCurrentInstance();
@@ -628,8 +626,8 @@ public class CheckinCheckoutBean
tx = Repository.getUserTransaction(FacesContext.getCurrentInstance()); tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
tx.begin(); tx.begin();
if (LOGGER.isDebugEnabled()) if (logger.isDebugEnabled())
LOGGER.debug("Trying to update content node Id: " + node.getId()); logger.debug("Trying to update content node Id: " + node.getId());
// get an updating writer that we can use to modify the content on the current node // get an updating writer that we can use to modify the content on the current node
ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, true); ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, true);
@@ -664,7 +662,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: editInlineOK called without a current Document!"); logger.warn("WARNING: editInlineOK called without a current Document!");
} }
return outcome; return outcome;
@@ -697,7 +695,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: undoCheckout called without a current WorkingDocument!"); logger.warn("WARNING: undoCheckout called without a current WorkingDocument!");
} }
return outcome; return outcome;
@@ -746,7 +744,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: undoCheckout called without a current WorkingDocument!"); logger.warn("WARNING: undoCheckout called without a current WorkingDocument!");
} }
return outcome; return outcome;
@@ -771,8 +769,8 @@ public class CheckinCheckoutBean
tx = Repository.getUserTransaction(context); tx = Repository.getUserTransaction(context);
tx.begin(); tx.begin();
if (LOGGER.isDebugEnabled()) if (logger.isDebugEnabled())
LOGGER.debug("Trying to checkin content node Id: " + node.getId()); logger.debug("Trying to checkin content node Id: " + node.getId());
// we can either checkin the content from the current working copy node // we can either checkin the content from the current working copy node
// which would have been previously updated by the user // which would have been previously updated by the user
@@ -837,7 +835,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: checkinFileOK called without a current Document!"); logger.warn("WARNING: checkinFileOK called without a current Document!");
} }
return outcome; return outcome;
@@ -862,8 +860,8 @@ public class CheckinCheckoutBean
tx = Repository.getUserTransaction(context); tx = Repository.getUserTransaction(context);
tx.begin(); tx.begin();
if (LOGGER.isDebugEnabled()) if (logger.isDebugEnabled())
LOGGER.debug("Trying to update content node Id: " + node.getId()); logger.debug("Trying to update content node Id: " + node.getId());
// get an updating writer that we can use to modify the content on the current node // get an updating writer that we can use to modify the content on the current node
ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, true); ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, true);
@@ -893,7 +891,7 @@ public class CheckinCheckoutBean
} }
else else
{ {
LOGGER.warn("WARNING: updateFileOK called without a current Document!"); logger.warn("WARNING: updateFileOK called without a current Document!");
} }
return outcome; return outcome;
@@ -938,7 +936,7 @@ public class CheckinCheckoutBean
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Private data // Private data
private static final Log LOGGER = LogFactory.getLog(CheckinCheckoutBean.class); private static Log logger = LogFactory.getLog(CheckinCheckoutBean.class);
/** I18N messages */ /** I18N messages */
private static final String MSG_ERROR_CHECKIN = "error_checkin"; private static final String MSG_ERROR_CHECKIN = "error_checkin";

18
source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
View File

@@ -42,8 +42,9 @@ public class DashboardManager
private static Log logger = LogFactory.getLog(DashboardManager.class); private static Log logger = LogFactory.getLog(DashboardManager.class);
private static final String PREF_DASHBOARD = "dashboard"; private static final String PREF_DASHBOARD = "dashboard";
static final String LAYOUT_DEFAULT = "default"; private static final String LAYOUT_DEFAULT = "default";
static final String DASHLET_DEFAULT = "getting-started"; private static final String DASHLET_STARTEDDEFAULT = "getting-started";
private static final String DASHLET_TASKSDEFAULT = "tasks-todo";
private static final String JSP_DUMMY = "/jsp/dashboards/dummy.jsp"; private static final String JSP_DUMMY = "/jsp/dashboards/dummy.jsp";
@@ -150,15 +151,24 @@ public class DashboardManager
{ {
Page page = new Page("default", layout); Page page = new Page("default", layout);
Column defaultColumn = new Column(); Column defaultColumn = new Column();
DashletDefinition dashlet = config.getDashletDefinition(DASHLET_DEFAULT);
// add the default dashlet(s) to the column
DashletDefinition dashlet = config.getDashletDefinition(DASHLET_STARTEDDEFAULT);
if (dashlet != null) if (dashlet != null)
{ {
defaultColumn.addDashlet(dashlet); defaultColumn.addDashlet(dashlet);
}
dashlet = config.getDashletDefinition(DASHLET_TASKSDEFAULT);
if (dashlet != null)
{
defaultColumn.addDashlet(dashlet);
}
// add the column to the page and we are done
page.addColumn(defaultColumn); page.addColumn(defaultColumn);
pageConfig.addPage(page); pageConfig.addPage(page);
} }
} }
}
this.pageConfig = pageConfig; this.pageConfig = pageConfig;
} }

11
source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
View File

@@ -447,6 +447,17 @@ public class StartWorkflowWizard extends BaseWizardBean
new String[] {workflowName}); new String[] {workflowName});
} }
/**
* Determines whether there are any workflows to start
* @return
*/
public boolean getHasStartableWorkflows()
{
// get the list of startable workflow, this will intialise the list if necessary
List<SelectItem> workflows = getStartableWorkflows();
return (workflows.size() > 0);
}
/** /**
* Returns a list of workflows that can be started. * Returns a list of workflows that can be started.
* *

13
source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
View File

@@ -25,6 +25,7 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIInput; import javax.faces.component.UIInput;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter; import javax.faces.context.ResponseWriter;
import javax.faces.el.PropertyNotFoundException;
import org.alfresco.config.Config; import org.alfresco.config.Config;
import org.alfresco.config.ConfigElement; import org.alfresco.config.ConfigElement;
@@ -161,6 +162,8 @@ public class ImagePickerRadioRenderer extends BaseRenderer
} }
} }
else else
{
try
{ {
// get the child components // get the child components
for (Iterator i = imagePicker.getChildren().iterator(); i.hasNext(); /**/) for (Iterator i = imagePicker.getChildren().iterator(); i.hasNext(); /**/)
@@ -192,6 +195,16 @@ public class ImagePickerRadioRenderer extends BaseRenderer
} }
} }
} }
catch (PropertyNotFoundException pnfe)
{
// handle the scenario where the bean does not have the
// method specified in the value binding expression
if (logger.isWarnEnabled())
logger.warn("Failed to retrieve icons: " + pnfe.toString());
out.write(Application.getMessage(context, "no_icons_found"));
}
}
// if we are in the middle of a row, close it // if we are in the middle of a row, close it
if (open) if (open)

45
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -1466,6 +1466,10 @@
<property-name>fileFolderService</property-name> <property-name>fileFolderService</property-name>
<value>#{FileFolderService}</value> <value>#{FileFolderService}</value>
</managed-property> </managed-property>
<managed-property>
<property-name>searchService</property-name>
<value>#{SearchService}</value>
</managed-property>
<managed-property> <managed-property>
<property-name>navigator</property-name> <property-name>navigator</property-name>
<value>#{NavigationBean}</value> <value>#{NavigationBean}</value>
@@ -1780,43 +1784,6 @@
</managed-property> </managed-property>
</managed-bean> </managed-bean>
<managed-bean>
<description>
The bean that backs up the Delete Post Dialog
</description>
<managed-bean-name>DeletePostDialog</managed-bean-name>
<managed-bean-class>org.alfresco.web.bean.forums.DeletePostDialog</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>nodeService</property-name>
<value>#{NodeService}</value>
</managed-property>
<managed-property>
<property-name>fileFolderService</property-name>
<value>#{FileFolderService}</value>
</managed-property>
<managed-property>
<property-name>searchService</property-name>
<value>#{SearchService}</value>
</managed-property>
<managed-property>
<property-name>navigator</property-name>
<value>#{NavigationBean}</value>
</managed-property>
<managed-property>
<property-name>browseBean</property-name>
<value>#{BrowseBean}</value>
</managed-property>
<managed-property>
<property-name>dictionaryService</property-name>
<value>#{DictionaryService}</value>
</managed-property>
<managed-property>
<property-name>namespaceService</property-name>
<value>#{NamespaceService}</value>
</managed-property>
</managed-bean>
<managed-bean> <managed-bean>
<description> <description>
The bean that holds state for the Manage Deleted Items screen. The bean that holds state for the Manage Deleted Items screen.
@@ -1837,8 +1804,8 @@
<value>#{SearchService}</value> <value>#{SearchService}</value>
</managed-property> </managed-property>
<managed-property> <managed-property>
<property-name>namespaceService</property-name> <property-name>dictionaryService</property-name>
<value>#{NamespaceService}</value> <value>#{DictionaryService}</value>
</managed-property> </managed-property>
</managed-bean> </managed-bean>

50
source/web/WEB-INF/faces-config-navigation.xml
View File

@@ -98,9 +98,9 @@
</navigation-case> </navigation-case>
</navigation-rule> </navigation-rule>
<!-- Browse screen action outcomes --> <!-- Common document actions available from anywhere -->
<navigation-rule> <navigation-rule>
<from-view-id>/jsp/browse/browse.jsp</from-view-id> <from-view-id>/jsp/*</from-view-id>
<navigation-case> <navigation-case>
<from-outcome>addContent</from-outcome> <from-outcome>addContent</from-outcome>
<to-view-id>/jsp/content/add-content-dialog.jsp</to-view-id> <to-view-id>/jsp/content/add-content-dialog.jsp</to-view-id>
@@ -134,6 +134,13 @@
<from-outcome>editTextInline</from-outcome> <from-outcome>editTextInline</from-outcome>
<to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id> <to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
</navigation-case> </navigation-case>
</navigation-rule>
<!-- Browse screen action outcomes -->
<navigation-rule>
<from-view-id>/jsp/browse/browse.jsp</from-view-id>
<!-- showDocDetails and showSpaceDetails moved to /jsp/* above -->
<!-- edit, update, checkout actions moved to /jsp/* above -->
<navigation-case> <navigation-case>
<from-outcome>editXmlInline</from-outcome> <from-outcome>editXmlInline</from-outcome>
<to-view-id>/jsp/dialog/edit-xml-inline.jsp</to-view-id> <to-view-id>/jsp/dialog/edit-xml-inline.jsp</to-view-id>
@@ -898,45 +905,6 @@
<from-outcome>topicDeleted</from-outcome> <from-outcome>topicDeleted</from-outcome>
<to-view-id>/jsp/forums/forum.jsp</to-view-id> <to-view-id>/jsp/forums/forum.jsp</to-view-id>
</navigation-case> </navigation-case>
<!-- Workflow navigation rules for actions on workflow package items -->
<navigation-case>
<from-outcome>checkoutFile</from-outcome>
<to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>checkinFile</from-outcome>
<to-view-id>/jsp/dialog/checkin-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>undoCheckoutFile</from-outcome>
<to-view-id>/jsp/dialog/undocheckout-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>updateFile</from-outcome>
<to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editFile</from-outcome>
<to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editHtmlInline</from-outcome>
<to-view-id>/jsp/dialog/edit-html-inline.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editTextInline</from-outcome>
<to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>itemDetails</from-outcome>
<to-view-id>/jsp/trashcan/item-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>recoveryReport</from-outcome>
<to-view-id>/jsp/trashcan/recovery-report.jsp</to-view-id>
</navigation-case>
</navigation-rule> </navigation-rule>
</faces-config> </faces-config>

7
source/web/css/main.css
View File

@@ -529,6 +529,13 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
border-color: #AAAAAA; border-color: #AAAAAA;
} }
.workflowSelection
{
border: 1px solid #676767;
background-color: #efefef;
padding: 6px 12px 12px 6px;
}
.workflowSummary .workflowSummary
{ {
margin-left: 6px; margin-left: 6px;

BIN
source/web/images/logo/alfresco_enterprise.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

21
source/web/jsp/browse/browse.jsp
View File

@@ -202,6 +202,21 @@
<td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td> <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
</tr> </tr>
<%-- Custom Template View --%>
<a:panel id="custom-wrapper-panel" rendered="#{NavigationBean.currentNodeHasTemplate}">
<tr valign=top>
<td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
<td style="padding:4px">
<a:panel id="custom-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"
label="#{msg.custom_view}" progressive="true"
expanded='#{BrowseBean.panels["custom-panel"]}' expandedActionListener="#{BrowseBean.expandPanel}">
<r:template id="template" template="#{NavigationBean.currentNodeTemplate}" model="#{NavigationBean.templateModel}" />
</a:panel>
</td>
<td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
</tr>
</a:panel>
<%-- Details - Spaces --%> <%-- Details - Spaces --%>
<tr valign=top> <tr valign=top>
<td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td> <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
@@ -218,7 +233,8 @@
</f:facet> </f:facet>
</h:panelGroup> </h:panelGroup>
<a:panel id="spaces-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" <a:panel id="spaces-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"
label="#{msg.browse_spaces}" progressive="true" facetsId="spaces-panel-facets"> label="#{msg.browse_spaces}" progressive="true" facetsId="spaces-panel-facets"
expanded='#{BrowseBean.panels["spaces-panel"]}' expandedActionListener="#{BrowseBean.expandPanel}">
<%-- Spaces List --%> <%-- Spaces List --%>
<a:richList id="spacesList" binding="#{BrowseBean.spacesRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeSpaces}" <a:richList id="spacesList" binding="#{BrowseBean.spacesRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeSpaces}"
@@ -354,7 +370,8 @@
</f:facet> </f:facet>
</h:panelGroup> </h:panelGroup>
<a:panel id="content-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" <a:panel id="content-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"
label="#{msg.browse_content}" progressive="true" facetsId="content-panel-facets"> label="#{msg.browse_content}" progressive="true" facetsId="content-panel-facets"
expanded='#{BrowseBean.panels["content-panel"]}' expandedActionListener="#{BrowseBean.expandPanel}">
<%-- Content list --%> <%-- Content list --%>
<a:richList id="contentRichList" binding="#{BrowseBean.contentRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeContent}" <a:richList id="contentRichList" binding="#{BrowseBean.contentRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeContent}"

18
source/web/jsp/dashboards/wizard/columns.jsp
View File

@@ -33,8 +33,8 @@
</script> </script>
</f:verbatim> </f:verbatim>
<h:panelGrid columns="1" cellpadding="2" cellspacing="0" border="0" width="100%"> <h:panelGrid id="main-panel" columns="1" cellpadding="2" cellspacing="0" border="0" width="100%">
<h:panelGroup rendered="#{WizardManager.bean.columnCount != 1}"> <h:panelGroup id="panel1" rendered="#{WizardManager.bean.columnCount != 1}">
<h:outputText value="#{msg.select_column}:" /> <h:outputText value="#{msg.select_column}:" />
<f:verbatim>&nbsp;</f:verbatim> <f:verbatim>&nbsp;</f:verbatim>
<h:selectOneMenu id="columns" value="#{WizardManager.bean.column}" onchange="document.forms['wizard'].submit(); return true;"> <h:selectOneMenu id="columns" value="#{WizardManager.bean.column}" onchange="document.forms['wizard'].submit(); return true;">
@@ -46,8 +46,8 @@
</h:outputFormat> </h:outputFormat>
</h:panelGroup> </h:panelGroup>
<h:panelGrid columns="3" cellpadding="2" cellspacing="0" border="0" columnClasses="alignTop,alignMiddle"> <h:panelGrid id="panel2" columns="3" cellpadding="2" cellspacing="0" border="0" columnClasses="alignTop,alignMiddle">
<h:panelGrid columns="1" cellpadding="2" border="0"> <h:panelGrid id="panel3" columns="1" cellpadding="2" border="0">
<h:outputText value="#{msg.dashlet_list}:" /> <h:outputText value="#{msg.dashlet_list}:" />
<%-- note this component ID is referenced in DashboardWizard --%> <%-- note this component ID is referenced in DashboardWizard --%>
<h:selectManyListbox id="all-dashlets" style="width:300px" size="8"> <h:selectManyListbox id="all-dashlets" style="width:300px" size="8">
@@ -55,22 +55,22 @@
</h:selectManyListbox> </h:selectManyListbox>
</h:panelGrid> </h:panelGrid>
<h:commandButton value="#{msg.dashlet_btn_select} >>" actionListener="#{WizardManager.bean.addDashlets}" /> <h:commandButton id="select-btn" value="#{msg.dashlet_btn_select} >>" actionListener="#{WizardManager.bean.addDashlets}" />
<h:panelGrid columns="1" cellpadding="2" border="0"> <h:panelGrid id="panel4" columns="1" cellpadding="2" border="0">
<h:outputText value="#{msg.selected_dashlets}:" /> <h:outputText value="#{msg.selected_dashlets}:" />
<h:panelGrid columns="2" cellpadding="2" cellspacing="0" border="0"> <h:panelGrid id="panel5" columns="2" cellpadding="2" cellspacing="0" border="0">
<%-- note this component ID is referenced in DashboardWizard --%> <%-- note this component ID is referenced in DashboardWizard --%>
<h:selectOneListbox id="column-dashlets" style="width:150px" size="8"> <h:selectOneListbox id="column-dashlets" style="width:150px" size="8">
<f:selectItems value="#{WizardManager.bean.columnDashlets}" /> <f:selectItems value="#{WizardManager.bean.columnDashlets}" />
</h:selectOneListbox> </h:selectOneListbox>
<h:panelGroup> <h:panelGroup id="panel6">
<h:commandButton value="+" style="width:24px" actionListener="#{WizardManager.bean.dashletUp}" /> <h:commandButton value="+" style="width:24px" actionListener="#{WizardManager.bean.dashletUp}" />
<f:verbatim><br></f:verbatim> <f:verbatim><br></f:verbatim>
<h:commandButton value="-" style="width:24px" actionListener="#{WizardManager.bean.dashletDown}"/> <h:commandButton value="-" style="width:24px" actionListener="#{WizardManager.bean.dashletDown}"/>
</h:panelGroup> </h:panelGroup>
</h:panelGrid> </h:panelGrid>
<h:commandButton value="#{msg.dashlet_btn_remove}" actionListener="#{WizardManager.bean.removeDashlet}" /> <h:commandButton id="remove-btn" value="#{msg.dashlet_btn_remove}" actionListener="#{WizardManager.bean.removeDashlet}" />
</h:panelGrid> </h:panelGrid>
</h:panelGrid> </h:panelGrid>
</h:panelGrid> </h:panelGrid>

10
source/web/jsp/rules/details.jsp
View File

@@ -125,5 +125,15 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
</f:verbatim>
<h:panelGrid columns="2">
<h:selectBooleanCheckbox value="#{WizardManager.bean.ruleDisabled}" />
<h:outputText value="#{msg.rule_disabled}" />
</h:panelGrid>
<f:verbatim>
</td>
</tr>
</table> </table>
</f:verbatim> </f:verbatim>

58
source/web/jsp/workflow/manage-task-dialog.jsp
View File

@@ -19,14 +19,14 @@
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<a:panel id="props-panel" label="#{msg.task_properties}" <a:panel id="metadata-panel" label="#{msg.task_properties}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
<r:propertySheetGrid id="task-props" value="#{DialogManager.bean.taskNode}" <r:propertySheetGrid id="task-props" value="#{DialogManager.bean.taskNode}"
var="taskProps" columns="1" externalConfig="true" /> var="taskProps" columns="1" externalConfig="true" />
</a:panel> </a:panel>
<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="resources-panel" label="#{msg.resources}" <a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
@@ -38,60 +38,60 @@
initialSortColumn="name" initialSortDescending="true"> initialSortColumn="name" initialSortDescending="true">
<%-- Name column --%> <%-- Name column --%>
<a:column primary="true" width="200" style="padding:2px; text-align:left"> <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/> <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet> </f:facet>
<f:facet name="small-icon"> <f:facet name="small-icon">
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}"
showLink="false" styleClass="inlineAction" /> showLink="false" styleClass="inlineAction" />
</f:facet> </f:facet>
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" /> <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
<r:lockIcon value="#{r.nodeRef}" align="absmiddle" /> <r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
</a:column> </a:column>
<%-- Description column --%> <%-- Description column --%>
<a:column style="text-align:left"> <a:column id="col2" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.description}" value="description" styleClass="header"/> <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.description}" /> <h:outputText id="col2-txt" value="#{r.description}" />
</a:column> </a:column>
<%-- Path column --%> <%-- Path column --%>
<a:column style="text-align:left"> <a:column id="col3" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.path}" value="path" styleClass="header"/> <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
</f:facet> </f:facet>
<r:nodePath value="#{r.path}" /> <r:nodePath id="col3-path" value="#{r.path}" />
</a:column> </a:column>
<%-- Created Date column --%> <%-- Created Date column --%>
<a:column style="text-align:left"> <a:column id="col4" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.created}" value="created" styleClass="header"/> <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.created}"> <h:outputText id="col4-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Modified Date column --%> <%-- Modified Date column --%>
<a:column style="text-align:left"> <a:column id="col5" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/> <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.modified}"> <h:outputText id="col5-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Actions column --%> <%-- Actions column --%>
<a:column actions="true" style="text-align:left"> <a:column id="col6" actions="true" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{msg.actions}"/> <h:outputText id="col6-txt" value="#{msg.actions}"/>
</f:facet> </f:facet>
<r:actions value="#{DialogManager.bean.packageItemActionGroup}" <r:actions id="col6-actions" value="#{DialogManager.bean.packageItemActionGroup}"
context="#{r}" showLink="false" styleClass="inlineAction" /> context="#{r}" showLink="false" styleClass="inlineAction" />
</a:column> </a:column>
@@ -108,12 +108,14 @@
--%> --%>
</a:richList> </a:richList>
<h:panelGrid columns="1" styleClass="paddingRow"> <h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
<r:actions context="#{DialogManager.bean.taskNode}" value="#{DialogManager.bean.packageActionGroup}" /> <r:actions id="package-actions" context="#{DialogManager.bean.taskNode}"
value="#{DialogManager.bean.packageActionGroup}" />
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="1" rendered="#{DialogManager.bean.itemBeingAdded}" styleClass="selector" style="margin-top: 6px;"> <h:panelGrid id="add-item-control" columns="1" rendered="#{DialogManager.bean.itemBeingAdded}"
<r:contentSelector value="#{DialogManager.bean.itemsToAdd}" styleClass="" /> styleClass="selector" style="margin-top: 6px;">
<r:contentSelector id="content-picker" value="#{DialogManager.bean.itemsToAdd}" styleClass="" />
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:commandButton value="#{msg.add_to_list_button}" actionListener="#{DialogManager.bean.addPackageItems}" /> <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{DialogManager.bean.addPackageItems}" />
<h:commandButton value="#{msg.cancel}" actionListener="#{DialogManager.bean.cancelAddPackageItems}" /> <h:commandButton value="#{msg.cancel}" actionListener="#{DialogManager.bean.cancelAddPackageItems}" />
@@ -122,11 +124,11 @@
</a:panel> </a:panel>
<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}" <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
<r:workflowSummary value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" /> <r:workflowSummary id="workflow-summary" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
</a:panel> </a:panel>

2
source/web/jsp/workflow/reassign-task-dialog.jsp
View File

@@ -23,7 +23,7 @@
<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
<%@ page isELIgnored="false" %> <%@ page isELIgnored="false" %>
<h:outputText value="#{msg.reassign_select_user}<br/><br/>" escape="false" /> <h:outputText id="txt" value="#{msg.reassign_select_user}<br/><br/>" escape="false" />
<a:genericPicker id="user-picker" showAddButton="false" filters="#{DialogManager.bean.filters}" <a:genericPicker id="user-picker" showAddButton="false" filters="#{DialogManager.bean.filters}"
queryCallback="#{DialogManager.bean.pickerCallback}" multiSelect="false" /> queryCallback="#{DialogManager.bean.pickerCallback}" multiSelect="false" />

21
source/web/jsp/workflow/start-workflow-wizard/choose-workflow.jsp
View File

@@ -19,10 +19,29 @@
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:panelGrid columns="1" style="border: 1px solid #676767; background-color: #efefef; padding: 6px 12px 12px 6px;"> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
<h:panelGroup rendered="#{WizardManager.bean.hasStartableWorkflows == false}">
<f:verbatim>
<%PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc");%>
<table><tr><td>
</f:verbatim>
<h:graphicImage url="/images/icons/info_icon.gif" />
<f:verbatim>
</td><td>
</f:verbatim>
<h:outputText value="#{msg.start_workflow_no_workflows}" />
<f:verbatim>
</td></tr></table>
<%PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner");%>
</f:verbatim>
</h:panelGroup>
<h:panelGrid columns="1" styleClass="workflowSelection" rendered="#{WizardManager.bean.hasStartableWorkflows}">
<h:outputText value="#{msg.available_workflows}:"/> <h:outputText value="#{msg.available_workflows}:"/>
<h:selectOneRadio id="selected-workflow" value="#{WizardManager.bean.selectedWorkflow}" <h:selectOneRadio id="selected-workflow" value="#{WizardManager.bean.selectedWorkflow}"
layout="pageDirection"> layout="pageDirection">
<f:selectItems value="#{WizardManager.bean.startableWorkflows}" /> <f:selectItems value="#{WizardManager.bean.startableWorkflows}" />
</h:selectOneRadio> </h:selectOneRadio>
</h:panelGrid> </h:panelGrid>

65
source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
View File

@@ -21,7 +21,7 @@
<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
<h:panelGroup rendered="#{WizardManager.bean.taskMetadataNode == null}"> <h:panelGroup id="no-metadata-panel" rendered="#{WizardManager.bean.taskMetadataNode == null}">
<f:verbatim> <f:verbatim>
<%PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc");%> <%PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc");%>
<table><tr><td> <table><tr><td>
@@ -37,17 +37,17 @@
</f:verbatim> </f:verbatim>
</h:panelGroup> </h:panelGroup>
<h:panelGroup rendered="#{WizardManager.bean.taskMetadataNode != null}"> <a:panel id="metadata-panel" label="#{msg.properties}" rendered="#{WizardManager.bean.taskMetadataNode != null}"
<a:panel id="props-panel" label="#{msg.properties}" border="white" bgcolor="white" border="white" bgcolor="white"
titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
<r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" <r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}"
var="taskProps" columns="1" externalConfig="true" /> var="taskProps" columns="1" externalConfig="true" />
</a:panel> </a:panel>
<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="resources-panel" label="#{msg.resources}" <a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
<a:richList id="resources-list" viewMode="details" value="#{WizardManager.bean.resources}" var="r" <a:richList id="resources-list" viewMode="details" value="#{WizardManager.bean.resources}" var="r"
@@ -57,77 +57,78 @@
initialSortColumn="name" initialSortDescending="true"> initialSortColumn="name" initialSortDescending="true">
<%-- Name column --%> <%-- Name column --%>
<a:column primary="true" width="200" style="padding:2px; text-align:left"> <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/> <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet> </f:facet>
<f:facet name="small-icon"> <f:facet name="small-icon">
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new"
showLink="false" styleClass="inlineAction" /> image="#{r.fileType16}" showLink="false" styleClass="inlineAction" />
</f:facet> </f:facet>
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" /> <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
</a:column> </a:column>
<%-- Description column --%> <%-- Description column --%>
<a:column style="text-align:left"> <a:column id="col2" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.description}" value="description" styleClass="header"/> <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.description}" /> <h:outputText id="col2-txt" value="#{r.description}" />
</a:column> </a:column>
<%-- Path column --%> <%-- Path column --%>
<a:column style="text-align:left"> <a:column id="col3" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.path}" value="path" styleClass="header"/> <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
</f:facet> </f:facet>
<r:nodePath value="#{r.path}" /> <r:nodePath id="col3-path" value="#{r.path}" />
</a:column> </a:column>
<%-- Created Date column --%> <%-- Created Date column --%>
<a:column style="text-align:left"> <a:column id="col4" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.created}" value="created" styleClass="header"/> <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.created}"> <h:outputText id="col4-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Modified Date column --%> <%-- Modified Date column --%>
<a:column style="text-align:left"> <a:column id="col5" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/> <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.modified}"> <h:outputText id="col5-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Actions column --%> <%-- Actions column --%>
<a:column actions="true" style="text-align:left"> <a:column id="col6" actions="true" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{msg.actions}"/> <h:outputText id="col6-txt" value="#{msg.actions}"/>
</f:facet> </f:facet>
<r:actions id="actions-col-actions" value="#{WizardManager.bean.packageItemActionGroup}" <r:actions id="col6-actions" value="#{WizardManager.bean.packageItemActionGroup}"
context="#{r}" showLink="false" styleClass="inlineAction" /> context="#{r}" showLink="false" styleClass="inlineAction" />
</a:column> </a:column>
</a:richList> </a:richList>
<h:panelGrid columns="1" styleClass="paddingRow"> <h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
<r:actions context="#{WizardManager.bean.taskMetadataNode}" value="#{WizardManager.bean.packageActionGroup}" /> <r:actions id="package-actions" context="#{WizardManager.bean.taskMetadataNode}"
value="#{WizardManager.bean.packageActionGroup}" />
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="1" rendered="#{WizardManager.bean.itemBeingAdded}" styleClass="selector" style="margin-top: 6px;"> <h:panelGrid id="add-item-control" columns="1" rendered="#{WizardManager.bean.itemBeingAdded}"
<r:contentSelector value="#{WizardManager.bean.itemsToAdd}" styleClass="" /> styleClass="selector" style="margin-top: 6px;">
<r:contentSelector id="content-picker" value="#{WizardManager.bean.itemsToAdd}" styleClass="" />
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:commandButton value="#{msg.add_to_list_button}" actionListener="#{WizardManager.bean.addPackageItems}" /> <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{WizardManager.bean.addPackageItems}" />
<h:commandButton value="#{msg.cancel}" actionListener="#{WizardManager.bean.cancelAddPackageItems}" /> <h:commandButton value="#{msg.cancel}" actionListener="#{WizardManager.bean.cancelAddPackageItems}" />
</h:panelGrid> </h:panelGrid>
</h:panelGrid> </h:panelGrid>
</a:panel> </a:panel>
</h:panelGroup>

40
source/web/jsp/workflow/tasks-completed-dashlet.jsp
View File

@@ -9,64 +9,64 @@
initialSortColumn="name" initialSortDescending="true"> initialSortColumn="name" initialSortDescending="true">
<%-- Primary column for details view mode --%> <%-- Primary column for details view mode --%>
<a:column primary="true" width="200" style="padding:2px;text-align:left"> <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/> <a:sortLink id="col1-sort" label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet> </f:facet>
<f:facet name="small-icon"> <f:facet name="small-icon">
<a:actionLink value="#{r.name}" image="/images/icons/completed_workflow_task.gif" showLink="false" <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/completed_workflow_task.gif" showLink="false"
actionListener="#{DialogManager.setupParameters}" action="dialog:viewCompletedTask"> actionListener="#{DialogManager.setupParameters}" action="dialog:viewCompletedTask">
<f:param name="id" value="#{r.id}" /> <f:param name="id" value="#{r.id}" />
</a:actionLink> </a:actionLink>
</f:facet> </f:facet>
<a:actionLink value="#{r.name}" actionListener="#{DialogManager.setupParameters}" <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{DialogManager.setupParameters}"
action="dialog:viewCompletedTask"> action="dialog:viewCompletedTask">
<f:param name="id" value="#{r.id}" /> <f:param name="id" value="#{r.id}" />
</a:actionLink> </a:actionLink>
</a:column> </a:column>
<%-- Task id column --%> <%-- Task id column --%>
<a:column style="text-align:left"> <a:column id="col2" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.id}" value="bpm:taskId" styleClass="header"/> <a:sortLink id="col2-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r['bpm:taskId']}" /> <h:outputText id="col2-txt" value="#{r['bpm:taskId']}" />
</a:column> </a:column>
<%-- Source column --%> <%-- Source column --%>
<a:column style="text-align:left"> <a:column id="col3" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.source}" value="sourceSpaceName" styleClass="header"/> <a:sortLink id="col3-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.sourceSpaceName}" /> <h:outputText id="col3-txt" value="#{r.sourceSpaceName}" />
</a:column> </a:column>
<%-- Completed date column --%> <%-- Completed date column --%>
<a:column style="text-align:left"> <a:column id="col4" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/> <a:sortLink id="col4-sort" label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r['bpm:completionDate']}"> <h:outputText id="col4-txt" value="#{r['bpm:completionDate']}">
<a:convertXMLDate type="both" pattern="#{msg.date_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Outcome column --%> <%-- Outcome column --%>
<a:column style="text-align:left"> <a:column id="col5" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.outcome}" value="outcome" styleClass="header"/> <a:sortLink id="col5-sort" label="#{msg.outcome}" value="outcome" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.outcome}" /> <h:outputText id="col5-txt" value="#{r.outcome}" />
</a:column> </a:column>
<%-- Actions column --%> <%-- Actions column --%>
<a:column actions="true" style="text-align:left"> <a:column id="col6" actions="true" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{msg.actions}"/> <h:outputText id="col6-txt" value="#{msg.actions}"/>
</f:facet> </f:facet>
<r:actions value="dashlet_completed_actions" context="#{r}" showLink="false" <r:actions id="col6-actions" value="dashlet_completed_actions" context="#{r}" showLink="false"
styleClass="inlineAction" /> styleClass="inlineAction" />
</a:column> </a:column>
<a:dataPager styleClass="pager" /> <a:dataPager id="pager" styleClass="pager" />
</a:richList> </a:richList>

46
source/web/jsp/workflow/tasks-todo-dashlet.jsp
View File

@@ -9,72 +9,72 @@
initialSortColumn="name" initialSortDescending="true"> initialSortColumn="name" initialSortDescending="true">
<%-- Primary column for details view mode --%> <%-- Primary column for details view mode --%>
<a:column primary="true" width="200" style="padding:2px;text-align:left"> <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/> <a:sortLink id="col1-sort" label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet> </f:facet>
<f:facet name="small-icon"> <f:facet name="small-icon">
<a:actionLink value="#{r.name}" image="/images/icons/workflow_task.gif" showLink="false" <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/workflow_task.gif" showLink="false"
actionListener="#{DialogManager.setupParameters}" action="dialog:manageTask"> actionListener="#{DialogManager.setupParameters}" action="dialog:manageTask">
<f:param name="id" value="#{r.id}" /> <f:param name="id" value="#{r.id}" />
</a:actionLink> </a:actionLink>
</f:facet> </f:facet>
<a:actionLink value="#{r.name}" actionListener="#{DialogManager.setupParameters}" <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{DialogManager.setupParameters}"
action="dialog:manageTask"> action="dialog:manageTask">
<f:param name="id" value="#{r.id}" /> <f:param name="id" value="#{r.id}" />
</a:actionLink> </a:actionLink>
</a:column> </a:column>
<%-- Task id column --%> <%-- Task id column --%>
<a:column style="text-align:left"> <a:column id="col2" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.id}" value="bpm:taskId" styleClass="header"/> <a:sortLink id="col2-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r['bpm:taskId']}" /> <h:outputText id="col2-txt" value="#{r['bpm:taskId']}" />
</a:column> </a:column>
<%-- Source column --%> <%-- Source column --%>
<a:column style="text-align:left"> <a:column id="col3" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.source}" value="sourceSpaceName" styleClass="header"/> <a:sortLink id="col3-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.sourceSpaceName}" /> <h:outputText id="col3-txt" value="#{r.sourceSpaceName}" />
</a:column> </a:column>
<%-- Due date column --%> <%-- Due date column --%>
<a:column style="text-align:left"> <a:column id="col4" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.due_date}" value="bpm:startDate" styleClass="header"/> <a:sortLink id="col4-sort" label="#{msg.due_date}" value="bpm:startDate" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r['bpm:dueDate']}"> <h:outputText id="col4-txt" value="#{r['bpm:dueDate']}">
<a:convertXMLDate type="both" pattern="#{msg.date_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Status column --%> <%-- Status column --%>
<a:column style="text-align:left"> <a:column id="col5" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.status}" value="bpm:status" styleClass="header"/> <a:sortLink id="col5-sort" label="#{msg.status}" value="bpm:status" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r['bpm:status']}" /> <h:outputText id="col5-txt" value="#{r['bpm:status']}" />
</a:column> </a:column>
<%-- Priority column --%> <%-- Priority column --%>
<a:column style="text-align:left"> <a:column id="col6" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.priority}" value="bpm:priority" styleClass="header"/> <a:sortLink id="col6-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r['bpm:priority']}" /> <h:outputText id="col6-txt" value="#{r['bpm:priority']}" />
</a:column> </a:column>
<%-- Actions column --%> <%-- Actions column --%>
<a:column actions="true" style="text-align:left"> <a:column id="col7" actions="true" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{msg.actions}"/> <h:outputText id="col7-txt" value="#{msg.actions}"/>
</f:facet> </f:facet>
<r:actions value="dashlet_todo_actions" context="#{r}" showLink="false" <r:actions id="col7-actions" value="dashlet_todo_actions" context="#{r}" showLink="false"
styleClass="inlineAction" /> styleClass="inlineAction" />
</a:column> </a:column>
<a:dataPager styleClass="pager" /> <a:dataPager id="pager" styleClass="pager" />
</a:richList> </a:richList>

40
source/web/jsp/workflow/view-completed-task-dialog.jsp
View File

@@ -26,7 +26,7 @@
var="taskProps" columns="1" externalConfig="true" mode="view" /> var="taskProps" columns="1" externalConfig="true" mode="view" />
</a:panel> </a:panel>
<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="resources-panel" label="#{msg.resources}" <a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
@@ -38,61 +38,61 @@
initialSortColumn="name" initialSortDescending="true"> initialSortColumn="name" initialSortDescending="true">
<%-- Name column --%> <%-- Name column --%>
<a:column primary="true" width="200" style="padding:2px; text-align:left"> <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/> <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet> </f:facet>
<f:facet name="small-icon"> <f:facet name="small-icon">
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}"
showLink="false" styleClass="inlineAction" /> showLink="false" styleClass="inlineAction" />
</f:facet> </f:facet>
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" /> <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
<r:lockIcon value="#{r.nodeRef}" align="absmiddle" /> <r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
</a:column> </a:column>
<%-- Description column --%> <%-- Description column --%>
<a:column style="text-align:left"> <a:column id="col2" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.description}" value="description" styleClass="header"/> <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.description}" /> <h:outputText id="col2-txt" value="#{r.description}" />
</a:column> </a:column>
<%-- Path column --%> <%-- Path column --%>
<a:column style="text-align:left"> <a:column id="col3" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.path}" value="path" styleClass="header"/> <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
</f:facet> </f:facet>
<r:nodePath value="#{r.path}" /> <r:nodePath id="col3-path" value="#{r.path}" />
</a:column> </a:column>
<%-- Created Date column --%> <%-- Created Date column --%>
<a:column style="text-align:left"> <a:column id="col4" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.created}" value="created" styleClass="header"/> <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.created}"> <h:outputText id="col4-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Modified Date column --%> <%-- Modified Date column --%>
<a:column style="text-align:left"> <a:column id="col5" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/> <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText value="#{r.modified}"> <h:outputText id="col5-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
</a:richList> </a:richList>
</a:panel> </a:panel>
<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}" <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
<r:workflowSummary value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" /> <r:workflowSummary id="workflow-summary" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
</a:panel> </a:panel>