more tweaking in workflow

This commit is contained in:
Julie Lenaerts 2022-06-13 13:54:09 +02:00
parent ffbd0c3d4e
commit 427f461b61
4 changed files with 61 additions and 36 deletions

View File

@ -459,8 +459,19 @@ span.item-key {
/// Workflows /// Workflows
div.workflow { div.workflow {
section.step { section.step {
border: 1px solid $chill-l-gray; form {
padding: 1em 2em; 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 { div.flex-table {
margin: 1.5em -2em; margin: 1.5em -2em;
} }

View File

@ -6,6 +6,17 @@
* FLEX RESPONSIVE TABLE/BLOCK PRESENTATION * 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-bloc,
div.flex-table { div.flex-table {
display: flex; display: flex;
@ -14,8 +25,9 @@ div.flex-table {
box-sizing: border-box; box-sizing: border-box;
margin: 1.5em 0; margin: 1.5em 0;
.card-item { div.card-item {
border-radius: 10px !important; 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; 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%; width: 96%;
margin-left: auto; margin-left: auto;

View File

@ -9,7 +9,7 @@
{% set labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %} {% set labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %}
{% set label = labels is null ? step.currentStep : labels|localize_translatable_string %} {% set label = labels is null ? step.currentStep : labels|localize_translatable_string %}
<div class="card"> <div class="pop-item">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
@ -47,38 +47,40 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<i class="fa fa-angle-double-down" aria-hidden="true"></i>
<div class="pop-item">
<div id="transitionFilter">
{% if transition_form.transitionFilter is defined %}
{{ form_row(transition_form.transitionFilter) }}
{% endif %}
</div>
<div id="transitionFilter"> <div id="transitions">
{% if transition_form.transitionFilter is defined %} {{ form_row(transition_form.transition) }}
{{ form_row(transition_form.transitionFilter) }} </div>
{% if transition_form.freezeAfter is defined %}
{{ form_row(transition_form.freezeAfter) }}
{% endif %} {% endif %}
<div id="futureDests">
{{ form_row(transition_form.future_dest_users) }}
{{ form_row(transition_form.future_dest_emails) }}
</div>
<p>{{ form_label(transition_form.comment) }}</p>
{{ form_widget(transition_form.comment) }}
<ul class="record_actions">
<li>
<button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
</li>
</ul>
{{ form_end(transition_form) }}
</div> </div>
<div id="transitions">
{{ form_row(transition_form.transition) }}
</div>
{% if transition_form.freezeAfter is defined %}
{{ form_row(transition_form.freezeAfter) }}
{% endif %}
<div id="futureDests">
{{ form_row(transition_form.future_dest_users) }}
{{ form_row(transition_form.future_dest_emails) }}
</div>
<p>{{ form_label(transition_form.comment) }}</p>
{{ form_widget(transition_form.comment) }}
<ul class="record_actions">
<li>
<button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
</li>
</ul>
{{ form_end(transition_form) }}
{% else %} {% else %}
<div class="alert alert-chill-yellow"> <div class="alert alert-chill-yellow">

View File

@ -32,7 +32,7 @@
- src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
- src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig - src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
#} #}
<section class="step my-4"> <section class="step my-4 pop-item">
<div class="mb-3"> <div class="mb-3">
<h2>{{ handler.entityTitle(entity_workflow) }}</h2> <h2>{{ handler.entityTitle(entity_workflow) }}</h2>
@ -43,9 +43,9 @@
</section> </section>
<section class="step my-4">{% include '@ChillMain/Workflow/_decision.html.twig' %}</section> <section class="step my-4">{% include '@ChillMain/Workflow/_decision.html.twig' %}</section>
<section class="step my-4">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section> <section class="step my-4 pop-item">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
{#<section class="step my-4">{% include '@ChillMain/Workflow/_comment.html.twig' %}</section> #} {#<section class="step my-4">{% include '@ChillMain/Workflow/_comment.html.twig' %}</section> #}
<section class="step my-4">{% include '@ChillMain/Workflow/_history.html.twig' %}</section> <section class="step my-4 pop-item">{% include '@ChillMain/Workflow/_history.html.twig' %}</section>
{% if is_granted('CHILL_MAIN_WORKFLOW_DELETE', entity_workflow) %} {% if is_granted('CHILL_MAIN_WORKFLOW_DELETE', entity_workflow) %}
<ul class="record_actions"> <ul class="record_actions">
<li> <li>