activity, content position

This commit is contained in:
Mathieu Jaumotte 2021-07-14 15:51:07 +02:00
parent 4fc3d813c4
commit 030e71d276
9 changed files with 69 additions and 24 deletions

View File

@ -1,8 +1,5 @@
<h1>{{ "Update activity"|trans ~ ' :' }} <h1>{{ "Update activity"|trans }}</h1>
<span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;"> <h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
{{ entity.type.name|localize_translatable_string }}
</span>
</h1>
{{ form_start(edit_form) }} {{ form_start(edit_form) }}
{{ form_errors(edit_form) }} {{ form_errors(edit_form) }}

View File

@ -5,8 +5,16 @@
{% block title 'Update activity'|trans %} {% block title 'Update activity'|trans %}
{% block content %} {% block content %}
<div id="activity"></div> {# <=== vue component #} <div class="activity-edit">
{% include 'ChillActivityBundle:Activity:edit.html.twig' %} <div class="row justify-content-center">
<div class="col-md-10">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}

View File

@ -21,8 +21,16 @@
{% block title 'Update activity'|trans %} {% block title 'Update activity'|trans %}
{% block personcontent %} {% block personcontent %}
<div id="activity"></div> {# <=== vue component #} <div class="activity-edit">
{% include 'ChillActivityBundle:Activity:edit.html.twig' %} <div class="row justify-content-center">
<div class="col-md-10">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}

View File

@ -1,8 +1,5 @@
<h1>{{ "Activity creation"|trans ~ ' :' }} <h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
<span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;"> <h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
{{ entity.type.name|localize_translatable_string }}
</span>
</h1>
{{ form_start(form) }} {{ form_start(form) }}
{{ form_errors(form) }} {{ form_errors(form) }}

View File

@ -5,8 +5,16 @@
{% block title 'Activity creation' |trans %} {% block title 'Activity creation' |trans %}
{% block content %} {% block content %}
<div id="activity"></div> {# <=== vue component #} <div class="activity-new">
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %} <div class="row justify-content-center">
<div class="col-md-10">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}

View File

@ -5,8 +5,16 @@
{% block title 'Activity creation' |trans %} {% block title 'Activity creation' |trans %}
{% block personcontent %} {% block personcontent %}
<div id="activity"></div> {# <=== vue component #} <div class="activity-new">
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %} <div class="row justify-content-center">
<div class="col-md-10">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}

View File

@ -109,25 +109,28 @@
{% set accompanying_course_id = accompanyingCourse.id %} {% set accompanying_course_id = accompanyingCourse.id %}
{% endif %} {% endif %}
<ul class="record_actions"> <ul class="record_actions sticky-form-buttons">
<li class="cancel"> <li class="cancel">
<a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}"> <a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
{{ 'Back to the list'|trans }} {{ 'Back to the list'|trans }}
</a> </a>
</li> </li>
<li> <li>
<a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"> <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
{{ 'Edit'|trans }} {{ 'Edit'|trans }}
</a> </a>
</li> </li>
{# TODO {# TODO
{% if is_granted('CHILL_ACTIVITY_DELETE', entity) %} {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
#} #}
<li> <li>
<a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete"> <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
{{ 'Delete'|trans }} {{ 'Delete'|trans }}
</a> </a>
</li> </li>
{# {#
{% endif %} {% endif %}
#} #}

View File

@ -7,5 +7,13 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block content -%} {% block content -%}
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %} <div class="activity-show">
<div class="row justify-content-center">
<div class="col-md-10">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
</div>
</div>
{% endblock content %} {% endblock content %}

View File

@ -7,5 +7,13 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block personcontent -%} {% block personcontent -%}
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %} <div class="activity-show">
<div class="row justify-content-center">
<div class="col-md-10">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
</div>
</div>
</div>
{% endblock personcontent %} {% endblock personcontent %}