Switch to new header system

Switch to article container
Use common location template
Improve each event display

diff --git a/Resources/views/session/index.html.twig b/Resources/views/session/index.html.twig
index abfdc20d052374ab79dfcdb688e2bb87ac7bc2fb..0ac7d6a3dc396242f46b48afc06e2abf8a831a4f 100644 (file)
--- a/Resources/views/session/index.html.twig
+++ b/Resources/views/session/index.html.twig
@@ -1,45 +1,40 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}

-<section id="dashboard">
-       <h2><a href="{{ path('rapsys_air_session') }}">{{ section }}</a></h2>
-       <div class="panel calendar">
-               {% if calendar is defined and calendar %}
-                       <div class="grid">
-                               {% for date, day in calendar %}
-                                       <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>
-                                                               {% endfor %}
-                                                       </ul>
-                                               {% else %}
-                                                       &nbsp;
-                                               {% endif %}
-                                       </section>
-                               {% endfor %}
-                       </div>
-               {% endif %}
-               {{ include('@RapsysAir/form/_toolbox.html.twig') }}
-       </div>
-       {% if locations is defined and locations %}
-               <section>
-                       <h3>{% trans %}Locations{% endtrans %}</h3>
-                       <div class="panel grid">
-                               {% for id, title in locations %}
-                                       <section class="cell">
-                                               <h4><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h4>
-                                       </section>
-                               {% endfor %}
-                       </div>
-               </section>
-       {% endif %}
-</section>
+       <article id="dashboard">
+               <h2><a href="{{ path('rapsys_air_session') }}">{{ section }}</a></h2>
+               <div class="panel">
+                       {% if calendar is defined and calendar %}
+                               <div class="grid calendar seven">
+                                       {% for date, day in calendar %}
+                                               <section class="{{ day.class|join(' ') }}">
+                                                       <h3>{{ day.title }}</h3>
+                                                       {% if day.sessions is not empty %}
+                                                               <ul>
+                                                                       {% for session in day.sessions %}
+                                                                               <li class="{{ session.class|join(' ') }}">
+                                                                                       <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">
+                                                                                               <span>{{ session.start|localizeddate('none', 'short') }}</span>
+                                                                                               <span class="reducible">{{ session.location }}</span>
+                                                                                               <span class="info">
+                                                                                                       {% if session.weather is defined and session.weather %}
+                                                                                                               <span title="{{ session.weathertitle }}">{{ session.weather }}</span>
+                                                                                                       {% endif %}
+                                                                                                       <span title="{{ session.slottitle }}">{{ session.slot }}</span>
+                                                                                               </span>
+                                                                                               {% if session.pseudonym is defined and session.pseudonym %}
+                                                                                                       <span class="reducible pseudonym">{{ session.pseudonym }}</span>
+                                                                                               {% endif %}
+                                                                                       </a>
+                                                                               </li>
+                                                                       {% endfor %}
+                                                               </ul>
+                                                       {% endif %}
+                                               </section>
+                                       {% endfor %}
+                               </div>
+                       {% endif %}
+                       {{ include('@RapsysAir/form/_toolbox.html.twig') }}
+               </div>
+       </article>
+       {{ include('@RapsysAir/default/_location.html.twig') }}

 {% endblock %}
 {% endblock %}