mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-23 07:47:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev

Browse Source
This commit is contained in:
Marien Fressinaud
2014-09-15 15:36:56 +02:00
parent b7b05ca3ce 094450ca94
commit a8e0c26fe2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/layout/aside_flux.phtml
View File

@@ -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>

4
app/layout/nav_menu.phtml
View File

@@ -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>