]> Raphaël G. Git Repositories - airbundle/commitdiff
Shorten air bundle route aliases
authorRaphaël Gertz <git@rapsys.eu>
Thu, 7 Mar 2024 20:56:56 +0000 (21:56 +0100)
committerRaphaël Gertz <git@rapsys.eu>
Thu, 7 Mar 2024 20:56:56 +0000 (21:56 +0100)
18 files changed:
Resources/views/admin/index.html.twig
Resources/views/base.html.twig
Resources/views/calendar/callback.html.twig
Resources/views/calendar/index.html.twig
Resources/views/default/_city.html.twig
Resources/views/default/about.html.twig
Resources/views/default/organizer_regulation.html.twig
Resources/views/default/regulation.html.twig
Resources/views/error.html.twig
Resources/views/form/_login.html.twig
Resources/views/form/_register.html.twig
Resources/views/form/login.html.twig
Resources/views/form/recover.html.twig
Resources/views/form/recover_mail.html.twig
Resources/views/form/register.html.twig
Resources/views/security/denied.html.twig
Resources/views/session/edit.html.twig
Resources/views/session/view.html.twig

index 687e21729e98a3554c4a07cf5fb2fa5766e11b6a..46b6c9b2b0e158b3219f6fe1b8def42945563204 100644 (file)
@@ -14,7 +14,7 @@
                                                                        <ul>
                                                                                {% for session in day.sessions %}
                                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                        <ul>
                                                                                {% for session in day.sessions %}
                                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
-                                                                                               <a href="{{ path('rapsys_air_session', {'id': session.id}) }}" title="{{ session.title }}">{{ session.title }}</a>
+                                                                                               <a href="{{ path('rapsysair_session', {'id': session.id}) }}" title="{{ session.title }}">{{ session.title }}</a>
                                                                                        </li>
                                                                                {% endfor %}
                                                                        </ul>
                                                                                        </li>
                                                                                {% endfor %}
                                                                        </ul>
index 9dc95439c443661f5152fa03b3ffa8fcb360459d..77819c9036784d208c4c489f0c793d01f0ed2b55 100644 (file)
@@ -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 %}
                                        {% 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 %}
                        {% 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 %}
index 70d5ff12cc9d86eed16fc85b470fab8c363d0f9b..42db49f1cf8491e741f29ebc9836a1e17e48943c 100644 (file)
@@ -2,7 +2,7 @@
 {% block content %}
        <section id="form">
                <header>
 {% block content %}
        <section id="form">
                <header>
-                       <h2><a href="{{ path('rapsys_air_calendar') }}">{{ section }}</a></h2>
+                       <h2><a href="{{ path('rapsysair_calendar') }}">{{ section }}</a></h2>
                        <p>{{ description }}</p>
                </header>
                {% if error is defined %}
                        <p>{{ description }}</p>
                </header>
                {% if error is defined %}
index d83236e2ea0d9ce2049d2a7b2ab663abc26227cd..ea7e36d4a6e9edefa3c7197f011b4442925fa3d5 100644 (file)
@@ -2,7 +2,7 @@
 {% block content %}
        <section id="form">
                <header>
 {% block content %}
        <section id="form">
                <header>
-                       <h2><a href="{{ path('rapsys_air_calendar') }}">{{ section }}</a></h2>
+                       <h2><a href="{{ path('rapsysair_calendar') }}">{{ section }}</a></h2>
                        <p>{{ description }}</p>
                </header>
                {{ form_start(form) }}
                        <p>{{ description }}</p>
                </header>
                {{ form_start(form) }}
index f3735902d6ca1ff414c4c48f0627deddfc660883..5119a509651129a2229106fe337dd54e5dc19418 100644 (file)
@@ -2,7 +2,7 @@
 {% if cities is defined and cities %}
        <article>
                <header>
 {% if cities is defined and cities %}
        <article>
                <header>
-                       <h2><a href="{{ path('rapsys_air_city') }}" title="{% trans %}Libre Air cities{% endtrans %}">{% trans %}Cities{% endtrans %}</a></h2>
+                       <h2><a href="{{ path('rapsysair_city') }}" title="{% trans %}Libre Air cities{% endtrans %}">{% trans %}Cities{% endtrans %}</a></h2>
                        <p>{% trans %}Libre Air city list{% endtrans%}
                </header>
                <div class="panel">
                        <p>{% trans %}Libre Air city list{% endtrans%}
                </header>
                <div class="panel">
index b075486b480335ea51c7ac5e85ed7149aaea4bf7..9510a7a8a32a0860d28e9fb6200e61542c7623ac 100644 (file)
@@ -55,7 +55,7 @@
                                <h3 id="technicalsupport">{% trans %}Technical support{% endtrans %}</h3>
                        </header>
                        <p>{{ 'The development and hosting services are graciously provided by: %title%'|trans({'%title%': '<a href="' ~ copy.link ~ '" title="' ~ copy.title ~ '">' ~ copy.by ~ '</a>'})|raw }}</p>
                                <h3 id="technicalsupport">{% trans %}Technical support{% endtrans %}</h3>
                        </header>
                        <p>{{ 'The development and hosting services are graciously provided by: %title%'|trans({'%title%': '<a href="' ~ copy.link ~ '" title="' ~ copy.title ~ '">' ~ copy.by ~ '</a>'})|raw }}</p>
-                       <p>{{ 'In case of bug or glitch you may contact us throught the contact form: %title%'|trans({'%title%': '<a href="' ~ path('rapsys_air_contact') ~ '" title="' ~ 'Contact Libre Air'|trans ~ '">' ~ 'Contact'|trans ~ '</a>'})|raw }}</p>
+                       <p>{{ 'In case of bug or glitch you may contact us throught the contact form: %title%'|trans({'%title%': '<a href="' ~ path('rapsysair_contact') ~ '" title="' ~ 'Contact Libre Air'|trans ~ '">' ~ 'Contact'|trans ~ '</a>'})|raw }}</p>
                </section>
        </article>
 {% endblock %}
                </section>
        </article>
 {% endblock %}
index 3106e1fcb9475ba56c37cb68326cf54388eee4b6..ac6c315f6da7154b78f9c35a308d367c28e04bd4 100644 (file)
@@ -2,7 +2,7 @@
 {% block content %}
        <article>
                <header>
 {% block content %}
        <article>
                <header>
-                       <h2><a href="{{ path('rapsys_air_organizer_regulation') }}">{{ title.page }}</a></h2>
+                       <h2><a href="{{ path('rapsysair_organizer_regulation') }}">{{ title.page }}</a></h2>
                        <p>{{ description }}</p>
                </header>
                <nav>
                        <p>{{ description }}</p>
                </header>
                <nav>
index 37e206d4f94000b9acee5d4d33aeafc790446513..90047c338cb7f5e92afb050b0e97bd2656d48f0b 100644 (file)
@@ -1,7 +1,7 @@
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
        <section id="regulation">
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
        <section id="regulation">
-               <h2><a href="{{ path('rapsys_air_regulation') }}">{{ section }}</a></h2>
+               <h2><a href="{{ path('rapsysair_regulation') }}">{{ section }}</a></h2>
                {#XXX: use https://www.londonschool.com/level-scale/#}
                <section>
                        <h3>{% trans %}Guest{% endtrans %}</h3>
                {#XXX: use https://www.londonschool.com/level-scale/#}
                <section>
                        <h3>{% trans %}Guest{% endtrans %}</h3>
index 64b1231c03fe3c5f6dd62e83e857c0fb38ba908b..16a81371fadff9dc89b62b7de13c6ee082545971 100644 (file)
@@ -1,7 +1,7 @@
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 <section id="dashboard">
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 <section id="dashboard">
-       <h2><a href="{{ path('rapsys_air') }}">{{ section }}</a></h2>
+       <h2><a href="{{ path('rapsysair') }}">{{ section }}</a></h2>
        <p class="message error">{% if message %}{{ message }}{% else %}{% trans %}Error{% endtrans %}{% endif %}</p>
        {# {% if app.environment == 'dev' and trace is defined %}<pre class="trace">{{ trace }}</pre>{% endif %} #}
        {% if trace is defined and trace %}<pre class="trace">{{ trace }}</pre>{% endif %}
        <p class="message error">{% if message %}{{ message }}{% else %}{% trans %}Error{% endtrans %}{% endif %}</p>
        {# {% if app.environment == 'dev' and trace is defined %}<pre class="trace">{{ trace }}</pre>{% endif %} #}
        {% if trace is defined and trace %}<pre class="trace">{{ trace }}</pre>{% endif %}
index c62cb8d770a8ba9b7873ad514fec47b674ea21f3..9fb8fada8cf65c784c2aa290604f3efd8739fd20 100644 (file)
@@ -1,5 +1,5 @@
 <section>
 <section>
-       <h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
+       <h2><a href="{{ path('rapsysuser_login') }}">{% trans %}Login{% endtrans %}</a></h2>
        {{ form_start(forms.login) }}
                <div>
                        {{ form_row(forms.login.mail) }}
        {{ form_start(forms.login) }}
                <div>
                        {{ form_row(forms.login.mail) }}
index 6fa28a44f70a9ffe31c2b6388b974f5095786996..1c17feed4eaaa8437db1cb3816c0f876fc0a60bb 100644 (file)
@@ -1,5 +1,5 @@
 <section>
 <section>
-       <h2><a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a></h2>
+       <h2><a href="{{ path('rapsysuser_register') }}">{% trans %}Register{% endtrans %}</a></h2>
        {{ form_start(forms.register) }}
                <div>
                        {% if forms.register.mail is defined %}
        {{ form_start(forms.register) }}
                <div>
                        {% if forms.register.mail is defined %}
index c01e652b9c10bc5823d7c33f0ae51fcf65cf5696..54855c327feca97a2cfabcc30f626e17113f6687 100644 (file)
@@ -2,7 +2,7 @@
 {% block content %}
        <article id="form">
                <header>
 {% block content %}
        <article id="form">
                <header>
-                       <h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
+                       <h2><a href="{{ path('rapsysuser_login') }}">{% trans %}Login{% endtrans %}</a></h2>
                </header>
                {{ form_start(login) }}
                        <div>
                </header>
                {{ form_start(login) }}
                        <div>
@@ -20,7 +20,7 @@
        {% if recover is defined %}
                <article id="recover">
                        <header>
        {% if recover is defined %}
                <article id="recover">
                        <header>
-                               <h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
+                               <h2><a href="{{ path('rapsysuser_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
                        </header>
                        {{ form_start(recover) }}
 
                        </header>
                        {{ form_start(recover) }}
 
index d379ffa083db62d4d7ceb61692d685dd86c5eb47..dc080dd0c7b05510a43bb68f4c3701093b4c455e 100644 (file)
@@ -2,7 +2,7 @@
 {% block content %}
        <article>
                <header>
 {% block content %}
        <article>
                <header>
-                       <h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
+                       <h2><a href="{{ path('rapsysuser_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
                </header>
                {% if sent %}
                        <p class="message notice">{% trans %}Your recover account message has been sent{% endtrans %}</p>
                </header>
                {% if sent %}
                        <p class="message notice">{% trans %}Your recover account message has been sent{% endtrans %}</p>
index acbe1ef0941c3e0397c9bec9e99094b3dfc585ad..74873f82aa40705600f092c2a984adacbbbe2f54 100644 (file)
@@ -1,7 +1,7 @@
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
        <section id="form">
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
        <section id="form">
-               <h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
+               <h2><a href="{{ path('rapsysuser_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
                {% if sent %}
                        <p class="message notice">{% trans %}Your password is updated and an account recover message has been sent{% endtrans %}</p>
                {% elseif not found %}
                {% if sent %}
                        <p class="message notice">{% trans %}Your password is updated and an account recover message has been sent{% endtrans %}</p>
                {% elseif not found %}
index 5b0d83e74ca443336ff325a0c89bbdedb407b82d..74e3aa232a685cdeb56bb611a8e2f351f6dcfaf9 100644 (file)
@@ -2,7 +2,7 @@
 {% block content %}
        <article>
                <header>
 {% block content %}
        <article>
                <header>
-                       <h2><a href="{{ path('rapsys_user_register') }}">{{ title.page }}</a></h2>
+                       <h2><a href="{{ path('rapsysuser_register') }}">{{ title.page }}</a></h2>
                </header>
                {% if disabled is defined and disabled %}
                        <p class="message error">{% trans %}Your account has been disabled{% endtrans %}</p>
                </header>
                {% if disabled is defined and disabled %}
                        <p class="message error">{% trans %}Your account has been disabled{% endtrans %}</p>
index 5ae63fbb2b0aace636641e7df5f025b3b51eaad3..706c4dea5cf95f2cac03bcbdf579cb062e87cff1 100644 (file)
@@ -1,7 +1,7 @@
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 <section id="content">
 {% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 <section id="content">
-       <h2><a href="{{ path('rapsys_air') }}">{{ title.page }}</a></h2>
+       <h2><a href="{{ path('rapsysair') }}">{{ title.page }}</a></h2>
        <p>{% if message is defined %}{{ message }}{% else %}{% trans %}Access denied{% endtrans %}{% endif %}</p>
        {% if is_granted('ROLE_ADMIN') %}{% if trace is defined %}<pre>{{ trace }}</pre>{% endif %}{% endif %}
 </section>
        <p>{% if message is defined %}{{ message }}{% else %}{% trans %}Access denied{% endtrans %}{% endif %}</p>
        {% if is_granted('ROLE_ADMIN') %}{% if trace is defined %}<pre>{{ trace }}</pre>{% endif %}{% endif %}
 </section>
index 4ec1b679da550361a66e9d6bf56e40d0206cff2d..066c03a52824136c60be02c4876d7720d328fbd6 100644 (file)
@@ -3,8 +3,8 @@
        <section id="form">
                <header>
                        <h2>
        <section id="form">
                <header>
                        <h2>
-                               <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}">{{ session.title }}</a>
-                               <a href="{{ path('rapsys_air_location_view', {'id': session.location.id}) }}">{{ session.location.at }}</a>
+                               <a href="{{ path('rapsysair_session_view', {'id': session.id}) }}">{{ session.title }}</a>
+                               <a href="{{ path('rapsysair_location_view', {'id': session.location.id}) }}">{{ session.location.at }}</a>
                        </h2>
                        <p>{{ description }}</p>
                </header>
                        </h2>
                        <p>{{ description }}</p>
                </header>
index 2520555a8f663e860421d269bcf400c0e5cbaf0b..3c345f95408f5ac9fca139f64ea91f09685554e4 100644 (file)
                                                                                <section class="cell">
                                                                                        <header>
                                                                                                {% if application.user.id == 1 and application.user.title|slug == 'milonga-raphael' %}
                                                                                <section class="cell">
                                                                                        <header>
                                                                                                {% if application.user.id == 1 and application.user.title|slug == 'milonga-raphael' %}
-                                                                                                       <h3><a href="{{ path('rapsys_air_user_milongaraphael') }}">{{ application.user.title }}</a></h3>
+                                                                                                       <h3><a href="{{ path('rapsysair_user_milongaraphael') }}">{{ application.user.title }}</a></h3>
                                                                                                {% else %}
                                                                                                {% else %}
-                                                                                                       <h3><a href="{{ path('rapsys_air_user_view', {'id': application.user.id, 'user': application.user.title|slug}) }}">{{ application.user.title }}</a></h3>
+                                                                                                       <h3><a href="{{ path('rapsysair_user_view', {'id': application.user.id, 'user': application.user.title|slug}) }}">{{ application.user.title }}</a></h3>
                                                                                                {% endif %}
                                                                                        </header>
                                                                                        <dl>
                                                                                                {% endif %}
                                                                                        </header>
                                                                                        <dl>