فهرست منبع

Minor HTML fixes

Fix aria bug. Move some content before the flush. XHTML syntax.
Alexandre Alapetite 10 سال پیش
والد
کامیت
a0230ad70b
2فایلهای تغییر یافته به همراه9 افزوده شده و 8 حذف شده
  1. 8 7
      app/layout/layout.phtml
  2. 1 1
      app/layout/nav_menu.phtml

+ 8 - 7
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 { ?>

+ 1 - 1
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 } ?>