Rename findIndexByGroupPseudonym function in findChoicesAsArray

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

diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
index 6fea7b45bb70e6525d80228528457f14f3b8e142..10630ff69722baf74eeb6b38f7e65bed818eacf0 100644 (file)
--- a/Resources/views/body.html.twig
+++ b/Resources/views/body.html.twig
@@ -4,15 +4,15 @@
 {% 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" />

-       {% if page.description is defined and page.description %}
-               <meta name="description" content="{{ page.description }}" />
+       {% 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 %}
        {% 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) }}" />
+               <link rel="shortcut icon" type="image/x-icon" href="{{ asset(site.icon.ico) }}" />
+               <link rel="icon" type="image/svg+xml" href="{{ asset(site.icon.svg) }}" />

                {% for size, icon in site.png %}
                        {# Apple #}
                        {% if size in [120, 152, 167, 180] %}
                {% for size, icon in site.png %}
                        {# Apple #}
                        {% if size in [120, 152, 167, 180] %}


@@ -31,29 +31,26 @@
        {% 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,screen}.css' %}
-                       <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
+               {% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,lemon,notoemoji,screen}.css' %}
+                       <link rel="stylesheet" type="text/css" href="{{ asset_url }}?20221024100144" />

                {% endstylesheet %}
        {% endstopwatch %}
        {% if canonical is defined and canonical %}
                {% endstylesheet %}
        {% endstopwatch %}
        {% if canonical is defined and canonical %}

-               <link rel="canonical" href="{{ canonical }}"{% if app.request.locale is defined and app.request.locale %} hreflang="{{ app.request.locale }}"{% endif %} />
+               <link rel="canonical" href="{{ canonical }}"{% if locale is defined and locale %} hreflang="{{ locale }}"{% endif %} />

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

-       {% if ogps is defined and ogps %}
-               {% for property, content in ogps %}
-                       <meta property="og:{{ property }}" content="{{ content }}" />
-               {% endfor %}
-               {% for property, contents in facebooks %}
+       {% if facebook['metas'] is defined and facebook['metas'] %}
+               {% for property, contents in facebook['metas'] %}

                        {% if contents is iterable %}
                                {% for content in contents %}
                        {% if contents is iterable %}
                                {% for content in contents %}

-                                       <meta property="fb:{{ property }}" content="{{ content }}" />
+                                       <meta property="{{ property }}" content="{{ content }}" />

                                {% endfor %}
                        {% else %}
                                {% endfor %}
                        {% else %}

-                               <meta property="fb:{{ property }}" content="{{ contents }}" />
+                               <meta property="{{ property }}" content="{{ contents }}" />

                        {% endif %}
                {% endfor %}
        {% endif %}
                        {% endif %}
                {% endfor %}
        {% endif %}


@@ -65,35 +62,38 @@
                {% endjavascript %}#}
        {% endstopwatch %}
 {% endblock %}
                {% endjavascript %}#}
        {% endstopwatch %}
 {% endblock %}

-{% block title %}{{ [site.title, page.section, page.title]|filter(v => v)|join(' - ') }}{% endblock %}
+{% block title %}{{ [site.title, section, title]|filter(v => v)|join(' - ') }}{% endblock %}

 {% block body %}
        {% block header %}
                <header id="header">
 {% block body %}
        {% block header %}
                <header id="header">

-                       {% 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 %}
+                       <div>
+                               {% if site is defined and site %}
+                                       {% block header_title %}<a id="logo" href="{{ site.url }}" title="{{ site.title }}"><img src="{{ asset(site.logo.svg) }}?20221024100144" srcset="{{ asset(site.logo.png) }}?20221024100144 200w, {{ asset(site.logo.svg) }}?20221024100144 400w" sizes="(min-width:400px) 400px, 200px" alt="{{ site.title }}" width="100" height="45" /><span>{{ site.title }}</span></a>{% endblock %}
+                               {% endif %}
+                               <h1 id="title"><a href="{{ canonical }}">{{ title }}</a></h1>
+                       </div>

                        {% block header_nav %}
                        {% block header_nav %}

-                               <nav>
-                                       <h2>{% trans %}Navigation{% endtrans %}</h2>
-                                       <ul>
-                                               <li><a href="{{ path('rapsys_air') }}" rel="home">{% trans %}Home{% endtrans %}</a></li>
-                                               <li><a href="{{ path('rapsys_air_contact') }}" rel="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>
+                               <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>
+                                               {% if is_granted('ROLE_ADMIN') %}
+                                                       <a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
+                                               {% endif %}

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

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

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

-                                                       <li><a href="{{ path('rapsys_air_user_view', {id: app.user.id}) }}">{% trans %}My account{% endtrans %}</a></li>
-                                                       <li><a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a></li>
+                                                       <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>

                                                {% else %}
                                                {% 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>
+                                                       <a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a>
+                                                       <a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a>

                                                {% endif %}
                                                {% endif %}

-                                       </ul>

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

-{#
+       {#

                        {% block site_subtitle %}{% endblock %}
                        {% block site_tagline %}
                                {% if tags is defined and tags %}
                        {% block site_subtitle %}{% endblock %}
                        {% block site_tagline %}
                                {% if tags is defined and tags %}


@@ -104,7 +104,7 @@
                                        </ul>
                                {% endif %}
                        {% endblock %}
                                        </ul>
                                {% endif %}
                        {% endblock %}

-#}
+       #}

                </header>
        {% endblock %}
        {% block message %}
                </header>
        {% endblock %}
        {% block message %}


@@ -125,10 +125,11 @@
        {% block sidebar %}<aside id="sidebar"></aside>{% endblock %}
 #}
        {% block content %}
        {% block sidebar %}<aside id="sidebar"></aside>{% endblock %}
 #}
        {% block content %}

-               <section id="content">
-                       <h2><a href="{{ path('rapsys_air_homepage') }}">{{ section }}</a></h2>
-                       <p>{% trans %}Outdoor space reservation system{% endtrans %}</p>
-               </section>
+               <article>
+                       <header>
+                               <h2>{% trans %}Outdoor space reservation system{% endtrans %}</h2>
+                       </header>
+               </article>

        {% endblock %}
        {% block footer %}
                <footer id="footer">
        {% endblock %}
        {% block footer %}
                <footer id="footer">


@@ -142,12 +143,12 @@
                                {% if langs|length > 1 %}
                                        <ul>
                                                {% for lang in langs %}
                                {% if langs|length > 1 %}
                                        <ul>
                                                {% for lang in langs %}

-                                                       <li><a href="{{ alternates[lang].relative }}" hreflang="{{ lang }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a></li>
+                                                       <li><a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a></li>

                                                {% endfor %}
                                        </ul>
                                {% else %}
                                        {% set lang = langs|first %}
                                                {% endfor %}
                                        </ul>
                                {% else %}
                                        {% set lang = langs|first %}

-                                       <a href="{{ alternates[lang].relative }}" hreflang="{{ lang }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a>
+                                       <a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a>

                                {% endif %}
                        {% else %}
                                <span>&nbsp;</span>
                                {% endif %}
                        {% else %}
                                <span>&nbsp;</span>