X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/3438fdde1d50fdcfbbc2aa498752a0ec628f54d6..58883dd276b37950932fff7bc166b95404f7b4ca:/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 e04f1b3..8aeec00 100644
--- a/Resources/views/default/index.html.twig
+++ b/Resources/views/default/index.html.twig
@@ -1,45 +1,46 @@
-{% extends '@RapsysAir/body.html.twig' %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
-	<article id="dashboard">
+	<article>
 		<header>
-			<h2><a href="{{ path('rapsys_air') }}">{{ title }}</a></h2>
-			<p>{{ description }}</p>
+			<h2>{{ description }}</h2>
 		</header>
 		<div class="panel">
 			{% if calendar is defined and calendar %}
 				<div class="grid calendar seven">
 					{% for date, day in calendar %}
-						<article class="{{ day.class|join(' ') }}">
-							<h3>{{ day.title }}</h3>
+						<section class="{{ day.class|join(' ') }}">
+							<header>
+								<h3>{{ day.title }}</h3>
+							</header>
 							{% 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>
-												<span>{{ session.stop|localizeddate('none', 'short') }}</span>
-												{% if session.pseudonym is defined and session.pseudonym %}
-													<span class="reducible{% if session.rate is not defined and session.hat is not defined %} pseudonym{% endif %}">{{ session.pseudonym }}</span>
+											<a href="{{ session.link }}" title="{{ session.title }}">
+												<span>{{ session.start|intldate('none', 'short') }}</span>
+												<span class="reducible">{{ session.location.title }}</span>
+												<span class="temperature"{% if session.temperature.title is defined and session.temperature.title %} title="{{ session.temperature.title }}"{% endif %}><span class="glyph">{{ session.temperature.glyph }}</span></span>
+												<span>{{ session.stop|intldate('none', 'short') }}</span>
+												<span class="reducible">{% if session.application.user.title is defined and session.application.user.title %}{{ session.application.user.title }}{% endif %}</span>
+												<span class="rain"{% if session.rain.title is defined and session.rain.title %} title="{{ session.rain.title }}"{% endif %}><span class="glyph">{{ session.rain.glyph }}</span></span>
+												{% if session.rate is defined and session.rate %}
+													<span class="rate" title="{{ session.rate.title }}">{% if session.rate.rate is defined and session.rate.rate %}{{ session.rate.rate }} {% endif %}<span class="glyph">{{ session.rate.glyph }}</span></span>
+												{% else %}
+													<span></span>
 												{% endif %}
-												{% if session.rate is defined %}<span class="info">{{ session.rate }} {% if session.hat is defined and session.hat %}🎩{% else %}€{% endif %}</span>{% endif %}
+												<span class="reducible">{{ session.location.zipcode }} {{ session.location.city }}</span>
+												<span></span>
 											</a>
 										</li>
 									{% endfor %}
 								</ul>
 							{% endif %}
-						</article>
+						</section>
 					{% endfor %}
 				</div>
 			{% endif %}
 			{{ include('@RapsysAir/form/_toolbox.html.twig') }}
 		</div>
 	</article>
-	{{ include('@RapsysAir/default/_location.html.twig') }}
+	{{ include('@RapsysAir/default/_city.html.twig') }}
 {% endblock %}