From f121df42eedfb0bf618ee952ad9c24d76a016127 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 22 Jan 2014 22:22:36 +0100 Subject: Montre toggle_aside seulement pour le mode normal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- app/FreshRSS.php | 4 ++-- app/layout/layout.phtml | 2 +- app/layout/nav_menu.phtml | 9 ++++++--- 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 @@ - + partial ('header'); ?>

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 @@ +

+ + loginOk) { ?> @@ -107,9 +112,7 @@ - + if ($actual_view !== 'normal') { ?>

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') { -- cgit v1.2.3