From 3e665bcf9aefe40499b5d16e901d0c7427e367af Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 12 Apr 2014 11:51:44 -0400
Subject: Delete favorite button

I extract drop-down menu actions to make them as button action in the page header.
I removed the favorite button on the category list because it is a duplicate from the button action.
Now button action act as filters and you can combine them.

It is a test to see if we can keep it like that. There is still work to do to extract other actions from the drop-down list.
I did not want to change everything if we don't keep it.

See #376 and #277
---
 app/i18n/fr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/i18n/fr.php')

diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index d89cbb098..299d4d242 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -27,7 +27,6 @@ return array (
 	'subscription_management'	=> 'Gestion des abonnements',
 	'main_stream'			=> 'Flux principal',
 	'all_feeds'			=> 'Tous les flux',
-	'favorite_feeds'		=> 'Favoris (%d)',
 	'not_read'			=> '%d non lu',
 	'not_reads'			=> '%d non lus',
 
@@ -52,6 +51,7 @@ return array (
 	'show_not_reads'		=> 'Afficher les non lus',
 	'show_read'			=> 'Afficher les lus',
 	'show_favorite'			=> 'Afficher les favoris',
+	'show_not_favorite'		=> 'Afficher tout sauf les favoris',
 	'older_first'			=> 'Plus anciens en premier',
 	'newer_first'			=> 'Plus récents en premier',
 
-- 
cgit v1.2.3


From bdd7b7b13e6fdcdb9110cbee3618bf2b5fc89b71 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 14 Apr 2014 18:34:24 -0400
Subject: Revert delete favorite button

---
 app/i18n/en.php             | 1 +
 app/i18n/fr.php             | 1 +
 app/layout/aside_flux.phtml | 9 +++++++++
 3 files changed, 11 insertions(+)

(limited to 'app/i18n/fr.php')

diff --git a/app/i18n/en.php b/app/i18n/en.php
index 01f31eca7..b41fb4281 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -27,6 +27,7 @@ return array (
 	'subscription_management'	=> 'Subscriptions management',
 	'main_stream'			=> 'Main stream',
 	'all_feeds'			=> 'All feeds',
+	'favorite_feeds'		=> 'Favourites (%d)',
 	'not_read'			=> '%d unread',
 	'not_reads'			=> '%d unread',
 
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 299d4d242..e7d61f313 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -27,6 +27,7 @@ return array (
 	'subscription_management'	=> 'Gestion des abonnements',
 	'main_stream'			=> 'Flux principal',
 	'all_feeds'			=> 'Tous les flux',
+	'favorite_feeds'		=> 'Favoris (%d)',
 	'not_read'			=> '%d non lu',
 	'not_reads'			=> '%d non lus',
 
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 0542e6b66..817dae676 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -28,6 +28,15 @@
 			</div>
 		</li>
 
+		<li>
+			<div class="category favorites<?php echo $this->get_c == 's' ? ' active' : ''; ?>">
+				<a data-unread="<?php echo formatNumber($this->nb_favorites['unread']); ?>" class="btn<?php echo $this->get_c == 's' ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 's'; echo Minz_Url::display($arUrl); ?>">
+					<?php echo FreshRSS_Themes::icon('bookmark'); ?>
+					<?php echo Minz_Translate::t('favorite_feeds', formatNumber($this->nb_favorites['all'])); ?>
+				</a>
+			</div>
+		</li>
+
 		<?php
 		foreach ($this->cat_aside as $cat) {
 			$feeds = $cat->feeds ();
-- 
cgit v1.2.3