X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/c97d3ebb980d5ead80f19db03958bf40b06d9c26..HEAD:/Resources/views/session/edit.html.twig

diff --git a/Resources/views/session/edit.html.twig b/Resources/views/session/edit.html.twig
index 5751cc9..066c03a 100644
--- a/Resources/views/session/edit.html.twig
+++ b/Resources/views/session/edit.html.twig
@@ -1,50 +1,60 @@
-{% extends '@RapsysAir/body.html.twig' %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<section id="form">
-		<h2>
-			<a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}">{{ session.title }}</a>
-			<a href="{{ path('rapsys_air_location_view', {'id': session.location.id}) }}">{{ session.location.at }}</a>
-		</h2>
-		{% if form.modify is defined or form.raincancel is defined %}
+		<header>
+			<h2>
+				<a href="{{ path('rapsysair_session_view', {'id': session.id}) }}">{{ session.title }}</a>
+				<a href="{{ path('rapsysair_location_view', {'id': session.location.id}) }}">{{ session.location.at }}</a>
+			</h2>
+			<p>{{ description }}</p>
+		</header>
+		{% if form.modify is defined or form.move is defined or form.cancel is defined or form.raincancel is defined or form.forcecancel is defined or is_granted('ROLE_ADMIN') %}
 			{{ form_start(form) }}
 				{% if form.modify is defined %}
-					{% if is_granted('ROLE_REGULAR') %}
-						<div>
-							{{ form_row(form.begin) }}
-
-							{{ form_row(form.length) }}
-
-							{{ form_row(form.modify) }}
-						</div>
-					{% endif %}
-					{% if is_granted('ROLE_SENIOR') %}
-						<div class="dangerous">
-							{{ form_row(form.location) }}
-
-							{{ form_row(form.move) }}
-						</div>
-					{% endif %}
+					<div>
+						{{ form_row(form.begin) }}
+
+						{{ form_row(form.length) }}
+
+						{{ form_row(form.modify) }}
+					</div>
+				{% endif %}
+				{% if form.move is defined %}
+					<div class="dangerous">
+						{{ form_row(form.location) }}
+
+						{{ form_row(form.move) }}
+					</div>
+				{% endif %}
+				{% if form.cancel is defined or form.raincancel is defined or form.forcecancel is defined or is_granted('ROLE_ADMIN') %}
 					<div class="mortal">
 						{% if is_granted('ROLE_ADMIN') %}
 							{{ form_row(form.user) }}
 						{% endif %}
 
-						{{ form_row(form.cancel) }}
+						{% if form.cancel is defined %}
+							{{ form_row(form.cancel) }}
+						{% endif %}
+
+						{% if form.raincancel is defined %}
+							{{ form_row(form.raincancel) }}
+						{% endif %}
+
+						{% if form.forcecancel is defined %}
+							{{ form_row(form.forcecancel) }}
+						{% endif %}
 
 						{% if is_granted('ROLE_ADMIN') %}
-							{{ form_row(form.attribute) }}
+							{% if form.attribute is defined %}
+								{{ form_row(form.attribute) }}
 
-							{{ form_row(form.autoattribute) }}
+								{{ form_row(form.autoattribute) }}
+							{% endif %}
 
 							{{ form_row(form.lock) }}
 						{% endif %}
 					</div>
-				{% elseif form.raincancel is defined %}
-					<div>
-						{{ form_row(form.raincancel) }}
-					</div>
 				{% endif %}
-
 				{# render csrf token etc .#}
 				<footer style="display:none">{{ form_rest(form) }}</footer>
 			{{ form_end(form) }}