Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix the layout of the forms

Browse Source 
The layout is now consistent with the view page
This commit is contained in:
Julien Fastré 2016-03-09 14:42:42 +01:00
parent 77b7333fea
commit 3acea7967c
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/views/Activity/edit.html.twig
View File

@ -31,10 +31,11 @@
<h2>{{ 'Activity data'|trans }}</h2> <h2>{{ 'Activity data'|trans }}</h2>
{{ form_row(edit_form.date) }} {{ form_row(edit_form.date) }}
{{ form_row(edit_form.durationTime) }} {{ form_row(edit_form.durationTime) }}
{{ form_row(edit_form.type) }}
{{ form_row(edit_form.remark) }} {{ form_row(edit_form.remark) }}
{{ form_row(edit_form.attendee) }} {{ form_row(edit_form.attendee) }}
{{ form_row(edit_form.reasons) }} {{ form_row(edit_form.reasons) }}
{{ form_row(edit_form.type) }}
{{ form_widget(edit_form) }} {{ form_widget(edit_form) }}
<div class="grid-12 centered sticky-form-buttons"> <div class="grid-12 centered sticky-form-buttons">

13
Resources/views/Activity/new.html.twig
View File

@ -25,7 +25,18 @@
{{ form_start(form) }} {{ form_start(form) }}
{{ form_widget(form) }} {{ form_row(form.user) }}
{{ form_row(form.scope) }}
<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
{{ form_row(form.date) }}
{{ form_row(form.durationTime) }}
{{ form_row(form.type) }}
{{ form_row(form.remark) }}
{{ form_row(form.attendee) }}
{{ form_row(form.reasons) }}
<div class="grid-12 centered sticky-form-buttons"> <div class="grid-12 centered sticky-form-buttons">
<button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button> <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
</div> </div>

9
Resources/views/Activity/show.html.twig
View File

@ -23,6 +23,8 @@
<dd>{{ entity.date|localizeddate('long', 'none') }}</dd> <dd>{{ entity.date|localizeddate('long', 'none') }}</dd>
<dt class="inline">{{ 'Duration Time'|trans }}</dt> <dt class="inline">{{ 'Duration Time'|trans }}</dt>
<dd>{{ entity.durationTime|date('H:i') }}</dd> <dd>{{ entity.durationTime|date('H:i') }}</dd>
<dt class="inline">{{ 'Type'|trans }}</dt>
<dd>{{ entity.type.name | localize_translatable_string }}</dd>
<dt class="inline">{{ 'Remark'|trans }}</dt> <dt class="inline">{{ 'Remark'|trans }}</dt>
<dd>{% if entity.remark is empty %}{{ 'No remarks'|trans }}{% else %}<blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>{% endif %}</dd> <dd>{% if entity.remark is empty %}{{ 'No remarks'|trans }}{% else %}<blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>{% endif %}</dd>
@ -36,13 +38,6 @@
<dd>{% for r in entity.reasons %}{{ m.reason(r) }} {% endfor %}</dd> <dd>{% for r in entity.reasons %}{{ m.reason(r) }} {% endfor %}</dd>
{%- endif -%} {%- endif -%}
<dt class="inline">{{ 'Type'|trans }}</dt>
<dd>{{ entity.type.name | localize_translatable_string }}</dd>
<dt class="inline">{{ ''|trans }}</dt>
<dd></dd>
<dt class="inline">{{ ''|trans }}</dt>
<dd></dd>
</dl> </dl>
<a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}"> <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">