Cleanup

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

diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig
index 9dc95439c443661f5152fa03b3ffa8fcb360459d..77819c9036784d208c4c489f0c793d01f0ed2b55 100644 (file)
--- a/Resources/views/base.html.twig
+++ b/Resources/views/base.html.twig
@@ -32,7 +32,7 @@
                        {% 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' %}
                        {% 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,lemon,notoemoji,screen}.css' %}
+                               {% stylesheet '@RapsysAir/css/{reset,droidsans,lemon,notoemoji,screen}.css' %}

                                        <link rel="stylesheet" type="text/css" href="{{ asset_url }}?20221024100144" />
                                {% endstylesheet %}
                        {% endstopwatch %}
                                        <link rel="stylesheet" type="text/css" href="{{ asset_url }}?20221024100144" />
                                {% endstylesheet %}
                        {% endstopwatch %}


@@ -70,21 +70,21 @@
                                        {% block header_nav %}
                                                <nav id="nav">
                                                        {#<h2>{% trans %}Navigation{% endtrans %}</h2>#}
                                        {% block header_nav %}
                                                <nav id="nav">
                                                        {#<h2>{% trans %}Navigation{% endtrans %}</h2>#}

-                                                       <a href="{{ path('rapsys_air') }}" rel="home">{% trans %}Home{% endtrans %}</a>
-                                                       <a href="{{ path('rapsys_air_contact') }}" rel="contact">{% trans %}Contact{% endtrans %}</a>
-                                                       <a href="{{ path('rapsys_air_frequently_asked_questions') }}">{% trans %}Frequently asked questions{% endtrans %}</a>
+                                                       <a href="{{ path('rapsysair') }}" rel="home">{% trans %}Home{% endtrans %}</a>
+                                                       <a href="{{ path('rapsysair_contact') }}" rel="contact">{% trans %}Contact{% endtrans %}</a>
+                                                       <a href="{{ path('rapsysair_frequently_asked_questions') }}">{% trans %}Frequently asked questions{% endtrans %}</a>

                                                        {% if is_granted('ROLE_ADMIN') %}
                                                        {% if is_granted('ROLE_ADMIN') %}

-                                                               <a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
+                                                               <a href="{{ path('rapsysair_user') }}">{% trans %}Users{% endtrans %}</a>

                                                        {% endif %}
                                                        {% if is_granted('ROLE_GUEST') %}
                                                        {% endif %}
                                                        {% if is_granted('ROLE_GUEST') %}

-                                                               <a href="{{ path('rapsys_air_organizer_regulation') }}">{% trans %}Organizer regulation{% endtrans %}</a>
+                                                               <a href="{{ path('rapsysair_organizer_regulation') }}">{% trans %}Organizer regulation{% endtrans %}</a>

                                                        {% endif %}
                                                        {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
                                                        {% endif %}
                                                        {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}

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

                                                        {% else %}
                                                        {% else %}

-                                                               <a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a>
-                                                               <a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a>
+                                                               <a href="{{ path('rapsysuser_login') }}">{% trans %}Login{% endtrans %}</a>
+                                                               <a href="{{ path('rapsysuser_register') }}">{% trans %}Register{% endtrans %}</a>

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


@@ -128,11 +128,11 @@
                        {% endblock %}
                        {% block footer %}
                                <footer id="footer">
                        {% endblock %}
                        {% block footer %}
                                <footer id="footer">

-                                       <a href="{{ path('rapsys_air_about') }}">{% trans %}About{% endtrans %}</a>
+                                       <a href="{{ path('rapsysair_about') }}">{% trans %}About{% endtrans %}</a>

                                        {% if copy is defined and copy %}
                                                <details><summary>{{ copy.long }}</summary><span>{{ copy.short }} <a href="{{ copy.link }}" title="{{ copy.title }}" rel="author">{{ copy.by }}</a></span></details>
                                        {% endif %}
                                        {% if copy is defined and copy %}
                                                <details><summary>{{ copy.long }}</summary><span>{{ copy.short }} <a href="{{ copy.link }}" title="{{ copy.title }}" rel="author">{{ copy.by }}</a></span></details>
                                        {% endif %}

-                                       <a href="{{ path('rapsys_air_terms_of_service') }}">{% trans %}Terms of service{% endtrans %}</a>
+                                       <a href="{{ path('rapsysair_terms_of_service') }}">{% trans %}Terms of service{% endtrans %}</a>

                                        {% if alternates is defined and alternates %}
                                                {% set langs = alternates|keys|filter(v => v|length == 5) %}
                                                {% if langs|length > 1 %}
                                        {% if alternates is defined and alternates %}
                                                {% set langs = alternates|keys|filter(v => v|length == 5) %}
                                                {% if langs|length > 1 %}