mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-07-17 18:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Montre toggle_aside seulement pour le mode normal

Browse Source 
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)
This commit is contained in:
Alexandre Alapetite
2014-01-22 22:22:36 +01:00
parent f4c8b95b83
commit f121df42ee
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/FreshRSS.php
View File

@@ -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);
}

2
app/layout/layout.phtml
View File

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

9
app/layout/nav_menu.phtml
View File

@@ -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); ?>">

2
app/views/index/index.phtml
View File

@@ -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') {