Switch to new form naming

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

diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
index f551bc999803b9856511796e9e3ca8a92f61199e..8f37879788e20c3d83b747c7c9bcdc009ae4a973 100644 (file)
--- a/Resources/views/body.html.twig
+++ b/Resources/views/body.html.twig
@@ -4,29 +4,45 @@
 {% 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" />

-       <link rel="shortcut icon" type="image/x-icon" href="{{ asset(site_ico) }}" />
-       <link ref="icon" type="image/svg+xml" href="{{ asset(site_svg) }}" />
-       {% for size, icon in site_png %}
-               {# Apple #}
-               {% if size in [152, 167, 180] %}
-                       {% if size == 180 %}
-                               <link rel="apple-touch-icon" href="{{ asset(icon) }}" />
+       {% 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 site is defined and site %}
+               <link rel="shortcut icon" type="image/x-icon" href="{{ asset(site.ico) }}" />
+               <link rel="icon" type="image/svg+xml" href="{{ asset(site.svg) }}" />
+               {% for size, icon in site.png %}
+                       {# Apple #}
+                       {% if size in [120, 152, 167, 180] %}
+                               {% if size == 180 %}
+                                       <link rel="apple-touch-icon" href="{{ asset(icon) }}" />
+                               {% endif %}
+                               <link rel="apple-touch-icon" sizes="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
+                       {# Windows #}
+                       {% elseif size in [70, 150, 310] %}
+                               <meta name="msapplication-square{{ size }}x{{ size }}logo" content="{{ asset(icon) }}" />
+                       {# Others #}
+                       {% else %}
+                               <link rel="icon" type="image/png" sizes="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />

                        {% endif %}
                        {% endif %}

-                       <link rel="apple-touch-icon" sizes="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
-               {# Windows #}
-               {% elseif size in [70, 150, 310] %}
-                       <meta name="msapplication-square{{ size }}x{{ size }}logo" content="{{ asset(icon) }}" />
-               {# Others #}
-               {% else %}
-                       <link rel="icon" type="image/png" size="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
-               {% endif %}
-       {% endfor %}
+               {% endfor %}
+       {% endif %}

        {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}
        {% stopwatch 'stylesheet' %}
                {% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,screen}.css' %}
                        <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
                {% endstylesheet %}
        {% endstopwatch %}
        {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}
        {% stopwatch 'stylesheet' %}
                {% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,screen}.css' %}
                        <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
                {% endstylesheet %}
        {% endstopwatch %}

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

 {% endblock %}
 {% block javascripts %}
        {% stopwatch 'javascript' %}
 {% endblock %}
 {% block javascripts %}
        {% stopwatch 'javascript' %}


@@ -39,20 +55,25 @@
 {% block body %}
        {% block header %}
                <header id="header">
 {% block body %}
        {% block header %}
                <header id="header">

-                       {% block header_title %}<h1><a href="{{ site_url }}"><img src="{{ asset(site_logo) }}" alt="{{ site_title }}" /></a></h1>{% endblock %}
+                       {% if site is defined and site %}
+                               {% block header_title %}<h1><a href="{{ site.url }}" title="{{ site.title }}"><img src="{{ asset(site.logo) }}" alt="{{ site.title }}" width="171" height="32" /></a></h1>{% endblock %}
+                       {% endif %}

                        {% block header_nav %}
                                <nav>
                                        <h2>{% trans %}Navigation{% endtrans %}</h2>
                        {% block header_nav %}
                                <nav>
                                        <h2>{% trans %}Navigation{% endtrans %}</h2>

-                                       <a href="{{ path('rapsys_air_location') }}">{% trans %}Locations{% endtrans %}</a>
-                                       <a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
-                                       <a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>
-                                       <a href="{{ path('rapsys_air_regulation') }}">{% trans %}Regulation{% endtrans %}</a>
-                                       {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
-                                               <a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
-                                       {% else %}
-                                               <a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a>
-                                               <a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a>
-                                       {% endif %}
+                                       <ul>
+                                               <li><a href="{{ path('rapsys_air') }}">{% trans %}Home{% endtrans %}</a></li>
+                                               <li><a href="{{ path('rapsys_air_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>
+                                               <li><a href="{{ path('rapsys_air_organizer_regulation') }}">{% trans %}Organizer regulation{% endtrans %}</a></li>
+                                               {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
+                                                       <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_register') }}">{% trans %}Register{% endtrans %}</a></li>
+                                               {% endif %}
+                                       </ul>

                                </nav>
                        {% endblock %}
 {#
                                </nav>
                        {% endblock %}
 {#


@@ -73,7 +94,7 @@
                {# pass an array argument to get the messages of those types (['warning', 'error']) #}
                {% for label, messages in app.flashes %}
                        {% if messages %}
                {# pass an array argument to get the messages of those types (['warning', 'error']) #}
                {% for label, messages in app.flashes %}
                        {% if messages %}

-                               <div class="flash {{label}}">
+                               <div class="message {{label}}">

                                        <ul>
                                                {% for message in messages %}
                                                        <li>{{ message }}</li>
                                        <ul>
                                                {% for message in messages %}
                                                        <li>{{ message }}</li>


@@ -94,9 +115,25 @@
        {% endblock %}
        {% block footer %}
                <footer id="footer">
        {% endblock %}
        {% block footer %}
                <footer id="footer">

-                       <span>&nbsp;</span>
-                       <details><summary>{{ copy_long }}</summary><span>{{ copy_short }}</span></details>
-                       <span>&nbsp;</span>
+                       {% if copy is defined and copy %}
+                               <a href="{{ copy.link }}" title="{{ copy.title }}" rel="author">{{ copy.by }}</a>
+                               <details><summary>{{ copy.long }}</summary><span>{{ copy.short }}</span></details>
+                       {% endif %}
+                       <a href="{{ path('rapsys_air_terms_of_service') }}">{% trans %}Terms of service{% endtrans %}</a>
+                       {% if alternates is defined and alternates %}
+                               {% if alternates|length > 1 %}
+                                       <ul>
+                                               {% for alternate in alternates %}
+                                                       <li><a href="{{ alternate.relative }}" hreflang="{{ alternate.lang }}" title="{{ alternate.title }}">{{ alternate.translated }}</a></li>
+                                               {% endfor %}
+                                       </ul>
+                               {% else %}
+                                       {% set alternate = alternates|first %}
+                                       <a href="{{ alternate.relative }}" hreflang="{{ alternate.lang }}" title="{{ alternate.title }}">{{ alternate.translated }}</a>
+                               {% endif %}
+                       {% else %}
+                               <span>&nbsp;</span>
+                       {% endif %}

                </footer>
        {% endblock %}
 {% endblock %}
                </footer>
        {% endblock %}
 {% endblock %}