diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 21:33:13 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 21:33:13 +0100 |
| commit | 250cd79251f5474915ad2230e786db70643b0ef3 (patch) | |
| tree | 3b757a544dfb0239bd119b953c316d27860f70cf /app/layout | |
| parent | 0e4e16ac55097aa173c7c439367294ebd7645562 (diff) | |
| parent | b23fc3187cb90800aad6417badf7822a8d280b74 (diff) | |
Merge branch '252-extensions' into dev
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_configure.phtml | 4 | ||||
| -rw-r--r-- | app/layout/header.phtml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 25b8037e6..2d4cb9cad 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -22,6 +22,10 @@ Minz_Request::actionName() === 'profile'? ' active' : ''; ?>"> <a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a> </li> + <li class="item<?php echo Minz_Request::controllerName() === 'extension' && + Minz_Request::actionName() === 'index'? ' active' : ''; ?>"> + <a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a> + </li> <?php if (FreshRSS_Auth::hasAccess('admin')) { ?> <li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li> <li class="item<?php echo Minz_Request::controllerName() === 'user' && diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 0c2e171dd..2b968252b 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -64,6 +64,7 @@ if (FreshRSS_Auth::accessNeedsAction()) { <li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a></li> <li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a></li> <li class="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li> + <li class="item"><a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a></li> <?php if (FreshRSS_Auth::hasAccess('admin')) { ?> <li class="separator"></li> <li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li> |