Merge pull request #1568 from aledeg/bookmarklet-page

Add a subscription tools page

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') . ' . ');
+	}
 }

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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'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',// TODO
 	),
 	'title' => array(
 		'_' => 'Správa subskripcí',
 		'feed_management' => 'Správa RSS kanálů',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'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',// TODO
 	),
 	'title' => array(
 		'_' => 'Abonnementverwaltung',
 		'feed_management' => 'Verwaltung der RSS-Feeds',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

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',
 	),
 );

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',
 	),
 );

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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'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',// TODO
 	),
 	'title' => array(
 		'_' => 'Gestione sottoscrizioni',
 		'feed_management' => 'Gestione RSS feeds',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'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',// TODO
 	),
 	'title' => array(
 		'_' => 'Abonnementenbeheer',
 		'feed_management' => 'RSS-feedbeheer',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

app/i18n/ru/sub.php

@@ -1,62 +1,73 @@
 <?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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'category' => array(
-		'_' => 'Category',
-		'add' => 'Add a category',
-		'empty' => 'Empty category',
-		'new' => 'New category',
+		'_' => 'Category',// TODO
+		'add' => 'Add a category',// TODO
+		'empty' => 'Empty category',// TODO
+		'new' => 'New category',// TODO
 	),
 	'feed' => array(
-		'add' => 'Add a RSS feed',
-		'advanced' => 'Advanced',
-		'archiving' => 'Archivage',
+		'add' => 'Add a RSS feed',// TODO
+		'advanced' => 'Advanced',// TODO
+		'archiving' => 'Archivage',// TODO
 		'auth' => array(
-			'configuration' => 'Login',
-			'help' => 'Connection allows to access HTTP protected RSS feeds',
-			'http' => 'HTTP Authentication',
-			'password' => 'HTTP password',
-			'username' => 'HTTP username',
+			'configuration' => 'Login',// TODO
+			'help' => 'Connection allows to access HTTP protected RSS feeds',// TODO
+			'http' => 'HTTP Authentication',// TODO
+			'password' => 'HTTP password',// TODO
+			'username' => 'HTTP username',// TODO
 		),
-		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',
-		'css_path' => 'Articles CSS path on original website',
-		'description' => 'Description',
-		'empty' => 'This feed is empty. Please verify that it is still maintained.',
-		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
-		'in_main_stream' => 'Show in main stream',
-		'informations' => 'Information',
-		'keep_history' => 'Minimum number of articles to keep',
-		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',
-		'no_selected' => 'No feed selected.',
-		'number_entries' => '%d articles',
-		'stats' => 'Statistics',
-		'think_to_add' => 'You may add some feeds.',
-		'title' => 'Title',
-		'title_add' => 'Add a RSS feed',
-		'ttl' => 'Do not automatically refresh more often than',
-		'url' => 'Feed URL',
-		'validator' => 'Check the validity of the feed',
-		'website' => 'Website URL',
-		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
+		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',// TODO
+		'css_path' => 'Articles CSS path on original website',// TODO
+		'description' => 'Description',// TODO
+		'empty' => 'This feed is empty. Please verify that it is still maintained.',// TODO
+		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',// TODO
+		'in_main_stream' => 'Show in main stream',// TODO
+		'informations' => 'Information',// TODO
+		'keep_history' => 'Minimum number of articles to keep',// TODO
+		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',// TODO
+		'no_selected' => 'No feed selected.',// TODO
+		'number_entries' => '%d articles',// TODO
+		'stats' => 'Statistics',// TODO
+		'think_to_add' => 'You may add some feeds.',// TODO
+		'title' => 'Title',// TODO
+		'title_add' => 'Add a RSS feed',// TODO
+		'ttl' => 'Do not automatically refresh more often than',// TODO
+		'url' => 'Feed URL',// TODO
+		'validator' => 'Check the validity of the feed',// TODO
+		'website' => 'Website URL',// TODO
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',// TODO
+	),
+	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
 	),
 	'import_export' => array(
-		'export' => 'Export',
-		'export_opml' => 'Export list of feeds (OPML)',
-		'export_starred' => 'Export your favourites',
-		'feed_list' => 'List of %s articles',
-		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',
-		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',
-		'import' => 'Import',
-		'starred_list' => 'List of favourite articles',
-		'title' => 'Import / export',
+		'export' => 'Export',// TODO
+		'export_opml' => 'Export list of feeds (OPML)',// TODO
+		'export_starred' => 'Export your favourites',// TODO
+		'feed_list' => 'List of %s articles',// TODO
+		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',// TODO
+		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',// TODO
+		'import' => 'Import',// TODO
+		'starred_list' => 'List of favourite articles',// TODO
+		'title' => 'Import / export',// TODO
 	),
 	'menu' => array(
-		'bookmark' => 'Subscribe (FreshRSS bookmark)',
-		'import_export' => 'Import / export',
-		'subscription_management' => 'Subscriptions management',
+		'bookmark' => 'Subscribe (FreshRSS bookmark)',// TODO
+		'import_export' => 'Import / export',// TODO
+		'subscription_management' => 'Subscriptions management',// TODO
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 	'title' => array(
-		'_' => 'Subscriptions management',
-		'feed_management' => 'RSS feeds management',
+		'_' => 'Subscriptions management',// TODO
+		'feed_management' => 'RSS feeds management',// TODO
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'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',// TODO
 	),
 	'title' => array(
 		'_' => 'Abonelik yönetimi',
 		'feed_management' => 'RSS  akış yönetimi',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

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.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'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.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'import_export' => array(
 		'export' => '导出',
 		'export_opml' => '导出 RSS 源列表 (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => '订阅 (FreshRSS 书签)',
 		'import_export' => '导入/导出',
 		'subscription_management' => '订阅管理',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 	'title' => array(
 		'_' => '订阅管理',
 		'feed_management' => 'RSS 源管理',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );

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>

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>