From e627385d2a9ce46c285a7507513c09bd9152626b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Aug 2016 21:57:37 +0200
Subject: [PATCH] Minor HTML fixes

Fix aria bug. Move some content before the flush. XHTML syntax.
---
 app/layout/layout.phtml   | 15 ++++++++-------
 app/layout/nav_menu.phtml |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 189d93fbe3d0..4d9ad5458fe0 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -11,16 +11,19 @@
 		<?php echo self::headScript(); ?>
 		<link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" />
 		<link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" />
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>">
-		<link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>">
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>" />
+		<link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>" />
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
 		<meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
+<?php if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
+		<meta name="referrer" content="never" />
 <?php
+	}
 	flush();
 	if (isset($this->callbackBeforeContent)) {
 		call_user_func($this->callbackBeforeContent, $this);
@@ -41,8 +44,6 @@
 		$url_rss['a'] = 'rss';
 ?>
 		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
-<?php } if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
-		<meta name="referrer" content="never" />
 <?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
 		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
 <?php } else { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 17655acbfc25..488c6fdefa94 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -22,7 +22,7 @@
 		?>
 		<a id="toggle-<?php echo $state_str; ?>"
 		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
-		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
+		   role="checkbox" aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
 		   title="<?php echo _t('index.menu.' . $state_str); ?>"
 		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
 		<?php } ?>