search page, content position

This commit is contained in:
Mathieu Jaumotte 2021-07-20 16:22:16 +02:00
parent ea734e2a9e
commit afd4ac27ea
7 changed files with 62 additions and 46 deletions

View File

@ -18,29 +18,31 @@
{% block title title|trans %} {% block title title|trans %}
{% block content %}
<div style="margin-right: 2em; margin-left: 2em;">
<h1>{{ title|trans }}</h1>
{{ form_start(form) }}
{% for f in form %}
{% if f.vars.name != 'submit' %}
{{ form_row(f) }}
{% endif %}
{% endfor %}
<ul class="record_actions"> {% block content %}
<li> <div class="search-list my-5">
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }} <div class="row justify-content-center">
</li> <div class="col-md-10 col-xxl">
</ul>
<h1>{{ title|trans }}</h1>
{{ form_end(form) }}
{{ form_start(form) }}
{% for f in form %}
{% if f.vars.name != 'submit' %}
{{ form_row(f) }}
{% endif %}
{% endfor %}
<ul class="record_actions">
<li>
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }}
</li>
</ul>
{{ form_end(form) }}
</div>
</div> </div>
</div>
{% endblock %} {% endblock %}

View File

@ -19,7 +19,13 @@
{% set _search_pattern = pattern %} {% set _search_pattern = pattern %}
{% block content %} {% block content %}
<div class="search-list my-5">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<p class="col-8 centered error">{{ message }}</p> <p class="error">{{ message }}</p>
</div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -21,13 +21,15 @@
{% block title %}{{ 'Search %pattern%'|trans({ '%pattern%' : pattern }) }}{% endblock title %} {% block title %}{{ 'Search %pattern%'|trans({ '%pattern%' : pattern }) }}{% endblock title %}
{% block content %} {% block content %}
<div class="search-list my-5">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<div class="col-12 parent" >
<div class="col-10 push-1 parent">
{% for result in results %} {% for result in results %}
{{ result|raw }} {{ result|raw }}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,13 +1,13 @@
<template> <template>
<banner></banner> <banner></banner>
<sticky-nav></sticky-nav> <sticky-nav></sticky-nav>
<div class="row justify-content-end"> <div class="row justify-content-end">
<div class="col-md-11"> <div class="col-md-11 col-xxl">
<h1 v-if="accompanyingCourse.step === 'DRAFT'">{{ $t('course.title.draft') }}</h1> <h1 v-if="accompanyingCourse.step === 'DRAFT'">{{ $t('course.title.draft') }}</h1>
<h1 v-else>{{ $t('course.title.active') }}</h1> <h1 v-else>{{ $t('course.title.active') }}</h1>
<persons-associated></persons-associated> <persons-associated></persons-associated>
<origin-demand></origin-demand> <origin-demand></origin-demand>
<requestor></requestor> <requestor></requestor>
@ -16,7 +16,7 @@
<resources></resources> <resources></resources>
<comment v-if="accompanyingCourse.step === 'DRAFT'"></comment> <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
<confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm> <confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm>
</div> </div>
</div> </div>
</template> </template>
@ -36,11 +36,11 @@ import Confirm from './components/Confirm.vue';
export default { export default {
name: 'App', name: 'App',
components: { components: {
Banner, Banner,
StickyNav, StickyNav,
OriginDemand, OriginDemand,
PersonsAssociated, PersonsAssociated,
Requestor, Requestor,
SocialIssue, SocialIssue,
Referrer, Referrer,
@ -78,12 +78,12 @@ export default {
} }
padding: 0em 0em; padding: 0em 0em;
margin: 1em 0; margin: 1em 0;
border: 1px dotted #718596ab; border: 1px dotted #718596ab;
border-radius: 5px; border-radius: 5px;
border-left: 1px dotted #718596ab; border-left: 1px dotted #718596ab;
border-right: 1px dotted #718596ab; border-right: 1px dotted #718596ab;
dd { dd {
margin-left: 1em; margin-left: 1em;
} }
& > div { & > div {
margin: 1em 3em 0; margin: 1em 3em 0;
@ -91,6 +91,6 @@ export default {
table { table {
} }
} }
} }
</style> </style>

View File

@ -7,6 +7,9 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="accompanyingcourse-index">
<div class="row justify-content-center">
<div class="col-md-10 col-xxl">
{% if 'DRAFT' == accompanyingCourse.step %} {% if 'DRAFT' == accompanyingCourse.step %}
<div class="col-8 centered error flash_message"> <div class="col-8 centered error flash_message">
@ -62,6 +65,7 @@
{% endif %} {% endif %}
<h2>{{ 'Associated peoples'|trans }}</h2> <h2>{{ 'Associated peoples'|trans }}</h2>
<div class="flex-table"> <div class="flex-table">
{% for p in accompanyingCourse.participations %} {% for p in accompanyingCourse.participations %}
{% if p.enddate is null %} {% if p.enddate is null %}
@ -334,7 +338,7 @@
<div class="actions"> <div class="actions">
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a <a
class="btn btn-edit" class="btn btn-edit"
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a> href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a>
</li> </li>
@ -342,11 +346,10 @@
</div> </div>
</div> </div>
{% 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> </div>
{% block contentActivity %} {% block contentActivity %}
{% set person = null %} {% set person = null %}
{% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse', 'context': 'accompanyingCourse'} %} {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse', 'context': 'accompanyingCourse'} %}
@ -354,6 +357,10 @@
{# ==> insert accompanyingCourse vue component #} {# ==> insert accompanyingCourse vue component #}
<div id="accompanying-course"></div> <div id="accompanying-course"></div>
</div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -79,9 +79,8 @@
</ul> </ul>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-chill-blue" /> <a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-show"
<i class="fa fa-folder-open-o"></i> {{ 'Open person file'|trans }} title="{{ 'Open person file'|trans }}" /></a>
</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 }) }}" class="btn btn-chill-green" title="{{ 'See accompanying periods'|trans }}"/>

View File

@ -135,7 +135,7 @@ Reset: 'Remise à zéro'
'Person search results': 'Recherche de personnes' 'Person search results': 'Recherche de personnes'
Person search results by phonenumber: Recherche de personnes par numéro de téléphone Person search results by phonenumber: Recherche de personnes par numéro de téléphone
'Search within persons': 'Recherche parmi les personnes' 'Search within persons': 'Recherche parmi les personnes'
Open person file: Ouvrir Open person file: Ouvrir le dossier de la personne
and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number% autres' and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number% autres'
'%total% persons matching the search pattern:': '{0} Aucune personne ne correspond aux termes de recherche : | {1} Une personne a été trouvée par la recherche : | ]1,Inf] %total% personnes correspondent aux termes de recherche :' '%total% persons matching the search pattern:': '{0} Aucune personne ne correspond aux termes de recherche : | {1} Une personne a été trouvée par la recherche : | ]1,Inf] %total% personnes correspondent aux termes de recherche :'
'Last opening since %last_opening%': 'Dernière ouverture le %last_opening%.' 'Last opening since %last_opening%': 'Dernière ouverture le %last_opening%.'