diff options
| author |  plopoyop <clement@iMac-de-Clement.local>
| 2014-09-19 09:07:11 +0200 |
|---|---|---|
| committer | plopoyop <clement@iMac-de-Clement.local>
| 2014-09-19 09:07:11 +0200 |
| commit | ffbfbb92cc89c5ae07e0a28ee3477fcd0c44505d (patch) | |
| tree | 827469859e1300f3525196658b7191fa1dbb40f9 /app/layout | |
| parent | 4fd1478e82dabaa042f4e80d4b9b2830f29a7da8 (diff) | |
| parent | 2f5304a1f7052bce1315f2ed85141568f0995e7c (diff) | |
Merge branch 'dev' of https://github.com/marienfressinaud/FreshRSS into dev
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_configure.phtml | 16 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 03bea4836..d5c9bf4c9 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -1,32 +1,32 @@ <ul class="nav nav-list aside"> <li class="nav-header"><?php echo _t('configuration'); ?></li> - <li class="item<?php echo Minz_Request::actionName() == 'display' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'display' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a> </li> - <li class="item<?php echo Minz_Request::actionName() == 'reading' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'reading' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a> </li> - <li class="item<?php echo Minz_Request::actionName() == 'archiving' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'archiving' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a> </li> - <li class="item<?php echo Minz_Request::actionName() == 'sharing' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'sharing' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a> </li> - <li class="item<?php echo Minz_Request::actionName() == 'shortcut' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'shortcut' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a> </li> - <li class="item<?php echo Minz_Request::actionName() == 'queries' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a> </li> <li class="separator"></li> - <li class="item<?php echo Minz_Request::actionName() == 'users' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::actionName() === 'users' ? ' active' : ''; ?>"> <a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a> </li> <?php $current_user = Minz_Session::param('currentUser', ''); if (Minz_Configuration::isAdmin($current_user)) { ?> - <li class="item<?php echo Minz_Request::controllerName() == 'update' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>"> <a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a> </li> <?php } ?> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 96a88d245..f95f45b5e 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -13,6 +13,7 @@ if (!empty($this->nextId)) { $params = Minz_Request::params(); $params['next'] = $this->nextId; + $params['ajax'] = 1; ?> <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display(array('c' => Minz_Request::controllerName(), 'a' => Minz_Request::actionName(), 'params' => $params)); ?>" /> <?php } ?> |