diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-30 01:03:32 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-30 01:03:32 +0100 |
| commit | 92efd68a3a13e49fe7bbfb8441611c0dcd639415 (patch) | |
| tree | e6228848744b9369ad4e4e52c541075f5c723b6d /app/layout/header.phtml | |
| parent | 220341b40642771f9b5db97296edfb1913182464 (diff) | |
Début de mode multi-utilisateur avec http_auth
+ Légère optimisation de Minz_View.
+ Encore plus de tests de bibliothèques dans install.php
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126 et
https://github.com/marienfressinaud/FreshRSS/issues/303
Diffstat (limited to 'app/layout/header.phtml')
| -rw-r--r-- | app/layout/header.phtml | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/app/layout/header.phtml b/app/layout/header.phtml index aeb417a6e..0f2c524c4 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -1,9 +1,9 @@ -<?php if (login_is_conf ($this->conf)) { ?> +<?php if (Minz_Configuration::canLogIn()) { ?> <ul class="nav nav-head nav-login"> - <?php if (!is_logged ()) { ?> - <li class="item"><?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a></li> - <?php } else { ?> + <?php if ($this->loginOk) { ?> <li class="item"><?php echo FreshRSS_Themes::icon('logout'); ?> <a class="signout" href="#"><?php echo Minz_Translate::t ('logout'); ?></a></li> + <?php } else { ?> + <li class="item"><?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a></li> <?php } ?> </ul> <?php } ?> @@ -19,9 +19,7 @@ </div> <div class="item search"> - <?php if(!login_is_conf ($this->conf) || - is_logged() || - Minz_Configuration::allowAnonymous()) { ?> + <?php if ($this->loginOk || Minz_Configuration::allowAnonymous()) { ?> <form action="<?php echo _url ('index', 'index'); ?>" method="get"> <div class="stick"> <?php $search = Minz_Request::param ('search', ''); ?> @@ -48,11 +46,10 @@ <?php } ?> </div> - <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> + <?php if ($this->loginOk) { ?> <div class="item configure"> <div class="dropdown"> <div id="dropdown-configure" class="dropdown-target"></div> - <a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo FreshRSS_Themes::icon('configure'); ?></a> <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close">❌</a></li> @@ -65,16 +62,14 @@ <li class="separator"></li> <li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li> <li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li> - <?php if (login_is_conf ($this->conf) && is_logged ()) { ?> + <?php if (Minz_Configuration::canLogIn()) { ?> <li class="separator"></li> <li class="item"><a class="signout" href="#"><?php echo FreshRSS_Themes::icon('logout'); ?> <?php echo Minz_Translate::t ('logout'); ?></a></li> <?php } ?> </ul> </div> </div> - <?php } - - if (login_is_conf ($this->conf) && !is_logged ()) { ?> + <?php } elseif (Minz_Configuration::canLogIn()) { ?> <div class="item configure"> <?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a> </div> |