Add a subscription tools page

See #1354

It's missing translations. Only English and French are available.
Contributions wanted.

12 files changed, 121 insertions, 4 deletions

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index aa9f18663..6af048b84 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -113,4 +113,11 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 			}
 		}
 	}
+
+	/**
+	 * This action displays the bookmarklet page.
+	 */
+	public function bookmarkletAction() {
+		Minz_View::prependTitle(_t('sub.title.subscription_tools') . ' . ');
+	}
 }
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index 274cf16e1..4fa790107 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Kategorie',
 		'add' => 'Přidat kategorii',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'URL webové stránky',
 		'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Export',
 		'export_opml' => 'Exportovat seznam kanálů (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Přihlásit (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
 		'subscription_management' => 'Správa subskripcí',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Správa subskripcí',
 		'feed_management' => 'Správa RSS kanálů',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index cc98fd25c..aed931ab7 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Kategorie',
 		'add' => 'Eine Kategorie hinzufügen',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'Webseiten-URL',
 		'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Exportieren',
 		'export_opml' => 'Liste der Feeds exportieren (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
 		'import_export' => 'Importieren / Exportieren',
 		'subscription_management' => 'Abonnementverwaltung',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Abonnementverwaltung',
 		'feed_management' => 'Verwaltung der RSS-Feeds',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 86600e882..ca696280a 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Category',
 		'add' => 'Add a category',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'Website URL',
 		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Export',
 		'export_opml' => 'Export list of feeds (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
 		'subscription_management' => 'Subscriptions management',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Subscriptions management',
 		'feed_management' => 'RSS feeds management',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index bb3f2fefc..db31259af 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Glisser ce bouton dans la barre des favoris ou cliquer droit dessus et choisir "Enregistrer ce lien". Ensuite, cliquer sur le bouton "S\'abonner" sur les pages auxquelles vous voulez vous abonner.',
+		'label' => 'S\'abonner',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Catégorie',
 		'add' => 'Ajouter une catégorie',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'URL du site',
 		'pubsubhubbub' => 'Notification instantanée par PubSubHubbub',
 	),
+	'firefox' => array(
+		'documentation' => 'Suivre les étapes décritent <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">ici</a> pour ajouter FreshRSS à la liste des lecteurs de flux dans Firefox.',
+		'title' => 'Lecteur de flux dans Firefox',
+	),
 	'import_export' => array(
 		'export' => 'Exporter',
 		'export_opml' => 'Exporter la liste des flux (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'S’abonner (bookmark FreshRSS)',
 		'import_export' => 'Importer / exporter',
 		'subscription_management' => 'Gestion des abonnements',
+		'subscription_tools' => 'Outils d\'abonnement',
 	),
 	'title' => array(
 		'_' => 'Gestion des abonnements',
 		'feed_management' => 'Gestion des flux RSS',
+		'subscription_tools' => 'Outils d\'abonnement',
 	),
 );
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index 758e322c5..d1ae44e0f 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Categoria',
 		'add' => 'Aggiungi una categoria',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'URL del sito',
 		'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Esporta',
 		'export_opml' => 'Esporta tutta la lista dei feed (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Bookmark (trascina nei preferiti)',
 		'import_export' => 'Importa / esporta',
 		'subscription_management' => 'Gestione sottoscrizioni',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Gestione sottoscrizioni',
 		'feed_management' => 'Gestione RSS feeds',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index e0cebbb4e..8af40e1a8 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -1,6 +1,11 @@
 <?php
 /* Dutch translation by Wanabo. http://www.nieuwskop.be */
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Categorie',
 		'add' => 'Voeg categorie toe',
@@ -39,6 +44,10 @@ return array(
 		'validator' => 'Controleer de geldigheid van de feed',
 		'website' => 'Website URL',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Exporteer',
 		'export_opml' => 'Exporteer lijst van feeds (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Abonneer (FreshRSS bladwijzer)',
 		'import_export' => 'Importeer / exporteer',
 		'subscription_management' => 'Abonnementenbeheer',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Abonnementenbeheer',
 		'feed_management' => 'RSS-feedbeheer',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index 789433ee6..c6cf4e8b3 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Category',
 		'add' => 'Add a category',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'Website URL',
 		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Export',
 		'export_opml' => 'Export list of feeds (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
 		'subscription_management' => 'Subscriptions management',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Subscriptions management',
 		'feed_management' => 'RSS feeds management',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index 7592096d9..ab9b6caa5 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => 'Kategori',
 		'add' => 'Kategori ekle',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'Site URL',
 		'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => 'Dışa aktar',
 		'export_opml' => 'Akış listesini dışarı aktar (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Abonelik (FreshRSS yer imleri)',
 		'import_export' => 'İçe / dışa aktar',
 		'subscription_management' => 'Abonelik yönetimi',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => 'Abonelik yönetimi',
 		'feed_management' => 'RSS  akış yönetimi',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 0c599e986..d30472f81 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'label' => 'Subscribe',
+		'title' => 'Bookmarklet',
+	),
 	'category' => array(
 		'_' => '分类',
 		'add' => '添加分类',
@@ -39,6 +44,10 @@ return array(
 		'website' => '网站 URL',
 		'pubsubhubbub' => 'PubSubHubbub 即时通知',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'title' => 'Firefox feed reader',
+	),
 	'import_export' => array(
 		'export' => '导出',
 		'export_opml' => '导出 RSS 源列表 (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => '订阅 (FreshRSS 书签)',
 		'import_export' => '导入/导出',
 		'subscription_management' => '订阅管理',
+		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
 		'_' => '订阅管理',
 		'feed_management' => 'RSS 源管理',
+		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index e14afe2a7..6d2a5ac8f 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -9,9 +9,7 @@
 		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('sub.menu.import_export'); ?></a>
 	</li>
 
-	<li class="item">
-		<a class="bookmarkClick" href="javascript:(function(){var%20url%20=%20location.href;var%20otherWindow=window.open('about:blank','_blank');otherWindow.opener=null;otherWindow.location='<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url);})();">
-			<?php echo _t('sub.menu.bookmark'); ?>
-		</a>
+	<li class="item<?php echo Minz_Request::controllerName() == 'bookmarklet' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('subscription', 'bookmarklet'); ?>"><?php echo _t('sub.menu.subscription_tools'); ?></a>
 	</li>
 </ul>
diff --git a/app/views/subscription/bookmarklet.phtml b/app/views/subscription/bookmarklet.phtml
new file mode 100644
index 000000000..162501be6
--- /dev/null
+++ b/app/views/subscription/bookmarklet.phtml
@@ -0,0 +1,13 @@
+<?php $this->partial('aside_subscription'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
+
+	<legend><?php echo _t('sub.bookmarklet.title'); ?></legend>
+	<p><a class="btn btn-important" href="javascript:(function(){var%20url%20=%20location.href;var%20otherWindow=window.open('about:blank','_blank');otherWindow.opener=null;otherWindow.location='<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url);})();"><?php echo _t('sub.bookmarklet.label'); ?></a></p>
+	<?php echo _t('sub.bookmarklet.documentation'); ?>
+
+	<legend><?php echo _t('sub.firefox.title'); ?></legend>
+	<p><?php echo _t('sub.firefox.documentation'); ?></p>
+	<pre>browser.contentHandlers.types.number.uri → <?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss=%s</pre>
+</div>
\ No newline at end of file