From 484e99987490d5b250841f3a04e38bd6ee46c3ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Thu, 7 Mar 2024 21:56:56 +0100
Subject: [PATCH] Shorten air bundle route aliases
---
Resources/views/admin/index.html.twig | 2 +-
Resources/views/base.html.twig | 24 +++++++++----------
Resources/views/calendar/callback.html.twig | 2 +-
Resources/views/calendar/index.html.twig | 2 +-
Resources/views/default/_city.html.twig | 2 +-
Resources/views/default/about.html.twig | 2 +-
.../default/organizer_regulation.html.twig | 2 +-
Resources/views/default/regulation.html.twig | 2 +-
Resources/views/error.html.twig | 2 +-
Resources/views/form/_login.html.twig | 2 +-
Resources/views/form/_register.html.twig | 2 +-
Resources/views/form/login.html.twig | 4 ++--
Resources/views/form/recover.html.twig | 2 +-
Resources/views/form/recover_mail.html.twig | 2 +-
Resources/views/form/register.html.twig | 2 +-
Resources/views/security/denied.html.twig | 2 +-
Resources/views/session/edit.html.twig | 4 ++--
Resources/views/session/view.html.twig | 4 ++--
18 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Resources/views/admin/index.html.twig b/Resources/views/admin/index.html.twig
index 687e217..46b6c9b 100644
--- a/Resources/views/admin/index.html.twig
+++ b/Resources/views/admin/index.html.twig
@@ -14,7 +14,7 @@
<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>
diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig
index 9dc9543..77819c9 100644
--- 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' %}
- {% 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 %}
@@ -70,21 +70,21 @@
{% 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') %}
- <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') %}
- <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') %}
- <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 %}
- <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 %}
@@ -128,11 +128,11 @@
{% 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 %}
- <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 %}
diff --git a/Resources/views/calendar/callback.html.twig b/Resources/views/calendar/callback.html.twig
index 70d5ff1..42db49f 100644
--- a/Resources/views/calendar/callback.html.twig
+++ b/Resources/views/calendar/callback.html.twig
@@ -2,7 +2,7 @@
{% 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 %}
diff --git a/Resources/views/calendar/index.html.twig b/Resources/views/calendar/index.html.twig
index d83236e..ea7e36d 100644
--- a/Resources/views/calendar/index.html.twig
+++ b/Resources/views/calendar/index.html.twig
@@ -2,7 +2,7 @@
{% 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) }}
diff --git a/Resources/views/default/_city.html.twig b/Resources/views/default/_city.html.twig
index f373590..5119a50 100644
--- a/Resources/views/default/_city.html.twig
+++ b/Resources/views/default/_city.html.twig
@@ -2,7 +2,7 @@
{% 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">
diff --git a/Resources/views/default/about.html.twig b/Resources/views/default/about.html.twig
index b075486..9510a7a 100644
--- a/Resources/views/default/about.html.twig
+++ b/Resources/views/default/about.html.twig
@@ -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>
- <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 %}
diff --git a/Resources/views/default/organizer_regulation.html.twig b/Resources/views/default/organizer_regulation.html.twig
index 3106e1f..ac6c315 100644
--- a/Resources/views/default/organizer_regulation.html.twig
+++ b/Resources/views/default/organizer_regulation.html.twig
@@ -2,7 +2,7 @@
{% 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>
diff --git a/Resources/views/default/regulation.html.twig b/Resources/views/default/regulation.html.twig
index 37e206d..90047c3 100644
--- a/Resources/views/default/regulation.html.twig
+++ b/Resources/views/default/regulation.html.twig
@@ -1,7 +1,7 @@
{% 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>
diff --git a/Resources/views/error.html.twig b/Resources/views/error.html.twig
index 64b1231..16a8137 100644
--- a/Resources/views/error.html.twig
+++ b/Resources/views/error.html.twig
@@ -1,7 +1,7 @@
{% 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 %}
diff --git a/Resources/views/form/_login.html.twig b/Resources/views/form/_login.html.twig
index c62cb8d..9fb8fad 100644
--- a/Resources/views/form/_login.html.twig
+++ b/Resources/views/form/_login.html.twig
@@ -1,5 +1,5 @@
<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) }}
diff --git a/Resources/views/form/_register.html.twig b/Resources/views/form/_register.html.twig
index 6fa28a4..1c17fee 100644
--- a/Resources/views/form/_register.html.twig
+++ b/Resources/views/form/_register.html.twig
@@ -1,5 +1,5 @@
<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 %}
diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index c01e652..54855c3 100644
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -2,7 +2,7 @@
{% 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>
@@ -20,7 +20,7 @@
{% 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) }}
diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig
index d379ffa..dc080dd 100644
--- a/Resources/views/form/recover.html.twig
+++ b/Resources/views/form/recover.html.twig
@@ -2,7 +2,7 @@
{% 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>
diff --git a/Resources/views/form/recover_mail.html.twig b/Resources/views/form/recover_mail.html.twig
index acbe1ef..74873f8 100644
--- a/Resources/views/form/recover_mail.html.twig
+++ b/Resources/views/form/recover_mail.html.twig
@@ -1,7 +1,7 @@
{% 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 %}
diff --git a/Resources/views/form/register.html.twig b/Resources/views/form/register.html.twig
index 5b0d83e..74e3aa2 100644
--- a/Resources/views/form/register.html.twig
+++ b/Resources/views/form/register.html.twig
@@ -2,7 +2,7 @@
{% 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>
diff --git a/Resources/views/security/denied.html.twig b/Resources/views/security/denied.html.twig
index 5ae63fb..706c4de 100644
--- a/Resources/views/security/denied.html.twig
+++ b/Resources/views/security/denied.html.twig
@@ -1,7 +1,7 @@
{% 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>
diff --git a/Resources/views/session/edit.html.twig b/Resources/views/session/edit.html.twig
index 4ec1b67..066c03a 100644
--- a/Resources/views/session/edit.html.twig
+++ b/Resources/views/session/edit.html.twig
@@ -3,8 +3,8 @@
<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>
diff --git a/Resources/views/session/view.html.twig b/Resources/views/session/view.html.twig
index 2520555..3c345f9 100644
--- a/Resources/views/session/view.html.twig
+++ b/Resources/views/session/view.html.twig
@@ -213,9 +213,9 @@
<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 %}
- <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>
--
2.41.3