X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/baf72cd841a1277e45d37c1fd3a60bd40feb9d5e..42ed76590da8c8c8f5f34119317c4f200bd4de9e:/Resources/views/body.html.twig?ds=sidebyside

diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
index 452f70c..6dca55d 100644
--- a/Resources/views/body.html.twig
+++ b/Resources/views/body.html.twig
@@ -4,11 +4,17 @@
 {% endblock %}
 {% block stylesheets %}
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="shortcut icon" type="image/x-icon" href="{{ asset(site_ico) }}" />
-	<link ref="icon" type="image/svg+xml" href="{{ asset(site_svg) }}" />
-	{% for size, icon in site_png %}
+	{% if description is defined and description %}
+		<meta name="description" content="{{ description }}" />
+	{% endif %}
+	{% if keywords is defined and keywords %}
+		<meta name="keywords" content="{{ keywords|join(', ') }}" />
+	{% endif %}
+	<link rel="shortcut icon" type="image/x-icon" href="{{ asset(site.ico) }}" />
+	<link rel="icon" type="image/svg+xml" href="{{ asset(site.svg) }}" />
+	{% for size, icon in site.png %}
 		{# Apple #}
-		{% if size in [152, 167, 180] %}
+		{% if size in [120, 152, 167, 180] %}
 			{% if size == 180 %}
 				<link rel="apple-touch-icon" href="{{ asset(icon) }}" />
 			{% endif %}
@@ -18,37 +24,51 @@
 			<meta name="msapplication-square{{ size }}x{{ size }}logo" content="{{ asset(icon) }}" />
 		{# Others #}
 		{% else %}
-			<link rel="icon" type="image/png" size="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
+			<link rel="icon" type="image/png" sizes="{{ size }}x{{ size }}" href="{{ asset(icon) }}" />
 		{% endif %}
 	{% endfor %}
 	{# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}
-	{% stylesheet '@rapsys_air_bundle/css/{reset,irishgrover,labelleaurore,screen}.css' %}
-		<link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
-	{% endstylesheet %}
+	{% stopwatch 'stylesheet' %}
+		{% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,screen}.css' %}
+			<link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
+		{% endstylesheet %}
+	{% endstopwatch %}
+	{% if canonical is defined and canonical %}
+		<link rel="canonical" href="{{ canonical }}" />
+	{% endif %}
+	{% if alternates is defined and alternates %}
+		{% for alternate in alternates %}
+			<link rel="alternate" href="{{ alternate.absolute }}" hreflang="{{ alternate.lang }}" />
+		{% endfor %}
+	{% endif %}
 {% endblock %}
 {% block javascripts %}
-	{#{% javascript '@RapsysAir/js/*.js' %}
-		<script type="text/javascript" src="{{ asset_url }}"></script>
-	{% endjavascript %}#}
+	{% stopwatch 'javascript' %}
+		{#{% javascript '@RapsysAir/js/*.js' %}
+			<script type="text/javascript" src="{{ asset_url }}"></script>
+		{% endjavascript %}#}
+	{% endstopwatch %}
 {% endblock %}
 {% block title %}{{ title }}{% endblock %}
 {% block body %}
 	{% block header %}
 		<header id="header">
-			{% block header_title %}<h1><a href="{{ site_url }}"><img src="{{ asset(site_logo) }}" alt="{{ site_title }}" /></a></h1>{% endblock %}
+			{% block header_title %}<h1><a href="{{ site.url }}" title="{{ site.title }}"><img src="{{ asset(site.logo) }}" alt="{{ site.title }}" width="171" height="32" /></a></h1>{% endblock %}
 			{% block header_nav %}
 				<nav>
 					<h2>{% trans %}Navigation{% endtrans %}</h2>
-					<a href="{{ path('rapsys_air_location') }}">{% trans %}Locations{% endtrans %}</a>
-					<a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
-					<a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>
-					<a href="{{ path('rapsys_air_policy') }}">{% trans %}Policy{% endtrans %}</a>
-					{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
-						<a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
-					{% else %}
-						<a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a>
-						<a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a>
-					{% endif %}
+					<ul>
+						<li><a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a></li>
+						<li><a href="{{ path('rapsys_air_terms_of_service') }}">{% trans %}Terms of service{% endtrans %}</a></li>
+						<li><a href="{{ path('rapsys_air_organizer_regulation') }}">{% trans %}Organizer regulation{% endtrans %}</a></li>
+						<li><a href="{{ path('rapsys_air_organizer') }}">{% trans %}Organizers{% endtrans %}</a></li>
+						{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
+							<li><a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a></li>
+						{% else %}
+							<li><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></li>
+							<li><a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a></li>
+						{% endif %}
+					</ul>
 				</nav>
 			{% endblock %}
 {#
@@ -69,7 +89,7 @@
 		{# pass an array argument to get the messages of those types (['warning', 'error']) #}
 		{% for label, messages in app.flashes %}
 			{% if messages %}
-				<div class="flash {{label}}">
+				<div class="message {{label}}">
 					<ul>
 						{% for message in messages %}
 							<li>{{ message }}</li>
@@ -91,8 +111,16 @@
 	{% block footer %}
 		<footer id="footer">
 			<span>&nbsp;</span>
-			<details><summary>{{ copy_long }}</summary><span>{{ copy_short }}</span></details>
-			<span>&nbsp;</span>
+			<details><summary>{{ copy.long }}</summary><span>{{ copy.short }}</span></details>
+			{% if alternates is defined and alternates %}
+				<ul>
+					{% for alternate in alternates %}
+						<li><a href="{{ alternate.relative }}" hreflang="{{ alternate.lang }}" title="{{ alternate.title }}">{{ alternate.translated }}</a></li>
+					{% endfor %}
+				</ul>
+			{% else %}
+				<span>&nbsp;</span>
+			{% endif %}
 		</footer>
 	{% endblock %}
 {% endblock %}