summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-03-09 08:09:29 (EST)
committer Manik Kishore2012-06-19 07:20:26 (EDT)
commit7516065159f20c0fcc5157ad2360a4f1c9f82c77 (patch)
tree8ec40d0a8ec99ca859382b530e015d848f22a37b
parentc9a9893504a406b4b327c576336a297942873702 (diff)
downloadorg.eclipse.stardust.ui.web-7516065159f20c0fcc5157ad2360a4f1c9f82c77.zip
org.eclipse.stardust.ui.web-7516065159f20c0fcc5157ad2360a4f1c9f82c77.tar.gz
org.eclipse.stardust.ui.web-7516065159f20c0fcc5157ad2360a4f1c9f82c77.tar.bz2
Jira-ID: CRNT-24111
1)Rearranged the icon positions in processTable, ActivityPanel, Proces Detail View, Case Details View *.xhtml. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54439 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml38
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml16
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml17
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml24
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml20
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml31
6 files changed, 68 insertions, 78 deletions
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
index be05506..0f52126 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
@@ -108,6 +108,16 @@
value="/plugins/processportal/images/icons/resubmission.gif"
title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.resubmit']}" />
</ice:commandLink>
+
+ <ice:commandLink
+ actionListener="#{activityDetailsBean.openDelegateDialog}"
+ disabled="#{!activityDetailsBean.delegable}">
+ <pc:automationTag value="auto-PP-ActivityPnl-ToolbarDelegate" standAlone="false"/>
+ <ice:graphicImage
+ value="/plugins/processportal/images/icons/delegate.png"
+ styleClass="toolbar-button #{!activityDetailsBean.delegable ? 'iceCmdBtn-dis' : ''}"
+ title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.delegate']}" />
+ </ice:commandLink>
<ice:commandLink actionListener="#{activityDetailsBean.abortAction}"
immediate="true" disabled="#{!activityDetailsBean.abortable}">
@@ -143,6 +153,15 @@
<div id="ippCaseAnchor" style="width: 1px; height: 1px;"></div>
</ice:panelGroup>
+ <ice:commandLink action="#{spawnProcessDialogBean.openPopup}" rendered="#{activityDetailsBean.enableSpawnProcess}" immediate="true" >
+ <ice:graphicImage
+ value="/plugins/views-common/images/icons/cog_add.png"
+ styleClass="toolbar-button #{activityDetailsBean.enableSpawnProcess ? '': 'iceCmdBtn-dis'}"
+ title="#{views_common_msgPropsBean['views.spawnProcessDialog.title']}" />
+ <f:param name="processInstanceOID"
+ value="#{activityDetailsBean.activityInstance.processInstanceOID}" />
+ </ice:commandLink>
+
<ice:commandLink action="#{ippPortalApp.openView}">
<pc:automationTag value="auto-PP-ActivityPnl-ToolbarProcDetails" standAlone="false"/>
<ice:graphicImage
@@ -155,25 +174,6 @@
value="processInstanceOID=#{activityDetailsBean.activityInstance.processInstanceOID}&amp;processInstanceName=#{activityDetailsBean.activityInstance.processInstance.processName}" />
</ice:commandLink>
- <ice:commandLink action="#{spawnProcessDialogBean.openPopup}" rendered="#{activityDetailsBean.enableSpawnProcess}" immediate="true" >
- <ice:graphicImage
- value="/plugins/views-common/images/icons/cog_add.png"
- styleClass="toolbar-button #{activityDetailsBean.enableSpawnProcess ? '': 'iceCmdBtn-dis'}"
- title="#{views_common_msgPropsBean['views.spawnProcessDialog.title']}" />
- <f:param name="processInstanceOID"
- value="#{activityDetailsBean.activityInstance.processInstanceOID}" />
- </ice:commandLink>
-
- <ice:commandLink
- actionListener="#{activityDetailsBean.openDelegateDialog}"
- disabled="#{!activityDetailsBean.delegable}">
- <pc:automationTag value="auto-PP-ActivityPnl-ToolbarDelegate" standAlone="false"/>
- <ice:graphicImage
- value="/plugins/processportal/images/icons/delegate.png"
- styleClass="toolbar-button #{!activityDetailsBean.delegable ? 'iceCmdBtn-dis' : ''}"
- title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.delegate']}" />
- </ice:commandLink>
-
<ice:panelGroup style="width:100%;">
<ui:include src="/plugins/views-common/dialogs/delegation.xhtml" />
<ui:include src="/plugins/views-common/dialogs/spawnProcessDialog.xhtml" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
index d6f6a44..501213e 100644
--- a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
@@ -35,6 +35,14 @@
value="/plugins/common/images/panelHeader-triggerCollapse.png" />
</ice:panelGroup>
+ <pc:automationTag value="auto-COM-PCERecover"/>
+ <ice:commandButton
+ image="/plugins/business-control-center/images/icons/recover_process.png"
+ action="#{processInstanceDetailsBean.recoverProcess}"
+ partialSubmit="true"
+ title="#{messages_bcc['common.tooltip.recover']}"
+ styleClass="toolbar-button" />
+
<!-- Case Menu -->
<ice:panelGroup
rendered="#{processInstanceDetailsBean.processInstanceOID==processInstanceDetailsBean.processInstance.rootProcessInstanceOID}">
@@ -55,14 +63,6 @@
value="#{processInstanceDetailsBean.processInstanceOID}" />
</ice:commandLink>
- <pc:automationTag value="auto-COM-PCERecover"/>
- <ice:commandButton
- image="/plugins/business-control-center/images/icons/recover_process.png"
- action="#{processInstanceDetailsBean.recoverProcess}"
- partialSubmit="true"
- title="#{messages_bcc['common.tooltip.recover']}"
- styleClass="toolbar-button" />
-
<ice:graphicImage value="/plugins/common/images/toolbar-separator.png"/>
<pc:automationTag value="auto-COM-PCEOpenCorrespondence"/>
diff --git a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml
index b7fb67a..f3704fe 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml
@@ -39,14 +39,6 @@
title="#{views_common_msgPropsBean['common.tooltip.recover']}"/>
</ice:commandLink>
- <ice:commandLink actionListener="#{bean.applyChanges}"
- disabled="#{!bean.priorityChanged}">
- <pc:automationTag value="auto-COM-ProcTbl-ToolbarSavePrio" standAlone="false"/>
- <ice:graphicImage
- url="/plugins/business-control-center/images/icons/save_flag.png"
- style="border:none;" styleClass="#{!bean.priorityChanged ? 'iceCmdBtn-dis' : ''}"
- title="#{views_common_msgPropsBean['common.tooltip.savePriorityChanges']}"/>
- </ice:commandLink>
<!-- Case Menu -->
<ice:panelGroup
rendered="#{!(bean.selectedItemCount eq 0 ? true : false)}">
@@ -61,6 +53,15 @@
<ice:graphicImage styleClass="iceCmdBtn-dis"
value="/plugins/views-common/images/icons/case-menu.png" />
</ice:panelGroup>
+
+ <ice:commandLink actionListener="#{bean.applyChanges}"
+ disabled="#{!bean.priorityChanged}">
+ <pc:automationTag value="auto-COM-ProcTbl-ToolbarSavePrio" standAlone="false"/>
+ <ice:graphicImage
+ url="/plugins/business-control-center/images/icons/save_flag.png"
+ style="border:none;" styleClass="#{!bean.priorityChanged ? 'iceCmdBtn-dis' : ''}"
+ title="#{views_common_msgPropsBean['common.tooltip.savePriorityChanges']}"/>
+ </ice:commandLink>
</ice:panelGrid>
</f:view> \ No newline at end of file
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml
index 031e1a6..2108c75 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml
@@ -63,18 +63,6 @@
</ice:commandLink>
<ice:commandLink
- actionListener="#{row.activityTreeTable.openAbortActivityDialog}"
- rendered="#{row.refersToActivity}"
- disabled="#{not (row.refersToActivity and row.abortActivity)}">
- <pc:automationTag value="auto-COM-ACTHistoryTable-ActionsAbort" standAlone="false"/>
- <h:graphicImage
- value="/plugins/common/images/icons/process-history/active/abort.png"
- title="#{common_msgPropsBean['common.activity.abort']}"
- styleClass="#{not (row.refersToActivity and row.abortActivity) ? 'iceCmdBtn-dis' : ''}" />
- <f:attribute name="row" value="#{row}" />
- </ice:commandLink>
-
- <ice:commandLink
actionListener="#{row.activityTreeTable.activityUIBuilder.openDelegateDialog}"
rendered="#{row.refersToActivity}"
disabled="#{not (row.refersToActivity and row.delegable)}">
@@ -86,6 +74,18 @@
<f:attribute name="row" value="#{row}" />
</ice:commandLink>
+ <ice:commandLink
+ actionListener="#{row.activityTreeTable.openAbortActivityDialog}"
+ rendered="#{row.refersToActivity}"
+ disabled="#{not (row.refersToActivity and row.abortActivity)}">
+ <pc:automationTag value="auto-COM-ACTHistoryTable-ActionsAbort" standAlone="false"/>
+ <h:graphicImage
+ value="/plugins/common/images/icons/process-history/active/abort.png"
+ title="#{common_msgPropsBean['common.activity.abort']}"
+ styleClass="#{not (row.refersToActivity and row.abortActivity) ? 'iceCmdBtn-dis' : ''}" />
+ <f:attribute name="row" value="#{row}" />
+ </ice:commandLink>
+
<ice:panelGroup rendered="#{row.refersToActivity and row.qualityAssuranceCodesBean.qualityAssuranceCodesVisible}"
style="text-align:right;">
<ice:menuBar displayOnClick="true"
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
index e511c39..e36970a 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
@@ -121,6 +121,16 @@
styleClass="#{row.enableRecover ? '' : 'iceCmdBtn-dis'}" />
<f:attribute name="processInstance" value="#{row.processInstance}" />
</ice:commandLink>
+ <ice:commandLink
+ actionListener="#{caseDetailsBean.detachFromCase}" rendered="#{processHistoryTable.enableCase and row.enableDetach}"
+ disabled="#{caseDetailsBean.inactiveCase}">
+ <pc:automationTag value="auto-COM-PCEHistoryTable-ActionsDetachCase" standAlone="false"/>
+ <ice:graphicImage
+ value="/plugins/views-common/images/icons/case-detach.png"
+ title="#{views_common_msgPropsBean['views.case.detachPI']}"
+ styleClass="#{!caseDetailsBean.inactiveCase? '' : 'iceCmdBtn-dis'}" />
+ <f:attribute name="processInstance" value="#{row.processInstance}" />
+ </ice:commandLink>
<ice:commandLink
actionListener="#{processHistoryTable.openSpawnProcess}"
rendered="#{processHistoryTable.enableSpawnProcess and !processHistoryTable.enableCase}"
@@ -169,16 +179,6 @@
title="#{messages_bcc['common.tooltip.notes']}" />
<f:attribute name="processInstance" value="#{row.processInstance}" />
</ice:commandLink>
- <ice:commandLink
- actionListener="#{caseDetailsBean.detachFromCase}" rendered="#{processHistoryTable.enableCase and row.enableDetach}"
- disabled="#{caseDetailsBean.inactiveCase}">
- <pc:automationTag value="auto-COM-PCEHistoryTable-ActionsDetachCase" standAlone="false"/>
- <ice:graphicImage
- value="/plugins/views-common/images/icons/case-detach.png"
- title="#{views_common_msgPropsBean['views.case.detachPI']}"
- styleClass="#{!caseDetailsBean.inactiveCase? '' : 'iceCmdBtn-dis'}" />
- <f:attribute name="processInstance" value="#{row.processInstance}" />
- </ice:commandLink>
</ice:panelGrid>
</ice:panelGroup>
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml
index 125d568..6ed9366 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml
@@ -9,40 +9,29 @@
<h:panelGroup
style="cell-padding: 0; cell-spacing: 0; white-space: nowrap; padding-bottom: 2px; padding-left: 5px;">
- <ice:commandLink actionListener="#{processHistoryTable.applyChanges}"
- style="vertical-align: middle;"
- disabled="#{!processHistoryTable.processTreeTable.priorityChanged}">
- <pc:automationTag value="auto-COM-PCEHistoryTable-ToolbarSave" standAlone="false"/>
- <ice:graphicImage
- url="/plugins/business-control-center/images/icons/save_flag.png"
- style="border:none;padding-right: 10px;padding-left: 5px;"
- styleClass="#{!processHistoryTable.processTreeTable.priorityChanged ? 'iceCmdBtn-dis' : ''}"
- title="#{views_common_msgPropsBean['processHistory.processTable.applyChanges']}" />
- </ice:commandLink>
-
<ice:commandLink actionListener="#{caseDetailsBean.detachFromCase}"
style="vertical-align: middle;" rendered="#{processHistoryTable.enableCase and caseDetailsBean.canManageCase }"
disabled="#{caseDetailsBean.inactiveCase}">
<pc:automationTag value="auto-COM-PCEHistoryTable-ToolbarDetachPI" standAlone="false"/>
<ice:graphicImage
url="/plugins/views-common/images/icons/case-detach.png"
- style="border:none;padding-right: 10px;"
+ style="border:none;padding-right: 5px;"
title="#{views_common_msgPropsBean['views.case.detachPI']}"
styleClass="#{!caseDetailsBean.inactiveCase? '' : 'iceCmdBtn-dis'}" />
<f:attribute name="processInstance" value="#{processHistoryTable.selectedRow.processInstance}" />
</ice:commandLink>
- <ice:commandLink actionListener="#{processHistoryTable.attachToCase}"
- style="vertical-align: middle;" rendered="#{processHistoryTable.enableCase and caseDetailsBean.canManageCase}"
- disabled="#{caseDetailsBean.inactiveCase}">
- <pc:automationTag value="auto-COM-PCEHistoryTable-ToolbarAttachPICase" standAlone="false"/>
+ <ice:commandLink actionListener="#{processHistoryTable.applyChanges}"
+ style="vertical-align: middle;"
+ disabled="#{!processHistoryTable.processTreeTable.priorityChanged}">
+ <pc:automationTag value="auto-COM-PCEHistoryTable-ToolbarSave" standAlone="false"/>
<ice:graphicImage
- url="/plugins/views-common/images/icons/case-attach.png"
- style="border:none;padding-right: 5px;"
- title="#{views_common_msgPropsBean['views.case.attachPI']}"
- styleClass="#{!caseDetailsBean.inactiveCase? '' : 'iceCmdBtn-dis'}" />
+ url="/plugins/business-control-center/images/icons/save_flag.png"
+ style="border:none;padding-right: 5px;padding-left: 5px;"
+ styleClass="#{!processHistoryTable.processTreeTable.priorityChanged ? 'iceCmdBtn-dis' : ''}"
+ title="#{views_common_msgPropsBean['processHistory.processTable.applyChanges']}" />
</ice:commandLink>
-
+
<span class="toolbarGroupRight" style="padding-left: 0px;" />
<ui:repeat