diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-03-11 22:57:20 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-03-11 22:57:20 +0100 |
| commit | 8dcc0fd65a36adedb12e5d54bafb39e7e553d38b (patch) | |
| tree | bf47fd99928a6782a309cdd1171516029d4f9611 /app/layout/layout.phtml | |
| parent | 919c9c83013ea310f01c309f00dea3f8afa9033e (diff) | |
| parent | 8f4c61a4154641ac22e6d541b6994add3c4803cb (diff) | |
Merge pull request #1119 from FreshRSS/dev1.3.1-beta
Merge dev in 1.3.1-beta
Diffstat (limited to 'app/layout/layout.phtml')
| -rw-r--r-- | app/layout/layout.phtml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 000a6c0d2..99a3717bc 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -1,3 +1,6 @@ +<?php + FreshRSS::preLayout(); +?> <!DOCTYPE html> <html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>"> <head> @@ -5,10 +8,10 @@ <meta name="viewport" content="initial-scale=1.0" /> <?php echo self::headTitle(); ?> <?php echo self::headStyle(); ?> - <?php echo self::headScript(); ?> - <script>//<![CDATA[ + <script id="jsonVars" type="application/json"> <?php $this->renderHelper('javascript_vars'); ?> - //]]></script> + </script> + <?php echo self::headScript(); ?> <?php $url_base = Minz_Request::currentRequest(); if (FreshRSS_Context::$next_id !== '') { @@ -42,7 +45,7 @@ <meta name="robots" content="noindex,nofollow" /> <?php } ?> </head> - <body class="<?php echo Minz_Request::param('output', 'normal'); ?>"> + <body class="<?php echo Minz_Request::actionName(); ?>"> <?php $this->partial('header'); ?> <div id="global"> |