Rename findIndexByGroupPseudonym function in findChoicesAsArray

[airbundle] / Resources / views / user / index.html.twig

diff --git a/Resources/views/user/index.html.twig b/Resources/views/user/index.html.twig
index 2cfc6c853207430a80b872709cec8c50aa18e69a..ab1bcba7e80cd5c0a1710f3a9e57951d31647640 100644 (file)
--- a/Resources/views/user/index.html.twig
+++ b/Resources/views/user/index.html.twig
@@ -1,55 +1,45 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}

-       <section id="dashboard">
-               <h2><a href="{{ path('rapsys_air') }}">{{ section }}</a></h2>
+       <article>
+               <header>
+                       <h2>{{ description }}</h2>
+               </header>

                <div class="panel">
                <div class="panel">

-                       {% if organizers is defined and organizers %}
-                               <div class="grid">
-                                       {% for group, users in organizers %}
-                                               <section class="cell">
-                                                       <h3>{{ group }}</h3>
+                       {% if groups is defined and groups %}
+                               <div class="grid{% if groups|length > 2 %} three{% elseif groups|length > 1 %} two{% endif %}">
+                                       {% for group, users in groups %}
+                                               <article class="cell">
+                                                       <header>
+                                                               <h3>{{ group }}</h3>
+                                                       </header>

                                                        <ul>
                                                        <ul>

-                                                               {% for id, organizer in users %}
-                                                                       <li><a href="{{ path('rapsys_air_organizer_view', {'id': id}) }}">{{ organizer }}</a></li>
+                                                               {% for id, user in users %}
+                                                                       <li><a href="{{ user.link }}" title="{% if user.forename %}{{ user.forename }} {% endif %}{% if user.surname %}{{ user.surname }} {% endif %}{% if user.pseudonym %}({{ user.pseudonym }}) {% endif %}&lt;{{ user.mail }}&gt;">{{ user.mail }}</a><a href="{{ user.edit }}">{% trans %}Modify{% endtrans %}</a></li>

                                                                {% endfor %}
                                                                {% endfor %}

-                                                       </ul>
-                                               </section>
+                                               </article>

                                        {% endfor %}
                                        {% endfor %}

-                                       {#{% for date, day in organizers %}
-                                               <section class="{{ ['cell', 'seventh']|merge(day.class)|join(' ') }}">
-                                                       <h3>{{ day.title }}</h3>
-                                                       {% if day.sessions is not empty %}
-                                                               <ul>
-                                                                       {% for session in day.sessions %}
-                                                                               <li class="{{ ['session']|merge(session.class)|join(' ') }}">
-                                                                                       <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>
-                                                                                       <span>
-                                                                                               {% if session.weather is defined and session.weather %}<span title="{{ session.weathertitle }}">{{ session.weather }}</span>{% endif %}
-                                                                                               <span title="{{ session.slottitle }}">{{ session.slot }}</span>
-                                                                                       </span>
-                                                                               </li>
+                               </div>
+                       {% elseif users is defined and users %}
+                               <div class="grid{% if users|length > 3 %} four{% elseif users|length > 2 %} three{% elseif users|length > 1 %} two{% endif %}">
+                                       {% for id, user in users %}
+                                               <article class="cell">
+                                                       <header>
+                                                               <h3><a href="{{ user.link }}" title="{{ '%pseudonym% calendar'|trans({'%pseudonym%': user.pseudonym}) }}">{{ user.pseudonym }}</a></h3>
+                                                       </header>
+                                                       {% for dname, dinfos in user.dances %}
+                                                               <dl>
+                                                                       <dt><a href="{{ dinfos.link }}">{{ dname }}</a></dt>
+                                                                       {% for dtype, dlink in dinfos.types %}
+                                                                               <dd><a href="{{ dlink }}">{{ dtype }}</a><dd>

                                                                        {% endfor %}
                                                                        {% endfor %}

-                                                               </ul>
-                                                       {% else %}
-                                                               &nbsp;
-                                                       {% endif %}
-                                               </section>
-                                       {% endfor %}#}
+                                                               </dl>
+                                                       {% endfor %}
+                                               </article>
+                                       {% endfor %}

                                </div>
                        {% endif %}
                        {{ include('@RapsysAir/form/_toolbox.html.twig') }}
                </div>
                                </div>
                        {% endif %}
                        {{ include('@RapsysAir/form/_toolbox.html.twig') }}
                </div>

-       </section>
-       {% if locations is defined and locations %}
-               <section id="location">
-                       <h2>{% trans %}Locations{% endtrans %}</h2>
-                       <div class="panel grid">
-                               {% for id, title in locations %}
-                                       <section class="cell">
-                                               <h3><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h3>
-                                       </section>
-                               {% endfor %}
-                       </div>
-               </section>
-       {% endif %}
+       </article>
+       {{ include('@RapsysAir/default/_location.html.twig') }}

 {% endblock %}
 {% endblock %}