adding content classes + divers

This commit is contained in:
Mathieu Jaumotte 2021-07-22 13:19:25 +02:00
parent c6a3f59d87
commit d81f5bafe3
12 changed files with 69 additions and 41 deletions

View File

@ -1,5 +1,4 @@
div.accompanying_course_work-list {
#accompanying_course_work_list {
.item { .item {
margin-bottom: 1.5rem; margin-bottom: 1.5rem;

View File

@ -15,13 +15,6 @@ div.list-household-members {
font-weight: 700; font-weight: 700;
} }
div.person {
ul.record_actions {
li {
margin-right: 0 !important;
}
}
}
div.comment { div.comment {
// for the comment for household-members // for the comment for household-members
} }

View File

@ -56,9 +56,6 @@ export default {
<style lang="scss"> <style lang="scss">
div#accompanying-course { div#accompanying-course {
h1 {
margin: 1.5em 0;
}
div.vue-component { div.vue-component {
h2 { h2 {
margin: 1em 0.7em; margin: 1em 0.7em;

View File

@ -7,7 +7,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="accompanyingcourse-index"> <div class="accompanying_course-index">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10 col-xxl"> <div class="col-md-10 col-xxl">
@ -29,7 +29,7 @@
</div> </div>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button class="btn btn-primary" data-bs-toggle="collapse" href="#withoutHouseholdList"> <button class="btn btn-create" data-bs-toggle="collapse" href="#withoutHouseholdList">
{{ 'Add to household now'|trans }} {{ 'Add to household now'|trans }}
</button> </button>
</li> </li>

View File

@ -4,10 +4,17 @@
{% block content %} {% block content %}
<h1>{{ block('title') }}</h1> <div class="accompanying_course_work-create">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<div id="accompanying_course_work_create"></div> <h1>{{ block('title') }}</h1>
<div id="accompanying_course_work_create"></div>
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}

View File

@ -4,10 +4,17 @@
{% block content %} {% block content %}
<h1>{{ block('title') }}</h1> <div class="accompanying_course_work-edit">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<div id="accompanying_course_work_edit"></div> <h1>{{ block('title') }}</h1>
<div id="accompanying_course_work_edit"></div>
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}

View File

@ -4,9 +4,13 @@
{% block content %} {% block content %}
<div class="accompanying_course_work-list">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<h1>{{ block('title') }}</h1> <h1>{{ block('title') }}</h1>
<div id="accompanying_course_work_list">
{% for w in works %} {% for w in works %}
<div class="item"> <div class="item">
<div class="title"> <div class="title">
@ -104,7 +108,7 @@
{% else %} {% else %}
<p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p> <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
{% endfor %} {% endfor %}
</div>
<ul class="record_actions sticky-form-buttons"> <ul class="record_actions sticky-form-buttons">
<li> <li>
@ -115,6 +119,7 @@
</li> </li>
</ul> </ul>
</div></div></div>
{% endblock %} {% endblock %}

View File

@ -103,7 +103,11 @@
<ul class="record_actions"> <ul class="record_actions">
{# TODO if enable_accompanying_course_with_multiple_persons is true ... #} {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
<li> <li>
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="btn btn-show"></a> <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
class="btn btn-primary" title="{{ 'See accompanying period'|trans }}">
<i class="fa fa-random"></i>
{{ 'See this period'|trans }}
</a>
</li> </li>
{# {#
<li> <li>

View File

@ -3,23 +3,30 @@
{% block title 'Household accompanying period'|trans %} {% block title 'Household accompanying period'|trans %}
{% block content %} {% block content %}
<h1>{{ block('title') }}</h1> <div class="household-members">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %} <h1>{{ block('title') }}</h1>
<div class="form_control"> {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
<ul class="record_actions">
<li class="cancel"> <div class="form_control">
<a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel"> <ul class="record_actions">
{{ 'Household summary'|trans }} <li class="cancel">
</a> <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
</li> {{ 'Household summary'|trans }}
{#<li> </a>
<a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create"> </li>
{{ 'Create an accompanying period'|trans }} {#<li>
</a> <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
</li>#} {{ 'Create an accompanying period'|trans }}
</ul> </a>
</li>#}
</ul>
</div>
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}

View File

@ -3,6 +3,10 @@
{% block title 'Addresses history for household'|trans %} {% block title 'Addresses history for household'|trans %}
{% block content %} {% block content %}
<div class="household-address">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<h1>{{ block('title') }}</h1> <h1>{{ block('title') }}</h1>
<div class="address-timeline grid"> <div class="address-timeline grid">
@ -66,4 +70,7 @@
</li> </li>
</ul> </ul>
</div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -80,11 +80,12 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-show" <a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-show"
title="{{ 'Open person file'|trans }}" /></a> title="{{ 'Open person file'|trans }}"></a>
</li> </li>
<li> <li>
<a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}" class="btn btn-chill-green" title="{{ 'See accompanying periods'|trans }}"/> <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}"
<i class="fa fa-random"></i></a> class="btn btn-primary" title="{{ 'See accompanying periods'|trans }}">
<i class="fa fa-random"></i></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -107,7 +108,7 @@
<div class="header"> <div class="header">
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}" <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}"
class="btn btn-chill-green" title="{{ 'See accompanying period'|trans }}"> class="btn btn-chill-green" title="{{ 'See accompanying period'|trans }}">
<i class="fa fa-fw fa-random"></i> <i class="fa fa-random"></i>
</a> </a>
<span>{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}</span> <span>{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}</span>
{% if app.accompanyingPeriod.user is not null %} {% if app.accompanyingPeriod.user is not null %}

View File

@ -192,6 +192,7 @@ Last events on accompanying course: Dernières actions de suivi
Edit & activate accompanying course: Modifier et valider Edit & activate accompanying course: Modifier et valider
See accompanying periods: Voir les périodes d'accompagnement See accompanying periods: Voir les périodes d'accompagnement
See accompanying period: Voir cette période d'accompagnement See accompanying period: Voir cette période d'accompagnement
See this period: Voir cette période
Referrer: Référent Referrer: Référent
Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible. Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
Add to household now: Ajouter à un ménage Add to household now: Ajouter à un ménage