diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-17 02:47:54 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-17 02:47:54 +0100 |
| commit | fb32aa4ef1253573115766bc48068ea1a7db4082 (patch) | |
| tree | 60c7f10eabc9bd2de4ecf2278b0545a26622416b /app/layout | |
| parent | d63eddf0c5a563d11c880bb700dafc889ee87a3d (diff) | |
Amélioration affichage notifications + améliorations divers niveau affichage + ajout options pour auto-marquage des articles comme lus (à l'ouverture de l'article / du site / de la page)
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_configure.phtml | 5 | ||||
| -rw-r--r-- | app/layout/aside_flux.phtml | 2 | ||||
| -rw-r--r-- | app/layout/header.phtml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 3f62ed9e7..ee527d75e 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -2,7 +2,7 @@ <li class="nav-header">Configuration</li> <li class="item<?php echo Request::actionName () == 'display' ? ' active' : ''; ?>"> - <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a> + <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et lecture</a> </li> <li class="item<?php echo Request::actionName () == 'categorize' ? ' active' : ''; ?>"> <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a> @@ -10,7 +10,4 @@ <li class="item<?php echo Request::actionName () == 'shortcut' ? ' active' : ''; ?>"> <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a> </li> - <li class="item<?php echo Request::actionName () == 'importExport' ? ' active' : ''; ?>"> - <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport')); ?>">Import / Export OPML</a> - </li> </div> diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 0a68a335a..5bf8c8160 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -51,7 +51,9 @@ <li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li> <li class="item"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>">Filtrer</a></li> <li class="separator"></li> + <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> <li class="item"><a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>">Gestion</a></li> + <?php } ?> <li class="item"><a href="<?php echo $feed->website (); ?>">Voir le site</a></li> </ul> </div> diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 351984aa7..852170b64 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -32,11 +32,11 @@ <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li> <li class="dropdown-header">Configuration</li> - <li class="item"><a href="<?php echo _url ('configure', 'display'); ?>">Général et affichage</a></li> + <li class="item"><a href="<?php echo _url ('configure', 'display'); ?>">Général et lecture</a></li> <li class="item"><a href="<?php echo _url ('configure', 'categorize'); ?>">Catégories</a></li> <li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>">Raccourcis</a></li> - <li class="item"><a href="<?php echo _url ('configure', 'importExport'); ?>">Import / Export OPML</a></li> <li class="separator"></li> + <li class="item"><a href="<?php echo _url ('configure', 'importExport'); ?>">Import / Export OPML</a></li> <li class="item"><a href="<?php echo _url ('index', 'about'); ?>">À propos</a></li> </ul> </div> |