Yet another merge from head to WCM-DEV2.

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

File diff suppressed because it is too large Load Diff

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>

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>

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>

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>
@@ -265,7 +280,7 @@
<!-- List of aspects to only show in the has aspect condition --> <!-- List of aspects to only show in the has aspect condition -->
<aspects-test> <aspects-test>
</aspects-test> </aspects-test>
<!-- The list of transformers to show in the transform actions --> <!-- The list of transformers to show in the transform actions -->
<transformers> <transformers>
<transformer name="application/vnd.oasis.opendocument.text"/> <transformer name="application/vnd.oasis.opendocument.text"/>
@@ -288,7 +303,7 @@
<transformer name="image/jpeg"/> <transformer name="image/jpeg"/>
<transformer name="image/png"/> <transformer name="image/png"/>
</image-transformers> </image-transformers>
<!-- The classes used to handle actions --> <!-- The classes used to handle actions -->
<action-handlers> <action-handlers>
<handler name="add-features" class="org.alfresco.web.bean.actions.handlers.AddFeaturesHandler" /> <handler name="add-features" class="org.alfresco.web.bean.actions.handlers.AddFeaturesHandler" />
@@ -306,7 +321,7 @@
<handler name="transform" class="org.alfresco.web.bean.actions.handlers.TransformHandler" /> <handler name="transform" class="org.alfresco.web.bean.actions.handlers.TransformHandler" />
<handler name="transform-image" class="org.alfresco.web.bean.actions.handlers.TransformImageHandler" /> <handler name="transform-image" class="org.alfresco.web.bean.actions.handlers.TransformImageHandler" />
</action-handlers> </action-handlers>
<!-- The classes used to handle conditions --> <!-- The classes used to handle conditions -->
<condition-handlers> <condition-handlers>
<handler name="compare-mime-type" class="org.alfresco.web.bean.rules.handlers.CompareMimeTypeHandler" /> <handler name="compare-mime-type" class="org.alfresco.web.bean.rules.handlers.CompareMimeTypeHandler" />
@@ -316,10 +331,10 @@
<handler name="is-subtype" class="org.alfresco.web.bean.rules.handlers.IsSubTypeHandler" /> <handler name="is-subtype" class="org.alfresco.web.bean.rules.handlers.IsSubTypeHandler" />
</condition-handlers> </condition-handlers>
</config> </config>
<!-- This config sections below hold all the icons choices --> <!-- This config sections below hold all the icons choices -->
<!-- displayed to users when creating various types of spaces --> <!-- displayed to users when creating various types of spaces -->
<!-- in the client. --> <!-- in the client. -->
<!-- NOTE: The conditions below are all string based and --> <!-- NOTE: The conditions below are all string based and -->
<!-- will therefore not be found when using Node based --> <!-- will therefore not be found when using Node based -->
@@ -341,13 +356,13 @@
<icon name="forums" path="/images/icons/forums.gif" /> <icon name="forums" path="/images/icons/forums.gif" />
</icons> </icons>
</config> </config>
<config evaluator="string-compare" condition="fm:forum icons"> <config evaluator="string-compare" condition="fm:forum icons">
<icons> <icons>
<icon name="forum" path="/images/icons/forum.gif" /> <icon name="forum" path="/images/icons/forum.gif" />
</icons> </icons>
</config> </config>
<config evaluator="string-compare" condition="fm:topic icons"> <config evaluator="string-compare" condition="fm:topic icons">
<icons> <icons>
<icon name="topic" path="/images/icons/topic.gif" /> <icon name="topic" path="/images/icons/topic.gif" />
@@ -355,5 +370,5 @@
<icon name="topic_question" path="/images/icons/topic_question.gif" /> <icon name="topic_question" path="/images/icons/topic_question.gif" />
</icons> </icons>
</config> </config>
</alfresco-config> </alfresco-config>

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);
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -53,14 +53,14 @@ import org.alfresco.web.app.servlet.FacesHelper;
*/ */
public class CreateContentWizard extends BaseContentWizard public class CreateContentWizard extends BaseContentWizard
{ {
protected String content = null; protected String content = null;
protected String templateTypeName; protected String templateTypeName;
protected List<SelectItem> createMimeTypes; protected List<SelectItem> createMimeTypes;
private static final Log LOGGER = private static final Log LOGGER =
LogFactory.getLog(CreateContentWizard.class); LogFactory.getLog(CreateContentWizard.class);
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Wizard implementation // Wizard implementation
@@ -69,7 +69,7 @@ public class CreateContentWizard extends BaseContentWizard
throws Exception throws Exception
{ {
LOGGER.debug("saving file content to " + this.fileName); LOGGER.debug("saving file content to " + this.fileName);
saveContent(null, this.content); saveContent(null, this.content);
if (this.templateTypeName != null) if (this.templateTypeName != null)
{ {
LOGGER.debug("generating template output for " + this.templateTypeName); LOGGER.debug("generating template output for " + this.templateTypeName);
@@ -87,9 +87,9 @@ public class CreateContentWizard extends BaseContentWizard
this.contentService, this.contentService,
this.nodeService); this.nodeService);
} }
// return the default outcome // return the default outcome
return outcome; return outcome;
} }
@Override @Override
@@ -162,7 +162,7 @@ public class CreateContentWizard extends BaseContentWizard
{ {
this.content = content; this.content = content;
} }
public List<SelectItem> getCreateTemplateTypes() public List<SelectItem> getCreateTemplateTypes()
{ {
Collection<TemplateType> ttl = TemplatingService.getInstance().getTemplateTypes(); Collection<TemplateType> ttl = TemplatingService.getInstance().getTemplateTypes();
@@ -225,7 +225,7 @@ public class CreateContentWizard extends BaseContentWizard
return this.createMimeTypes; return this.createMimeTypes;
} }
public String getTemplateTypeName() public String getTemplateTypeName()
{ {
return this.templateTypeName; return this.templateTypeName;

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,13 +151,22 @@ 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);
page.addColumn(defaultColumn);
pageConfig.addPage(page);
} }
dashlet = config.getDashletDefinition(DASHLET_TASKSDEFAULT);
if (dashlet != null)
{
defaultColumn.addDashlet(dashlet);
}
// add the column to the page and we are done
page.addColumn(defaultColumn);
pageConfig.addPage(page);
} }
} }

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.
* *

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;
@@ -162,34 +163,46 @@ public class ImagePickerRadioRenderer extends BaseRenderer
} }
else else
{ {
// get the child components try
for (Iterator i = imagePicker.getChildren().iterator(); i.hasNext(); /**/)
{ {
UIComponent child = (UIComponent)i.next(); // get the child components
if (child instanceof UIListItems) for (Iterator i = imagePicker.getChildren().iterator(); i.hasNext(); /**/)
{ {
// get the value of the list items component and iterate UIComponent child = (UIComponent)i.next();
// through it's collection if (child instanceof UIListItems)
Object listItems = ((UIListItems)child).getValue();
if (listItems instanceof Collection)
{ {
Iterator iter = ((Collection)listItems).iterator(); // get the value of the list items component and iterate
while (iter.hasNext()) // through it's collection
Object listItems = ((UIListItems)child).getValue();
if (listItems instanceof Collection)
{ {
UIListItem item = (UIListItem)iter.next(); Iterator iter = ((Collection)listItems).iterator();
if (item.isRendered()) while (iter.hasNext())
{ {
renderItem(context, out, imagePicker, item, onclick); UIListItem item = (UIListItem)iter.next();
if (item.isRendered())
{
renderItem(context, out, imagePicker, item, onclick);
}
} }
} }
} }
else if (child instanceof UIListItem && child.isRendered() == true)
{
// found a valid UIListItem child to render
UIListItem item = (UIListItem)child;
renderItem(context, out, imagePicker, item, onclick);
}
} }
else if (child instanceof UIListItem && child.isRendered() == true) }
{ catch (PropertyNotFoundException pnfe)
// found a valid UIListItem child to render {
UIListItem item = (UIListItem)child; // handle the scenario where the bean does not have the
renderItem(context, out, imagePicker, item, onclick); // 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"));
} }
} }

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>
@@ -2352,7 +2319,7 @@
<value>#{ContentService}</value> <value>#{ContentService}</value>
</managed-property> </managed-property>
</managed-bean> </managed-bean>
<managed-bean> <managed-bean>
<description> <description>
Bean that returns information on a node Bean that returns information on a node

File diff suppressed because it is too large Load Diff

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;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

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}"

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>

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>

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>

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" />

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>

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,97 +37,98 @@
</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}"
var="taskProps" columns="1" externalConfig="true" />
</a:panel>
<h:outputText id="padding" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
<a:richList id="resources-list" viewMode="details" value="#{WizardManager.bean.resources}" var="r"
binding="#{WizardManager.bean.packageItemsRichList}"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow"
altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
initialSortColumn="name" initialSortDescending="true">
<r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" <%-- Name column --%>
var="taskProps" columns="1" externalConfig="true" /> <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
</a:panel> <f:facet name="header">
<a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet>
<f:facet name="small-icon">
<a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new"
image="#{r.fileType16}" showLink="false" styleClass="inlineAction" />
</f:facet>
<a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
</a:column>
<%-- Description column --%>
<a:column id="col2" style="text-align:left">
<f:facet name="header">
<a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet>
<h:outputText id="col2-txt" value="#{r.description}" />
</a:column>
<%-- Path column --%>
<a:column id="col3" style="text-align:left">
<f:facet name="header">
<a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
</f:facet>
<r:nodePath id="col3-path" value="#{r.path}" />
</a:column>
<%-- Created Date column --%>
<a:column id="col4" style="text-align:left">
<f:facet name="header">
<a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
</f:facet>
<h:outputText id="col4-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Modified Date column --%>
<a:column id="col5" style="text-align:left">
<f:facet name="header">
<a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
</f:facet>
<h:outputText id="col5-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Actions column --%>
<a:column id="col6" actions="true" style="text-align:left">
<f:facet name="header">
<h:outputText id="col6-txt" value="#{msg.actions}"/>
</f:facet>
<r:actions id="col6-actions" value="#{WizardManager.bean.packageItemActionGroup}"
context="#{r}" showLink="false" styleClass="inlineAction" />
</a:column>
</a:richList>
<h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
<r:actions id="package-actions" context="#{WizardManager.bean.taskMetadataNode}"
value="#{WizardManager.bean.packageActionGroup}" />
</h:panelGrid>
<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:panelGrid id="add-item-control" columns="1" rendered="#{WizardManager.bean.itemBeingAdded}"
styleClass="selector" style="margin-top: 6px;">
<a:panel id="resources-panel" label="#{msg.resources}" <r:contentSelector id="content-picker" value="#{WizardManager.bean.itemsToAdd}" styleClass="" />
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"> <h:panelGrid columns="2">
<h:commandButton value="#{msg.add_to_list_button}" actionListener="#{WizardManager.bean.addPackageItems}" />
<a:richList id="resources-list" viewMode="details" value="#{WizardManager.bean.resources}" var="r" <h:commandButton value="#{msg.cancel}" actionListener="#{WizardManager.bean.cancelAddPackageItems}" />
binding="#{WizardManager.bean.packageItemsRichList}"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow"
altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
initialSortColumn="name" initialSortDescending="true">
<%-- Name column --%>
<a:column primary="true" width="200" style="padding:2px; text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet>
<f:facet name="small-icon">
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}"
showLink="false" styleClass="inlineAction" />
</f:facet>
<a:actionLink value="#{r.name}" href="#{r.url}" target="new" />
</a:column>
<%-- Description column --%>
<a:column style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
</f:facet>
<h:outputText value="#{r.description}" />
</a:column>
<%-- Path column --%>
<a:column style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
</f:facet>
<r:nodePath value="#{r.path}" />
</a:column>
<%-- Created Date column --%>
<a:column style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
</f:facet>
<h:outputText value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Modified Date column --%>
<a:column style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
</f:facet>
<h:outputText value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Actions column --%>
<a:column actions="true" style="text-align:left">
<f:facet name="header">
<h:outputText value="#{msg.actions}"/>
</f:facet>
<r:actions id="actions-col-actions" value="#{WizardManager.bean.packageItemActionGroup}"
context="#{r}" showLink="false" styleClass="inlineAction" />
</a:column>
</a:richList>
<h:panelGrid columns="1" styleClass="paddingRow">
<r:actions context="#{WizardManager.bean.taskMetadataNode}" value="#{WizardManager.bean.packageActionGroup}" />
</h:panelGrid> </h:panelGrid>
</h:panelGrid>
<h:panelGrid columns="1" rendered="#{WizardManager.bean.itemBeingAdded}" styleClass="selector" style="margin-top: 6px;">
<r:contentSelector value="#{WizardManager.bean.itemsToAdd}" styleClass="" /> </a:panel>
<h:panelGrid columns="2">
<h:commandButton value="#{msg.add_to_list_button}" actionListener="#{WizardManager.bean.addPackageItems}" />
<h:commandButton value="#{msg.cancel}" actionListener="#{WizardManager.bean.cancelAddPackageItems}" />
</h:panelGrid>
</h:panelGrid>
</a:panel>
</h:panelGroup>

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>

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>

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>