aboutsummaryrefslogtreecommitdiff
path: root/app/layout/layout.phtml
diff options
context:
space:
mode:
Diffstat (limited to 'app/layout/layout.phtml')
-rw-r--r--app/layout/layout.phtml40
1 files changed, 21 insertions, 19 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 99a3717bc..6906fa05f 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,17 +1,32 @@
-<?php
- FreshRSS::preLayout();
-?>
+<?php FreshRSS::preLayout(); ?>
<!DOCTYPE html>
<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1.0" />
- <?php echo self::headTitle(); ?>
<?php echo self::headStyle(); ?>
<script id="jsonVars" type="application/json">
<?php $this->renderHelper('javascript_vars'); ?>
</script>
<?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'); ?>">
+ <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
+ flush();
+ if (isset($this->callbackBeforeContent)) {
+ call_user_func($this->callbackBeforeContent);
+ }
+?>
+ <?php echo self::headTitle(); ?>
<?php
$url_base = Minz_Request::currentRequest();
if (FreshRSS_Context::$next_id !== '') {
@@ -20,26 +35,13 @@
$url_next['params']['ajax'] = 1;
?>
<link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display($url_next); ?>" />
-<?php } ?>
- <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'); ?>" />
<?php
- if (isset($this->rss_title)) {
+ } if (isset($this->rss_title)) {
$url_rss = $url_base;
$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 } ?>
- <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_robots) { ?>
+<?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 { ?>
<meta name="robots" content="noindex,nofollow" />