Merge branch 'upgrade-sf3' into add_email_and_phone_to_person

Resources/views/Person/create_review.html.twig

@@ -51,7 +51,7 @@
                                         {% endspaceless %}
                                     </a>
                                 </td>
-                                <td>{{ person.birthdate|localizeddate('long', 'none', app.request.locale) }}</td>
+                                <td>{% if person.birthdate is not null %}{{ person.birthdate|localizeddate('long', 'none', app.request.locale) }}{% else %}&nbsp;{% endif %}</td>
                                 <td>
                                     {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
                                 </td>

Resources/views/Person/list.html.twig

@@ -64,11 +64,13 @@
     </table>
             
             <ul class="record_actions">
+                {% if is_granted('CHILL_PERSON_CREATE') %}
                 <li>
                     <a href="{{ path('chill_person_new') }}" class="sc-button bt-create">
                         {{ 'Add a person'|trans }}
                     </a>
                 </li>
+                {% endif %}
                 <li>
                     <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
                         <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}

Resources/views/Widget/homepage_add_a_person.html.twig

@@ -1,3 +1,4 @@
+{% if is_granted('CHILL_PERSON_CREATE') %}
 <div class="grid-8 centered" style="text-align:center; margin-top: 1.5em;">
     <a href="{{ path('chill_person_new') }}">
         <div class="sc-button blue" style="float: inherit;">
@@ -5,4 +6,4 @@
         </div>
     </a>
 </div>
-            
+{% endif %}

Resources/views/layout.html.twig

@@ -45,7 +45,9 @@
                 <i class="fa  fa-{% spaceless %}
                     {% if person.gender == "woman" %}
                        female
-                    {%  else %}
+                    {%  elseif person.gender == "both" %}
+                        neuter
+                    {% else %}
                         male
                     {% endif %}
                 {% endspaceless %}"></i>
@@ -105,7 +107,7 @@
 {% block vertical_menu_content %}
     {{ chill_menu('person', {
         'layout': 'ChillPersonBundle::menu.html.twig',
-        'args' : {'person_id': person.id },
+        'args' : {'person_id': person.id, 'person': person },
         'activeRouteKey': activeRouteKey
     }) }}
     

Resources/views/menu.html.twig

@@ -15,13 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 <ul class="tab-nav">
-    {% for route in routes %}
-        <li class="{% spaceless  %}
-                    {% if route.key == activeRouteKey %}
-                        active
-                    {% endif %}
-               {% endspaceless %} ">
-            <a href="{{ path(route.key, args ) }}" >{{ route.label|trans|upper }}</a>
+    {% for menu in menus %}
+        <li class="">
+            <a href="{{ menu.uri }}" >{{ menu.label|upper }}</a>
         </li>
     {% endfor %}
 </ul>