Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Person attibutes name and surname become firstname and lastname

Browse Source
This commit is contained in:
Marc Ducobu
2014-11-18 16:15:47 +01:00
parent 24b126c5c3
commit 4c2a3c3624
13 changed files with 120 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/views/Person/create.html.twig
View File

@@ -25,9 +25,9 @@
<h1>{{ 'views.Person.creation.open'|trans }}</h1>
{{ form_row(form.name, { 'label' : 'views.Person.view.name'|trans }) }}
{{ form_row(form.firstName, { 'label' : 'First name'|trans }) }}
{{ form_row(form.surname, { 'label' : 'views.Person.view.surname'|trans }) }}
{{ form_row(form.lastName, { 'label' : 'Last name'|trans }) }}
{{ form_row(form.dateOfBirth, { 'label' : 'views.Person.view.dateOfBirth'|trans }) }}

8
Resources/views/Person/create_review.html.twig
View File

@@ -65,11 +65,11 @@
<h2>{{ 'views.Person.review.you_will_create_this_person'|trans }}</h2>
<dl>
<dt>{{ 'views.Person.view.name'|trans }}</dt>
<dd>{{ name }}</dd>
<dt>{{ 'First name'|trans }}</dt>
<dd>{{ firstName }}</dd>
<dt>{{ 'views.Person.view.surname'|trans }}</dt>
<dd>{{ surname }}</dd>
<dt>{{ 'Last name'|trans }}</dt>
<dd>{{ lastName }}</dd>
<dt>{{ 'views.Person.view.dateOfBirth'|trans }}</dt>
<dd>{{ dateOfBirth|date(date_format)|default( 'person.without_date_of_birth'|trans ) }}</dd>

4
Resources/views/Person/edit.html.twig
View File

@@ -28,8 +28,8 @@
<fieldset>
<legend><h2>{{ 'views.Person.view.general'|trans }}</h2></legend>
{{ form_row(form.surname, {'label' : 'views.Person.view.surname'}) }}
{{ form_row(form.name, {'label' : 'views.Person.view.name'}) }}
{{ form_row(form.firstName, {'label' : 'First name'}) }}
{{ form_row(form.lastName, {'label' : 'Last name'}) }}
{{ form_row(form.genre, {'label' : 'views.Person.view.gender'}) }}
</fieldset>

5
Resources/views/Person/list.html.twig
View File

@@ -21,7 +21,7 @@
<table class="striped rounded">
<thead>
<tr>
<th>{% trans %}person.name{% endtrans %}</th>
<th>{% trans %}Name{% endtrans %}</th>
<th>{% trans %}person.dateOfBirth{% endtrans %}</th>
<th>{% trans %}person.nationality{% endtrans %}</th>
</tr>
@@ -31,8 +31,7 @@
<tr>
<td>
<a href="{{ path('chill_person_view', {person_id : person.getId}) }}">
<span class="personSurname">{{person.surname}}</span>
<span class="personName">{{person.name}}</span>
{{person.firstName}} {{person.lastName}}
{% spaceless %}
{% if person.isOpen == false %}
<i class="icon-lock"></i>

8
Resources/views/Person/view.html.twig
View File

@@ -42,11 +42,11 @@ This view should receive those arguments:
<h2>{{ 'views.Person.view.general'|trans }}</h2>
<dl>
<dt class="inline">{{ 'views.Person.view.surname'|trans }}</dt>
<dd>{{ person.surname }}</dd>
<dt class="inline">{{ 'First name'|trans }}</dt>
<dd>{{ person.firstName }}</dd>
<dt class="inline">{{ 'views.Person.view.name'|trans }}</dt>
<dd>{{ person.name }}</dd>
<dt class="inline">{{ 'Last name'|trans }}</dt>
<dd>{{ person.lastName }}</dd>
<dt class="inline">{{ 'views.Person.view.gender'|trans }}</dt>
<dd>{{ ( 'person.gender.' ~ person.genre|default('undefined'))|trans }}</dd>

3
Resources/views/layout.html.twig
View File

@@ -25,6 +25,7 @@
{% endblock %}
{% block layout_content %}
<div class="container">
<div id="person_wrapper">
<div id="general" class="parent">
@@ -35,7 +36,7 @@
{% else %}
<i class="fa fa-male"></i>
{% endif %}
{{ person.surname }} {{ person.name }} {% spaceless %}
{{ person.firstName }} {{ person.lastName }} {% spaceless %}
{% if not person.isOpen %}
<i class="fa fa-lock"></i>
{% endif %}