X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/29cfbee3ea06a61b47ffb3ef62431242316891dd..59485c51e349b9891805c571efb7d0d7fa78a8a1:/Resources/views/default/index.html.twig?ds=sidebyside

diff --git a/Resources/views/default/index.html.twig b/Resources/views/default/index.html.twig
index cd62920..d8ce55c 100644
--- a/Resources/views/default/index.html.twig
+++ b/Resources/views/default/index.html.twig
@@ -2,51 +2,46 @@
 {% block content %}
 <section id="dashboard">
 	<h2><a href="{{ path('rapsys_air') }}">{{ section }}</a></h2>
-	<section class="panel">
+	<div class="panel calendar">
 		{% if calendar is defined and calendar %}
-			<table class="grid">
-				<tbody>
-					<tr>
-						{% for date, day in calendar %}
-							<td 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>
-											</li>
-										{% endfor %}
-									</ul>
-								{% endif %}
-							</td>
-							{% if loop.index % 7 == 0 and not loop.last %}
-								</tr>
-								<tr>
-							{% endif %}
-						{% endfor %}
-					</tr>
-				</tbody>
-			</table>
+			<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') }}
-	</section>
-	<section class="panel">
-		{% if locations is defined and locations %}
-			<table class="grid">
-				<tbody>
-					<tr>
-						{% for id, title in locations %}
-							<td class="cell third"><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></td>
-								{% if loop.index % 7 == 0 and not loop.last %}
-									</tr>
-									<tr>
-								{% endif %}
-						{% endfor %}
-					</tr>
-				</tbody>
-			</table>
-		{% endif %}
-	</section>
+	</div>
+	{% if locations is defined and locations %}
+		<div class="panel location">
+			<section>
+				<h3>{% trans %}Locations{% endtrans %}</h3>
+				<div class="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>
+		</div>
+	{% endif %}
 </section>
 {% endblock %}