diff options
Diffstat (limited to 'app/layout/layout.phtml')
| -rw-r--r-- | app/layout/layout.phtml | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index bb4a1f7eb..d6a1737ee 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="<?php echo $this->conf->language (); ?>" xml:lang="<?php echo $this->conf->language (); ?>"> +<html lang="<?php echo $this->conf->language; ?>" xml:lang="<?php echo $this->conf->language; ?>"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="initial-scale=1.0" /> @@ -10,20 +10,25 @@ <?php $this->renderHelper ('javascript_vars'); ?> //]]></script> <?php - $next = isset($this->entryPaginator) ? $this->entryPaginator->next() : ''; - if (!empty($next)) { - $params = Request::params (); - $params['next'] = $next; + if (!empty($this->nextId)) { + $params = Minz_Request::params (); + $params['next'] = $this->nextId; ?> - <link id="prefetch" rel="next prefetch" href="<?php echo Url::display (array ('c' => Request::controllerName (), 'a' => Request::actionName (), 'params' => $params)); ?>" /> + <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display (array ('c' => Minz_Request::controllerName (), 'a' => Minz_Request::actionName (), 'params' => $params)); ?>" /> <?php } ?> - <link rel="icon" href="<?php echo Url::display ('/favicon.ico'); ?>" /> + <link rel="shortcut icon" 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_url)) { ?> - <link rel="alternate" type="application/rss+xml" title="<?php echo htmlspecialchars($this->rss_title, ENT_COMPAT, 'UTF-8'); ?>" href="<?php echo Url::display ($this->rss_url); ?>" /> + <link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display ($this->rss_url); ?>" /> <?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); ?>"> + <meta name="msapplication-TileColor" content="#FFF" /> <meta name="robots" content="noindex,nofollow" /> </head> - <body> + <body class="<?php echo Minz_Request::param('output', 'normal'); ?>"> <?php $this->partial ('header'); ?> <div id="global"> @@ -32,11 +37,11 @@ <?php if (isset ($this->notification)) { - touch(PUBLIC_PATH . '/data/touch.txt', time() + 1); + invalidateHttpCache(); ?> <div class="notification <?php echo $this->notification['type']; ?>"> <?php echo $this->notification['content']; ?> - <a class="close" href=""><i class="icon i_close"></i></a> + <a class="close" href=""><?php echo FreshRSS_Themes::icon('close'); ?></a> </div> <?php } ?> </body> |