X-Git-Url: https://git.rapsys.eu/blogbundle/blobdiff_plain/dc70caa8cbbe65ade709c761a506bbf9287e57c6..71c7bfea3fba239721455861c4f430a3e7ec424a:/Resources/views/_base.html.twig

diff --git a/Resources/views/_base.html.twig b/Resources/views/_base.html.twig
index b32551f..0b103c0 100644
--- a/Resources/views/_base.html.twig
+++ b/Resources/views/_base.html.twig
@@ -1,34 +1,20 @@
 <!DOCTYPE html>
-<html{% if head['locale'] is defined and head['locale'] %} lang="{{ head['locale'] }}"{% endif %}>
-	<head{% if head['facebook'] is defined and head['facebook'] is not empty %} prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#"{% endif %}>
-		{% block metas %}
-			<meta charset="UTF-8" />
-			<title>{{ head['title'] }}</title>
+<html{% if locale is defined and locale %} lang="{{ locale }}"{% endif %}>
+	<head{% if facebook is defined and facebook %} prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#"{% endif %}>
+		{% block meta %}<meta charset="UTF-8">{% endblock %}
+		<title>{% block title %}{{ [title.page, title.section, title.site]|filter(v => v)|join(' - ') }}{% endblock %}</title>
+		{% block stylesheet %}
 			<meta name="viewport" content="width=device-width, initial-scale=1" />
-{#TODO: deal with unset head['description'] and set description #}
-			{% if head['description'] is defined and head['description'] %}
-				<meta name="description" content="{{ head['description'] }}" />
+			{% if description is defined and description %}
+				<meta name="description" content="{{ description }}" />
 			{% endif %}
-			{% if head['keywords'] is defined and head['keywords'] %}
-				<meta name="keywords" content="{{ head['keywords'] }}" />
+			{% if keywords is defined and keywords %}
+				<meta name="keywords" content="{{ keywords|join(', ') }}" />
 			{% endif %}
-			{% if head['facebook'] is defined and head['facebook'] %}
-				{% for property, contents in head['facebook'] %}
-					{% if contents is iterable %}
-						{% for content in contents %}
-							<meta property="{{ property }}" content="{{ content }}" />
-						{% endfor %}
-					{% else %}
-						<meta property="{{ property }}" content="{{ contents }}" />
-					{% endif %}
-				{% endfor %}
-			{% endif %}
-		{% endblock %}
-		{% block links %}
-			{% if site is defined and site is not empty %}
-				<link rel="shortcut icon" type="image/x-icon" href="{{ asset(site.icon.ico) }}" />
-				<link rel="icon" type="image/svg+xml" href="{{ asset(site.icon.svg) }}" />
-				{% for size, icon in site.icon.png %}
+			{% if icon is defined and icon %}
+				<link rel="shortcut icon" type="image/x-icon" href="{{ asset(icon.ico) }}" />
+				<link rel="icon" type="image/svg+xml" href="{{ asset(icon.svg) }}" />
+				{% for size, icon in icon.png %}
 					{# Apple #}
 					{% if size in [120, 152, 167, 180] %}
 						{% if size == 180 %}
@@ -44,25 +30,36 @@
 					{% endif %}
 				{% endfor %}
 			{% endif %}
-			{# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysBlogBundle/Resources/public/css/{reset,screen}.css' #}
-			{% stylesheet '@RapsysBlog/css/{reset,droidsans,lemon,notoemoji,screen}.css' %}
-				<link rel="stylesheet" type="text/css" href="{{ asset_url }}?{{ 'now'|date('U') }}" />
-			{% endstylesheet %}
 			{% stopwatch 'stylesheet' %}
+				{# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysBlogBundle/css/{reset,screen}.css' #}
+				{% stylesheet '@RapsysBlog/css/{reset,droidsans,lemon,notoemoji,screen}.css' %}
+					<link rel="stylesheet" type="text/css" href="{{ asset }}?{{ 'now'|date('U') }}" />
+				{% endstylesheet %}
 			{% endstopwatch %}
-			{% if head["canonical"] is defined and head['canonical'] %}
-				<link rel="canonical" href="{{ head['canonical'] }}"{% if head['locale'] is defined and head['locale'] %} hreflang="{{ head['locale'] }}"{% endif %} />
+			{% if canonical is defined and canonical %}
+				<link rel="canonical" href="{{ canonical }}"{% if locale is defined and locale %} hreflang="{{ locale }}"{% endif %} />
 			{% endif %}
-			{% if head['alternates'] is defined and head['alternates'] %}
-				{% for lang, alternate in head['alternates'] %}
+			{% if alternates is defined and alternates %}
+				{% for lang, alternate in alternates %}
 					<link rel="alternate" href="{{ alternate.absolute }}" hreflang="{{ lang }}" />
 				{% endfor %}
 			{% endif %}
-			{% if head.prev is defined and head.prev %}
-				<link rel="prev" href="{{ head.prev }}" hreflang="{{ head.locale }}" />
+			{% if prev is defined and prev %}
+				<link rel="prev" href="{{ prev }}" hreflang="{{ locale }}" />
 			{% endif %}
-			{% if head.next is defined and head.next %}
-				<link rel="next" href="{{ head.next }}" hreflang="{{ head.locale }}" />
+			{% if next is defined and next %}
+				<link rel="next" href="{{ next }}" hreflang="{{ locale }}" />
+			{% endif %}
+			{% if facebook is defined and facebook %}
+				{% for property, contents in facebook %}
+					{% if contents is iterable %}
+						{% for content in contents %}
+							<meta property="{{ property }}" content="{{ content }}" />
+						{% endfor %}
+					{% else %}
+						<meta property="{{ property }}" content="{{ contents }}" />
+					{% endif %}
+				{% endfor %}
 			{% endif %}
 		{% endblock %}
 	</head>
@@ -70,89 +67,94 @@
 		{% block body %}
 			{% block header %}
 				<header id="header">
-					<a id="logo" href="{{ path(site.root) }}" title="{{ site.title }}">
-						<img src="{{ asset(site.logo.svg) }}?20221024100144" srcset="{{ asset(site.logo.png) }}?20221024100144 200w, {{ asset(site.logo.svg) }}?20221024100144 400w" sizes="(min-width:400px) 400px, 200px" alt="{{ site.logo.alt }}" width="100" height="60" />
-						<strong>{{ site.title }}</strong>
-					</a>
-					<nav id="nav">
-						<a href="{{ path('rapsys_blog') }}" rel="home">{% trans %}Home{% endtrans %}</a>
-						<a href="{{ path('rapsys_blog_contact') }}" rel="contact">{% trans %}Contact{% endtrans %}</a>
-						{#<a href="{{ path('rapsys_blog_frequently_asked_questions') }}">{% trans %}Frequently asked questions{% endtrans %}</a>#}
-						{% if is_granted('ROLE_ADMIN') %}
-							<a href="{{ path('rapsys_blog_user') }}">{% trans %}Users{% endtrans %}</a>
-						{% endif %}
-						{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
-							<a href="{{ path('rapsys_user_edit', {mail: app.user.mail|short, hash: app.user.mail|short|hash}) }}">{% trans %}My account{% endtrans %}</a>
-							<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 %}
-					</nav>
-			{#
-					{% block site_subtitle %}{% endblock %}
-					{% block site_tagline %}
-						{% if tags is defined and tags %}
-							<ul>
-								{% for id, tag in tags %}
-									<li><h2><a href="#{{id}}">{{tag}}</a></h2></li>
-								{% endfor %}
-							</ul>
-						{% endif %}
+					{% if logo is defined and logo %}
+						{% block header_title %}
+							<a id="logo" href="{{ root }}" title="{{ title.site }}">
+								<img src="{{ asset(logo.svg) }}?{{ 'now'|date('U') }}" srcset="{{ asset(logo.png) }}?{{ 'now'|date('U') }} 200w, {{ asset(logo.svg) }}?{{ 'now'|date('U') }} 400w" sizes="(min-width:400px) 400px, 200px" alt="{{ title.site }}" width="100" height="45" />
+								<strong>{{ title.site }}</strong>
+							</a>
+						{% endblock %}
+					{% endif %}
+					{% block header_nav %}
+						<nav id="nav">
+							<a href="{{ path('rapsysblog') }}" rel="home">{% trans %}Home{% endtrans %}</a>
+							<a href="{{ path('rapsysblog_contact') }}" rel="contact">{% trans %}Contact{% endtrans %}</a>
+							{#<a href="{{ path('rapsysblog_frequently_asked_questions') }}">{% trans %}Frequently asked questions{% endtrans %}</a>#}
+							{#{% if is_granted('ROLE_ADMIN') %}#}
+								<a href="{{ path('rapsysblog_user') }}">{% trans %}Users{% endtrans %}</a>
+							{#{% endif %}#}
+							{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
+								<a href="{{ path('rapsysuser_edit', {mail: app.user.mail|short, hash: app.user.mail|short|hash}) }}">{% trans %}My account{% endtrans %}</a>
+								<a href="{{ path('rapsysuser_logout') }}">{% trans %}Logout{% endtrans %}</a>
+							{% else %}
+								<a href="{{ path('rapsysuser_login') }}">{% trans %}Login{% endtrans %}</a>
+								<a href="{{ path('rapsysuser_register') }}">{% trans %}Register{% endtrans %}</a>
+							{% endif %}
+						</nav>
 					{% endblock %}
-			#}
+					{#
+						{% block header_subtitle %}{% endblock %}
+						{% block header_tagline %}
+							{% if tags is defined and tags %}
+								<ul>
+									{% for id, tag in tags %}
+										<li><h2><a href="#{{id}}">{{tag}}</a></h2></li>
+									{% endfor %}
+								</ul>
+							{% endif %}
+						{% endblock %}
+					#}
 				</header>
 			{% endblock %}
 			{% block message %}
 				{# pass an array argument to get the messages of those types (['warning', 'error']) #}
 				{% for label, messages in app.flashes %}
 					{% if messages %}
-						<div class="message {{label}}">
+						<section class="message {{label}}">
 							<ul>
 								{% for message in messages %}
 									<li>{{ message }}</li>
 								{% endfor %}
 							</ul>
-						</div>
+						</section>
 					{% endif %}
 				{% endfor %}
 			{% endblock %}
-		{% endblock %}
-{#
-	{% block sidebar %}<aside id="sidebar"></aside>{% endblock %}
-#}
-		{% block content %}
-			<article>
-				<header>
-					{% block title %}<h1 id="title"><a href="{{ head.canonical }}">{{ title }}</a></h1>{% endblock %}>
-				</header>
-			</article>
-		{% endblock %}
-		{% block footer %}
-			<footer id="footer">
-				<a href="{{ path('rapsys_blog_about') }}">{% trans %}About{% endtrans %}</a>
-				{% if copy is defined and copy %}
-					<details><summary>{{ copy.long }}</summary><span>{{ copy.short }} <a href="{{ copy.link }}" title="{{ copy.title }}" rel="author">{{ copy.by }}</a></span></details>
-				{% endif %}
-				{#<a href="{{ path('rapsys_blog_terms_of_service') }}">{% trans %}Terms of service{% endtrans %}</a>#}
-				{% if alternates is defined and alternates %}
-					{% set langs = alternates|keys|filter(v => v|length == 5) %}
-					{% if langs|length > 1 %}
-						<ul>
-							{% for lang in langs %}
-								<li><a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a></li>
-							{% endfor %}
-						</ul>
+			{#{% block sidebar %}<aside id="sidebar"></aside>{% endblock %}#}
+			{% block content %}
+				<article>
+					<header>
+						{% block content_title %}<h1 id="title"><a href="{{ canonical }}">{{ title.page }}</a></h1>{% endblock %}>
+						<p>{{ description }}</p>
+					</header>
+				</article>
+			{% endblock %}
+			{% block footer %}
+				<footer id="footer">
+					<a href="{{ path('rapsysblog_about') }}">{% trans %}About{% endtrans %}</a>
+					{% if copy is defined and copy %}
+						<details><summary>{{ copy.long }}</summary><span>{{ copy.short }} <a href="{{ copy.link }}" title="{{ copy.title }}" rel="author">{{ copy.by }}</a></span></details>
+					{% endif %}
+					{#<a href="{{ path('rapsysblog_terms_of_service') }}">{% trans %}Terms of service{% endtrans %}</a>#}
+					{% if alternates is defined and alternates %}
+						{% set langs = alternates|keys|filter(v => v|length == 5) %}
+						{% if langs|length > 1 %}
+							<ul>
+								{% for lang in langs %}
+									<li><a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a></li>
+								{% endfor %}
+							</ul>
+						{% else %}
+							{% set lang = langs|first %}
+							<a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a>
+						{% endif %}
 					{% else %}
-						{% set lang = langs|first %}
-						<a href="{{ alternates[lang].relative }}" hreflang="{{ lang|replace({'_': '-'}) }}" title="{{ alternates[lang].title }}">{{ alternates[lang].translated }}</a>
+						<span>&nbsp;</span>
 					{% endif %}
-				{% else %}
-					<span>&nbsp;</span>
-				{% endif %}
-			</footer>
+				</footer>
+			{% endblock %}
 		{% endblock %}
-		{% block javascripts %}
+		{% block javascript %}
 			{% stopwatch 'javascript' %}
 				{#{% javascript '@RapsysBlog/js/*.js' %}
 					<script type="text/javascript" src="{{ asset_url }}"></script>
