summaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-22 22:22:36 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-22 22:22:36 +0100
commitf121df42eedfb0bf618ee952ad9c24d76a016127 (patch)
tree5803b7f770d676182f70e70e4d5e6f0b7f8ee97a /app/layout
parentf4c8b95b831693f66d46f9ae06550b0944280ebe (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)
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/layout.phtml2
-rw-r--r--app/layout/nav_menu.phtml9
2 files changed, 7 insertions, 4 deletions
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); ?>">