Reuse current request uri

[airbundle] / Resources / views / body.html.twig

diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
index 6fea7b45bb70e6525d80228528457f14f3b8e142..d2c822401575fb7567e0fa748403c15557ad6490 100644 (file)
--- a/Resources/views/body.html.twig
+++ b/Resources/views/body.html.twig
@@ -4,8 +4,8 @@
 {% endblock %}
 {% block stylesheets %}
        <meta name="viewport" content="width=device-width, initial-scale=1" />
 {% endblock %}
 {% block stylesheets %}
        <meta name="viewport" content="width=device-width, initial-scale=1" />

-       {% if page.description is defined and page.description %}
-               <meta name="description" content="{{ page.description }}" />
+       {% if description is defined and description %}
+               <meta name="description" content="{{ description }}" />

        {% endif %}
        {% if keywords is defined and keywords %}
                <meta name="keywords" content="{{ keywords|join(', ') }}" />
        {% endif %}
        {% if keywords is defined and keywords %}
                <meta name="keywords" content="{{ keywords|join(', ') }}" />


@@ -36,24 +36,21 @@
                {% endstylesheet %}
        {% endstopwatch %}
        {% if canonical is defined and canonical %}
                {% endstylesheet %}
        {% endstopwatch %}
        {% if canonical is defined and canonical %}

-               <link rel="canonical" href="{{ canonical }}"{% if app.request.locale is defined and app.request.locale %} hreflang="{{ app.request.locale }}"{% endif %} />
+               <link rel="canonical" href="{{ canonical }}"{% if locale is defined and locale %} hreflang="{{ locale }}"{% endif %} />

        {% endif %}
        {% if alternates is defined and alternates %}
                {% for lang, alternate in alternates %}
                        <link rel="alternate" href="{{ alternate.absolute }}" hreflang="{{ lang }}" />
                {% endfor %}
        {% endif %}
        {% endif %}
        {% if alternates is defined and alternates %}
                {% for lang, alternate in alternates %}
                        <link rel="alternate" href="{{ alternate.absolute }}" hreflang="{{ lang }}" />
                {% endfor %}
        {% endif %}

-       {% if ogps is defined and ogps %}
-               {% for property, content in ogps %}
-                       <meta property="og:{{ property }}" content="{{ content }}" />
-               {% endfor %}
-               {% for property, contents in facebooks %}
+       {% if facebook['metas'] is defined and facebook['metas'] %}
+               {% for property, contents in facebook['metas'] %}

                        {% if contents is iterable %}
                                {% for content in contents %}
                        {% if contents is iterable %}
                                {% for content in contents %}

-                                       <meta property="fb:{{ property }}" content="{{ content }}" />
+                                       <meta property="{{ property }}" content="{{ content }}" />

                                {% endfor %}
                        {% else %}
                                {% endfor %}
                        {% else %}

-                               <meta property="fb:{{ property }}" content="{{ contents }}" />
+                               <meta property="{{ property }}" content="{{ contents }}" />

                        {% endif %}
                {% endfor %}
        {% endif %}
                        {% endif %}
                {% endfor %}
        {% endif %}


@@ -65,7 +62,7 @@
                {% endjavascript %}#}
        {% endstopwatch %}
 {% endblock %}
                {% endjavascript %}#}
        {% endstopwatch %}
 {% endblock %}

-{% block title %}{{ [site.title, page.section, page.title]|filter(v => v)|join(' - ') }}{% endblock %}
+{% block title %}{{ [site.title, section, title]|filter(v => v)|join(' - ') }}{% endblock %}

 {% block body %}
        {% block header %}
                <header id="header">
 {% block body %}
        {% block header %}
                <header id="header">


@@ -79,12 +76,14 @@
                                                <li><a href="{{ path('rapsys_air') }}" rel="home">{% trans %}Home{% endtrans %}</a></li>
                                                <li><a href="{{ path('rapsys_air_contact') }}" rel="contact">{% trans %}Contact{% endtrans %}</a></li>
                                                <li><a href="{{ path('rapsys_air_frequently_asked_questions') }}">{% trans %}Frequently asked questions{% endtrans %}</a></li>
                                                <li><a href="{{ path('rapsys_air') }}" rel="home">{% trans %}Home{% endtrans %}</a></li>
                                                <li><a href="{{ path('rapsys_air_contact') }}" rel="contact">{% trans %}Contact{% endtrans %}</a></li>
                                                <li><a href="{{ path('rapsys_air_frequently_asked_questions') }}">{% trans %}Frequently asked questions{% endtrans %}</a></li>

-                                               <li><a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a></li>
+                                               {% if is_granted('ROLE_ADMIN') %}
+                                                       <li><a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a></li>
+                                               {% endif %}

                                                {% if is_granted('ROLE_GUEST') %}
                                                        <li><a href="{{ path('rapsys_air_organizer_regulation') }}">{% trans %}Organizer regulation{% endtrans %}</a></li>
                                                {% endif %}
                                                {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
                                                {% if is_granted('ROLE_GUEST') %}
                                                        <li><a href="{{ path('rapsys_air_organizer_regulation') }}">{% trans %}Organizer regulation{% endtrans %}</a></li>
                                                {% endif %}
                                                {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}

-                                                       <li><a href="{{ path('rapsys_air_user_view', {id: app.user.id}) }}">{% trans %}My account{% endtrans %}</a></li>
+                                                       <li><a href="{{ path('rapsys_user_edit', {mail: app.user.mail|short, hash: app.user.mail|short|hash}) }}">{% trans %}My account{% endtrans %}</a></li>

                                                        <li><a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a></li>
                                                {% else %}
                                                        <li><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></li>
                                                        <li><a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a></li>
                                                {% else %}
                                                        <li><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></li>


@@ -142,12 +141,12 @@
                                {% if langs|length > 1 %}
                                        <ul>
                                                {% for lang in langs %}
                                {% if langs|length > 1 %}
                                        <ul>
                                                {% for lang in langs %}

-                                                       <li><a href="{{ alternates[lang].relative }}" hreflang="{{ lang }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a></li>
+                                                       <li><a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a></li>

                                                {% endfor %}
                                        </ul>
                                {% else %}
                                        {% set lang = langs|first %}
                                                {% endfor %}
                                        </ul>
                                {% else %}
                                        {% set lang = langs|first %}

-                                       <a href="{{ alternates[lang].relative }}" hreflang="{{ lang }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a>
+                                       <a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a>

                                {% endif %}
                        {% else %}
                                <span>&nbsp;</span>
                                {% endif %}
                        {% else %}
                                <span>&nbsp;</span>