diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-15 15:36:56 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-15 15:36:56 +0200 |
| commit | a8e0c26fe204ffd53b8d6498de3fa36e68ac0423 (patch) | |
| tree | 8adc3b5c3458629233afd5403f64c89629faf227 | |
| parent | b7b05ca3cefbb35a5174da4d4d734107f19c24a1 (diff) | |
| parent | 094450ca942b14fdeab69ad05e4d9b9ef1cc7f9e (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
| -rw-r--r-- | app/layout/aside_flux.phtml | 2 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 357aa1cd3..9688a3273 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -4,7 +4,7 @@ <ul class="categories"> <?php if ($this->loginOk) { ?> <li> - <div class="stick"> + <div class="stick configure-feeds"> <a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>"><?php echo Minz_Translate::t ('subscription_management'); ?></a> <a class="btn btn-important" href="<?php echo _url ('configure', 'categorize'); ?>" title="<?php echo Minz_Translate::t ('categories_management'); ?>"><?php echo FreshRSS_Themes::icon('category-white'); ?></a> </div> diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 7cd15c1a3..c69f95959 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -7,7 +7,7 @@ <?php } ?> <?php if ($this->loginOk) { ?> - <div class="stick"> + <div id="nav_menu_actions" class="stick"> <?php $url_state = $this->url; @@ -269,7 +269,7 @@ $url_order = $this->url; $url_order['params']['order'] = $order; ?> - <a class="btn" href="<?php echo Minz_Url::display ($url_order); ?>" title="<?php echo Minz_Translate::t ($title); ?>"> + <a id="toggle-order" class="btn" href="<?php echo Minz_Url::display ($url_order); ?>" title="<?php echo Minz_Translate::t ($title); ?>"> <?php echo FreshRSS_Themes::icon($icon); ?> </a> |