diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-22 22:22:36 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-22 22:22:36 +0100 |
| commit | f121df42eedfb0bf618ee952ad9c24d76a016127 (patch) | |
| tree | 5803b7f770d676182f70e70e4d5e6f0b7f8ee97a | |
| parent | f4c8b95b831693f66d46f9ae06550b0944280ebe (diff) | |
Montre toggle_aside seulement pour le mode normal
Corrige https://github.com/marienfressinaud/FreshRSS/issues/373
Au passage, introduit une classe au niveau `body` avec le nom de la vue
en cours (pas utilisé pour l'instant)
| -rw-r--r-- | app/FreshRSS.php | 4 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 2 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 9 | ||||
| -rw-r--r-- | app/views/index/index.phtml | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 40e1d23db..c51f91dec 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -106,8 +106,8 @@ class FreshRSS extends Minz_FrontController { private function loadParamsView () { Minz_Session::_param ('language', $this->conf->language); Minz_Translate::init(); - $output = Minz_Request::param ('output'); - if (!$output) { + $output = Minz_Request::param ('output', ''); + if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) { $output = $this->conf->view_mode; Minz_Request::_param ('output', $output); } diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index e67d8a791..d6a1737ee 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -28,7 +28,7 @@ <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"> diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index b9ce33295..edd7707ad 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -1,5 +1,10 @@ +<?php + $actual_view = Minz_Request::param('output', 'normal'); +?> <div class="nav_menu"> + <?php if ($actual_view === 'normal') { ?> <a class="btn toggle_aside" href="#aside_flux"><?php echo FreshRSS_Themes::icon('category'); ?></a> + <?php } ?> <?php if ($this->loginOk) { ?> <a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a> @@ -107,9 +112,7 @@ <?php $url_output = $url; - $actual_view = Minz_Request::param('output', 'normal'); - ?> - <?php if($actual_view !== 'normal') { ?> + if ($actual_view !== 'normal') { ?> <li class="item"> <?php $url_output['params']['output'] = 'normal'; ?> <a class="view_normal" href="<?php echo Minz_Url::display ($url_output); ?>"> diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index 9a7c9f3b9..4545a33e4 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -12,6 +12,8 @@ if ($this->loginOk || Minz_Configuration::allowAnonymous()) { } elseif ($output === 'global') { $this->renderHelper ('view/global_view'); } else { + Minz_Request::_param ('output', 'normal'); + $output = 'normal'; $this->renderHelper ('view/normal_view'); } } elseif ($output === 'rss') { |