Add snippet feature

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

diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
index 452f70cbe0747b7eca80ae0331acf83b187f3b1e..aba7827d3c99adb62ece4bbb25c4c90ab8272224 100644 (file)
--- a/Resources/views/body.html.twig
+++ b/Resources/views/body.html.twig
@@ -5,7 +5,7 @@
 {% block stylesheets %}
        <meta name="viewport" content="width=device-width, initial-scale=1" />
        <link rel="shortcut icon" type="image/x-icon" href="{{ asset(site_ico) }}" />
 {% 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) }}" />
+       <link rel="icon" type="image/svg+xml" href="{{ asset(site_svg) }}" />

        {% for size, icon in site_png %}
                {# Apple #}
                {% if size in [152, 167, 180] %}
        {% for size, icon in site_png %}
                {# Apple #}
                {% if size in [152, 167, 180] %}


@@ -18,31 +18,35 @@
                        <meta name="msapplication-square{{ size }}x{{ size }}logo" content="{{ asset(icon) }}" />
                {# Others #}
                {% else %}
                        <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) }}" />
+                       <link rel="icon" type="image/png" sizes="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />

                {% endif %}
        {% endfor %}
        {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}
                {% endif %}
        {% endfor %}
        {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}

-       {% stylesheet '@rapsys_air_bundle/css/{reset,irishgrover,labelleaurore,screen}.css' %}
-               <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
-       {% endstylesheet %}
+       {% stopwatch 'stylesheet' %}
+               {% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,screen}.css' %}
+                       <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
+               {% endstylesheet %}
+       {% endstopwatch %}

 {% endblock %}
 {% block javascripts %}
 {% endblock %}
 {% block javascripts %}

-       {#{% javascript '@RapsysAir/js/*.js' %}
-               <script type="text/javascript" src="{{ asset_url }}"></script>
-       {% endjavascript %}#}
+       {% stopwatch 'javascript' %}
+               {#{% javascript '@RapsysAir/js/*.js' %}
+                       <script type="text/javascript" src="{{ asset_url }}"></script>
+               {% endjavascript %}#}
+       {% endstopwatch %}

 {% endblock %}
 {% block title %}{{ title }}{% endblock %}
 {% block body %}
        {% block header %}
                <header id="header">
 {% endblock %}
 {% block title %}{{ title }}{% endblock %}
 {% 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 %}
+                       {% 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 %}

                        {% 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_session') }}">{% trans %}Sessions{% 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_user') }}">{% trans %}Users{% endtrans %}</a>
                                        <a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>

-                                       <a href="{{ path('rapsys_air_policy') }}">{% trans %}Policy{% 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 %}
                                        {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
                                                <a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
                                        {% else %}


@@ -69,7 +73,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>