X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/f3dfacbe6f7b850b43fc1fed423fa4eb665529f2..0f6e0b65f14d1d417c41de11f0056ac7edc926e1:/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 162c383..0a183f4 100644
--- a/Resources/views/user/view.html.twig
+++ b/Resources/views/user/view.html.twig
@@ -1,47 +1,43 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}
-<section id="dashboard">
-	<h2><a href="{{ path('rapsys_air_user_view', {'id': id}) }}">{{ 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 %}
-		<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>
+	<article id="dashboard">
+		<header>
+			<h2><a href="{{ path('rapsys_air_user_view', {'id': id}) }}">{{ section }}</a></h2>
+			<p>{{ description }}</p>
+		</header>
+		<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>
-			</section>
+			{% endif %}
+			{{ include('@RapsysAir/form/_toolbox.html.twig') }}
 		</div>
-	{% endif %}
-</section>
+	</article>
+	{{ include('@RapsysAir/default/_location.html.twig') }}
 {% endblock %}