From 427f461b61d2a6032d707614a15d44e344f774bb Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Mon, 13 Jun 2022 13:54:09 +0200 Subject: [PATCH] more tweaking in workflow --- .../Resources/public/chill/chillmain.scss | 15 ++++- .../public/chill/scss/flex_table.scss | 14 ++++- .../views/Workflow/_decision.html.twig | 62 ++++++++++--------- .../Resources/views/Workflow/index.html.twig | 6 +- 4 files changed, 61 insertions(+), 36 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index f8bd42442..a98c5c391 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -459,8 +459,19 @@ span.item-key { /// Workflows div.workflow { section.step { - border: 1px solid $chill-l-gray; - padding: 1em 2em; + form { + display: flex; + flex-direction: column; + align-items: center; + } + i.fa-angle-double-down { + font-size: 3rem; + color: rgba(0, 0, 0, 0.568); + margin-bottom: 1rem; + margin-top: 1rem; + } + // border: 1px solid $chill-l-gray; + // padding: 1em 2em; div.flex-table { margin: 1.5em -2em; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index 156c2cfdb..ebed5c08d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -6,6 +6,17 @@ * FLEX RESPONSIVE TABLE/BLOCK PRESENTATION */ +.pop-item { + border-radius: 10px !important; + box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px; + // border: .3px solid; + // width: 96%; + padding:2rem; + margin-left: auto; + margin-right: auto; + width: 97%; +} + div.flex-bloc, div.flex-table { display: flex; @@ -14,8 +25,9 @@ div.flex-table { box-sizing: border-box; margin: 1.5em 0; - .card-item { + div.card-item { border-radius: 10px !important; + // box-shadow: rgba(50, 50, 93, 0.25) 0px 2px 5px -1px, rgba(0, 0, 0, 0.3) 0px 1px 3px -1px !important; box-shadow: rgba(0,0,0,.4) 3px 2px 4px, rgba(0,0,0,.3) 0px 7px 13px -3px, rgba(0,0,0,.2) 0px -3px 6px inset !important; width: 96%; margin-left: auto; diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig index bb0411371..8b492843d 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig @@ -9,7 +9,7 @@ {% set labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %} {% set label = labels is null ? step.currentStep : labels|localize_translatable_string %} -
+
@@ -47,38 +47,40 @@ {% endif %}
+ +
+
+ {% if transition_form.transitionFilter is defined %} + {{ form_row(transition_form.transitionFilter) }} + {% endif %} +
-
- {% if transition_form.transitionFilter is defined %} - {{ form_row(transition_form.transitionFilter) }} +
+ {{ form_row(transition_form.transition) }} +
+ + {% if transition_form.freezeAfter is defined %} + {{ form_row(transition_form.freezeAfter) }} {% endif %} + +
+ {{ form_row(transition_form.future_dest_users) }} + + {{ form_row(transition_form.future_dest_emails) }} +
+ +

{{ form_label(transition_form.comment) }}

+ + {{ form_widget(transition_form.comment) }} + +
    +
  • + +
  • +
+ + {{ form_end(transition_form) }}
- -
- {{ form_row(transition_form.transition) }} -
- - {% if transition_form.freezeAfter is defined %} - {{ form_row(transition_form.freezeAfter) }} - {% endif %} - -
- {{ form_row(transition_form.future_dest_users) }} - - {{ form_row(transition_form.future_dest_emails) }} -
- -

{{ form_label(transition_form.comment) }}

- - {{ form_widget(transition_form.comment) }} - -
    -
  • - -
  • -
- - {{ form_end(transition_form) }} {% else %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig index 28d95e258..a438f20a9 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig @@ -32,7 +32,7 @@ - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig - src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig #} -
+

{{ handler.entityTitle(entity_workflow) }}

@@ -43,9 +43,9 @@
{% include '@ChillMain/Workflow/_decision.html.twig' %}
-
{% include '@ChillMain/Workflow/_follow.html.twig' %}
+
{% include '@ChillMain/Workflow/_follow.html.twig' %}
{#
{% include '@ChillMain/Workflow/_comment.html.twig' %}
#} -
{% include '@ChillMain/Workflow/_history.html.twig' %}
+
{% include '@ChillMain/Workflow/_history.html.twig' %}
{% if is_granted('CHILL_MAIN_WORKFLOW_DELETE', entity_workflow) %}