X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/5eaefbbc2e975fc4aee4e9897c39a7939046f22c..7c929ed199ece6713e03b943415cbf5b3f68e254:/Resources/views/user/view.html.twig?ds=sidebyside

diff --git a/Resources/views/user/view.html.twig b/Resources/views/user/view.html.twig
index 2484783..9c47879 100644
--- a/Resources/views/user/view.html.twig
+++ b/Resources/views/user/view.html.twig
@@ -1,27 +1,40 @@
-{% extends '@RapsysAir/body.html.twig' %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
-	<section id="dashboard">
-		<h2><a href="{{ path('rapsys_air_organizer_view', {'id': id}) }}">{{ section }}</a></h2>
-		<div class="panel calendar">
+	<article>
+		<header>
+			<h2>{{ title.page }}</h2>
+			<p>{{ description }}</p>
+		</header>
+		<div class="panel">
 			{% if calendar is defined and calendar %}
-				<div class="grid">
+				<div class="grid calendar seven">
 					{% for date, day in calendar %}
-						<section class="{{ ['cell', 'seventh']|merge(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']|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 class="{{ session.class|join(' ') }}">
+											<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 %}
+												<span class="reducible">{{ session.location.zipcode }} {{ session.location.city }}</span>
+												<span></span>
+											</a>
 										</li>
 									{% endfor %}
 								</ul>
-							{% else %}
-								&nbsp;
 							{% endif %}
 						</section>
 					{% endfor %}
@@ -29,33 +42,6 @@
 			{% 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>
-						{% if snippets is defined and snippets[id] is defined and snippets[id] %}
-							{{ form_start(snippets[id]) }}
-								<div>
-									{{ form_row(snippets[id].description) }}
-
-									{{ form_row(snippets[id].submit) }}
-
-									{% if snippets[id].delete is defined %}
-										{{ form_row(snippets[id].delete) }}
-									{% endif %}
-								</div>
-
-								{# render csrf token etc .#}
-								<footer style="display:none">{{ form_rest(snippets[id]) }}</footer>
-							{{ form_end(snippets[id]) }}
-						{% endif %}
-					</section>
-				{% endfor %}
-			</div>
-		</section>
-	{% endif %}
+	</article>
+	{{ include('@RapsysAir/default/_location.html.twig') }}
 {% endblock %}