diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 20:50:58 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 20:50:58 +0100 |
| commit | 5f9672111f86c693d843138c00934a6c3eeede45 (patch) | |
| tree | 4aa58d52cb0650c482820db6d3be6606bfa5c163 /app/layout | |
| parent | d3a93ea2905ae50a2365d293f9f3ef3e51bf5f30 (diff) | |
Fix last calls to Minz_Configuration methods
- We have still to fix actualize_script and greader api (refactoring?)
- We have to fix the FreshRSS_Configuration calls
- We have to fix availableLanguages calls
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_feed.phtml | 2 | ||||
| -rw-r--r-- | app/layout/header.phtml | 6 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 1 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index a384455b4..d2612e751 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -15,7 +15,7 @@ <a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a> <a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a> </div> - <?php } elseif (Minz_Configuration::needsLogin()) { ?> + <?php } elseif (FreshRSS_Auth::accessNeedsLogin()) { ?> <a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a> <?php } ?> diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 97e24a1d9..0c2e171dd 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -1,6 +1,6 @@ <?php -if (FreshRSS_Auth::accessNeedLogin()) { +if (FreshRSS_Auth::accessNeedsAction()) { ?><ul class="nav nav-head nav-login"><?php if (FreshRSS_Auth::hasAccess()) { ?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('gen.auth.logout'); ?></a></li><?php @@ -77,14 +77,14 @@ if (FreshRSS_Auth::accessNeedLogin()) { <li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li> <li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li> <?php - if (FreshRSS_Auth::accessNeedLogin()) { + if (FreshRSS_Auth::accessNeedsAction()) { ?><li class="separator"></li> <li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php } ?> </ul> </div> </div> - <?php } elseif (FreshRSS_Auth::accessNeedLogin()) { ?> + <?php } elseif (FreshRSS_Auth::accessNeedsAction()) { ?> <div class="item configure"> <?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a> </div> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index ed8029fe0..083ffd4b3 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -10,7 +10,6 @@ <?php $this->renderHelper('javascript_vars'); ?> //]]></script> <?php - $conf = Minz_Configuration::get('system'); $url_base = Minz_Request::currentRequest(); if (FreshRSS_Context::$next_id !== '') { $url_next = $url_base; diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index eeadb622b..d35a0b5fb 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -193,7 +193,7 @@ <?php echo _i($icon); ?> </a> - <?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymousRefresh()) { ?> + <?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous_refresh) { ?> <a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('gen.action.actualize'); ?>"><?php echo _i('refresh'); ?></a> <?php } ?> </div> |