Merge pull request #3767 from effective-webwork/select-workflow-dialog

Improve layout of 'addWorkflow' dialog
kitodo · Jun 17, 2020 · 6961876 · 6961876
2 parents 90a6256 + ba039a0
commit 6961876
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/Kitodo/src/main/resources/messages/messages_de.properties b/Kitodo/src/main/resources/messages/messages_de.properties
@@ -837,6 +837,7 @@ selectPlugin=Bitte w\u00E4hlen Sie ein Plugin aus.
 selectProcess=Vorgang ausw\u00E4hlen
 selectProject=Bitte Projekt ausw\u00E4hlen
 selectTemplate=Bitte Produktionsvorlage ausw\u00E4hlen
+selectWorkflow=Bitte Workflow ausw\u00E4hlen
 sendSolutionMessageNextTask=Meldung \u00FCber Probleml\u00F6sung an nachfolgende Station senden
 sendSolutionMessage=Meldung \u00FCber Probleml\u00F6sung senden
 sendSolutionMessageForAll=Meldung \u00FCber Probleml\u00F6sung f\u00FCr alle Schritte senden

diff --git a/Kitodo/src/main/resources/messages/messages_en.properties b/Kitodo/src/main/resources/messages/messages_en.properties
@@ -852,6 +852,7 @@ selectPlugin=Please select a Plugin.
 selectProcess=Select process
 selectProject=Please select a project
 selectTemplate=Please select a template
+selectWorkflow=Please select a workflow
 sendSolutionMessageNextTask=Send message about problem solution to following task
 sendSolutionMessage=Send message about problem solution
 sendSolutionMessageForAll=send troubleshooting message to all steps

diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/confirmWorkflowPopup.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/confirmWorkflowPopup.xhtml
@@ -12,55 +12,62 @@
 <ui:composition
         xmlns="http://www.w3.org/1999/xhtml"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
+        xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-        xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core">
-        <!-- edit dialog -->
+        xmlns:p="http://primefaces.org/ui">
         <p:dialog id="confirmWorkflowPopup"
                   widgetVar="confirmWorkflowPopup"
-                  header="#{msgs.workflowExisting}"
-                  width="400px"
                   modal="true"
+                  resizable="false"
                   dynamic="true">
             <h:form id="confirmWorkflowForm">
                 <p:panelGrid columns="1" layout="grid">
                     <p:row>
+                        <h3>#{msgs.selectWorkflow}</h3>
+                        <h:panelGroup layout="block"
+                                      style="overflow-y: hidden;"
+                                      styleClass="dialogFieldWrapper">
+                            <div>
+                                <p:selectOneMenu id="allWorkflows"
+                                                 rendered="#{not empty MigrationForm.allWorkflows}"
+                                                 value="#{MigrationForm.workflowToUse}"
+                                                 converter="#{workflowConverter}">
+                                    <f:selectItems value="#{MigrationForm.allWorkflows}" var="workflow" itemLabel="#{workflow.title}" itemValue="#{workflow}"/>
+                                </p:selectOneMenu>
 
-                        <div>
-                            <p:panel rendered="#{not empty MigrationForm.allWorkflows}">
-                            <p:selectOneMenu id="allWorkflows" value="#{MigrationForm.workflowToUse}"
-                                             converter="#{workflowConverter}">
-                                <f:selectItems value="#{MigrationForm.allWorkflows}" var="workflow" itemLabel="#{workflow.title}" itemValue="#{workflow}"/>
-                            </p:selectOneMenu>
+                                <h:outputText rendered="#{empty MigrationForm.allWorkflows}" value="#{msgs.noExistingWorkflow}"/>
+                            </div>
+
+                        </h:panelGroup>
+
+                        <h:panelGroup layout="block"
+                                      style="padding-left: var(--default-double-size);"
+                                      styleClass="dialogButtonWrapper">
                             <p:commandButton id="useExistingWorkflow"
+                                             rendered="#{not empty MigrationForm.allWorkflows}"
                                              value="#{msgs.useExistingWorkflow}"
                                              action="#{MigrationForm.useExistingWorkflow()}"
                                              icon="fa fa-floppy-o fa-lg"
                                              iconPos="right"
-                                             styleClass="button-filled-blue"
+                                             styleClass="primary right"
                                              oncomplete="PF('confirmWorkflowPopup').hide();">
                             </p:commandButton>
-                            </p:panel>
-                            <h:outputText rendered="#{empty MigrationForm.allWorkflows}" value="#{msgs.noExistingWorkflow}"/>
-                        </div>
-                        <div>
                             <p:commandButton id="createNewWorkflow"
                                              value="#{msgs.createNewWorkflow}"
                                              action="#{MigrationForm.createNewWorkflow()}"
                                              icon="fa fa-floppy-o fa-lg"
                                              iconPos="right"
-                                             styleClass="button-filled-blue"
+                                             styleClass="#{empty MigrationForm.allWorkflows ? 'primary' : 'secondary'} right"
                                              oncomplete="PF('confirmWorkflowPopup').hide();">
                             </p:commandButton>
-                        </div>
-                        <div>
                             <p:commandButton value="#{msgs.cancel}"
                                              immediate="true"
                                              icon="fa fa-times fa-lg"
                                              iconPos="right"
                                              styleClass="secondary right"
                                              onclick="PF('confirmWorkflowPopup').hide();">
                             </p:commandButton>
-                        </div>
+                        </h:panelGroup>
                     </p:row>
                 </p:panelGrid>
             </h:form>