choose bookmarklet reading order

2013-07-03 07:32:18 +02:00
parent 55d342861f
commit 4565a7c43f
30 changed files with 221 additions and 162 deletions
--- a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
@@ -38,10 +38,11 @@ public class NextUnreadRedirectPage extends WebPage {
 	public NextUnreadRedirectPage(PageParameters params) {
 		String categoryId = params.get(PARAM_CATEGORYID).toString();
 		String orderParam = params.get(PARAM_READINGORDER).toString();
+		
 		User user = CommaFeedSession.get().getUser();
 		ReadingOrder order = ReadingOrder.desc;
 		
-		if (!StringUtils.isBlank(orderParam) && orderParam.equals("asc")) {
+		if (StringUtils.equals(orderParam, "asc")) {
 			order = ReadingOrder.asc;
 		}

--- a/src/main/resources/i18n/ar.properties
+++ b/src/main/resources/i18n/ar.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension
 about.goodies.firefox_extension=Firefox extension
 about.goodies.opera_extension=Opera extension
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar)
 about.translation=Translation
 about.translation.message=We need your help to translate CommaFeed.
--- a/src/main/resources/i18n/cs.properties
+++ b/src/main/resources/i18n/cs.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Rozšíření pro Chrome
 about.goodies.firefox_extension=Rozšíření pro Firefox
 about.goodies.opera_extension=Rozšíření pro Operu
 about.goodies.subscribe_bookmarklet=Přidat záložku odběru (klik)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Záložka následující nepřečtené položky (přetáhnout k záložkám)
 about.translation=Překlad
 about.translation.message=Pomožte nám s překladem CommaFeed.
--- a/src/main/resources/i18n/cy.properties
+++ b/src/main/resources/i18n/cy.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=estyniad Chrome
 about.goodies.firefox_extension=estyniad Firefox
 about.goodies.opera_extension=estyniad Opera
 about.goodies.subscribe_bookmarklet=Ychwanegu botwm tanysgrifio (clicio)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Botwm eitem nesaf heb ei ddarllen (llusgo i far nodau)
 about.translation=Translation
 about.translation.message=Rydym ni angen dy help i gyfieithu CommaFeed.
--- a/src/main/resources/i18n/da.properties
+++ b/src/main/resources/i18n/da.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome udvidelse
 about.goodies.firefox_extension=Firefox udvidelse
 about.goodies.opera_extension=Opera udvidelse
 about.goodies.subscribe_bookmarklet=Tilføj abonnoment bogmærkeprogram (click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Næste ulæste artikel bogmærkeprogram (træk til bogmærkebaren)
 about.translation=Oversættelse
 about.translation.message=Vi har brug for din hjælp til at oversætte CommaFeed.
--- a/src/main/resources/i18n/de.properties
+++ b/src/main/resources/i18n/de.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome Erweiterung
 about.goodies.firefox_extension=Firefox Add-on
 about.goodies.opera_extension=Opera Add-on
 about.goodies.subscribe_bookmarklet=Abonnieren-bookmarklet (klicken)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Nächster ungelesener Artikel-bookmarklet (in Lesezeichenleiste ziehen)
 about.translation=Übersetzung
 about.translation.message=Wir brauchen deine Hilfe zur Übersetzung von CommaFeed.
--- a/src/main/resources/i18n/en.properties
+++ b/src/main/resources/i18n/en.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension
 about.goodies.firefox_extension=Firefox extension
 about.goodies.opera_extension=Opera extension
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first
+about.goodies.subscribe_bookmarklet_desc=Newest first
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar)
 about.translation=Translation
 about.translation.message=We need your help to translate CommaFeed.
--- a/src/main/resources/i18n/es.properties
+++ b/src/main/resources/i18n/es.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Extensión de Chrome
 about.goodies.firefox_extension=Extensión de Firefox
 about.goodies.opera_extension=Opera extension ####### Needs translation
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=Traducción
 about.translation.message=Necesitamos tu ayuda para ayudar a traducir CommaFeed.
--- a/src/main/resources/i18n/fa.properties
+++ b/src/main/resources/i18n/fa.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=افزونهٔ کروم
 about.goodies.firefox_extension=افزونهٔ فایرفاکس
 about.goodies.opera_extension=افزونهٔ اپرا
 about.goodies.subscribe_bookmarklet=افزودن بوک‌مارک‌لت اشتراک (با کلیک)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=بوک‌مارک‌لت مطلب خوانده نشدهٔ بعدی(با کشیدن و رهاکردن در نوار بوک‌مارک‌لت)
 about.translation=ترجمه
 about.translation.message=ما به کمک شما برای ترجمهٔ کامافید نیازمدیم.
--- a/src/main/resources/i18n/fi.properties
+++ b/src/main/resources/i18n/fi.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-laajennus
 about.goodies.firefox_extension=Firefox-laajennus
 about.goodies.opera_extension=Opera-laajennus
 about.goodies.subscribe_bookmarklet=Lisää tilaus -kirjanmerkki (klikkaa) 
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Seuraava lukematon otsikko -kirjanmerkki (raahaa kirjanmerkkipalkkiin)
 about.translation=Kääntäminen
 about.translation.message=Tarvitsemme apuasi CommaFeedin kääntämiseksi.
--- a/src/main/resources/i18n/fr.properties
+++ b/src/main/resources/i18n/fr.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Extension Chrome
 about.goodies.firefox_extension=Extension Firefox
 about.goodies.opera_extension=Extension Opera
 about.goodies.subscribe_bookmarklet=Bookmarklet d'ajout d'abonnement
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet vers le prochain article non-lu
 about.translation=Traduction
 about.translation.message=Nous avons besoin d'aide pour traduire CommaFeed.
--- a/src/main/resources/i18n/gl.properties
+++ b/src/main/resources/i18n/gl.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Engadido para Chrome
 about.goodies.firefox_extension=Engadido para Firefox
 about.goodies.opera_extension=Engadido para Opera
 about.goodies.subscribe_bookmarklet=Engadir bookmarklet para suscrición(click)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet  de seguinte elemento non lido (arrastre a barra de marcadores)
 about.translation=Tradución
 about.translation.message=Precisamos a túa axuda para traducir CommaFeed.
--- a/src/main/resources/i18n/glk.properties
+++ b/src/main/resources/i18n/glk.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=کرؤمˇ علاوه
 about.goodies.firefox_extension=فایرفاکسˇ علاوه
 about.goodies.opera_extension=اؤپرا علاوه
 about.goodies.subscribe_bookmarklet=افزودن بوک‌مارک‌لت اشتراک (با کلیک)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=بوک‌مارک‌لت مطلب خوانده نشدهٔ بعدی(با کشیدن و رهاکردن در نوار بوک‌مارک‌لت)
 about.translation=واگردان
 about.translation.message=أمه شیمه ایلجاره کامافیدˇ واگردانˇ مئن خأییم.
--- a/src/main/resources/i18n/hu.properties
+++ b/src/main/resources/i18n/hu.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome bővítmény
 about.goodies.firefox_extension=Firefox kiterjesztés
 about.goodies.opera_extension=Opera kiterjesztés
 about.goodies.subscribe_bookmarklet=Feliratkozás bookmarklet hozzáadása (klikkeléssel)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Következő olvasatlan elem bookmarklet (húzza fel a könyvjelzősávba)
 about.translation=Fordítás
 about.translation.message=Segítségét kérjük a CommaFeed fordításához.
--- a/src/main/resources/i18n/it.properties
+++ b/src/main/resources/i18n/it.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Estenzione per Chrome
 about.goodies.firefox_extension=Estensione per Firefox
 about.goodies.opera_extension=Estensione per Opera
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=Traduzioni
 about.translation.message=Abbiamo bisogno del tuo aiuto per tradurre CommaFeed.
--- a/src/main/resources/i18n/ko.properties
+++ b/src/main/resources/i18n/ko.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension ####### Needs translation
 about.goodies.firefox_extension=Firefox extension ####### Needs translation
 about.goodies.opera_extension=Opera extension ####### Needs translation
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=번역
 about.translation.message=CommaFeed를 번역할려면 당신의 도움이 필요합니다.
--- a/src/main/resources/i18n/ms.properties
+++ b/src/main/resources/i18n/ms.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension
 about.goodies.firefox_extension=Firefox extension
 about.goodies.opera_extension=Opera extension
 about.goodies.subscribe_bookmarklet=Jana bookmarklet langganan (klik)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Item bookmarklet yang belum dibaca seterusnya (seret ke bookmark bar)
 about.translation=Terjemahan
 about.translation.message=Kami perlukan bantuan anda untuk menterjemahkan CommaFeed.
@@ -135,3 +137,4 @@ about.shortcuts.open_in_new_tab_mark_as_read=buka entry di tab baru dan tanda te
 about.shortcuts.fullscreen=toggle mod skrin penuh
 about.shortcuts.font_size=kecil/besar fon entry kini
 about.shortcuts.feed_search=pergi ke langganan dengan nama langganan
+
--- a/src/main/resources/i18n/nb.properties
+++ b/src/main/resources/i18n/nb.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-utvidelse
 about.goodies.firefox_extension=Firefox-utvidelse
 about.goodies.opera_extension=Opera-utvidelse
 about.goodies.subscribe_bookmarklet=Nytt abonnement-bokmerkeprogram (klikk)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Neste uleste artikkel-bokmerkeprogram (dra til bokmerkemenyen)
 about.translation=Oversettelse
 about.translation.message=Vi trenger din hjelp til å oversette CommaFeed.
--- a/src/main/resources/i18n/nl.properties
+++ b/src/main/resources/i18n/nl.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome extension ####### Needs translation
 about.goodies.firefox_extension=Firefox extension ####### Needs translation
 about.goodies.opera_extension=Opera extension ####### Needs translation
 about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click) ####### Needs translation
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar) ####### Needs translation
 about.translation=Vertalingen
 about.translation.message=We hebben jouw hulp nodig om CommaFeed te vertalen.
--- a/src/main/resources/i18n/nn.properties
+++ b/src/main/resources/i18n/nn.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-utviding
 about.goodies.firefox_extension=Firefox-utviding
 about.goodies.opera_extension=Opera-utviding
 about.goodies.subscribe_bookmarklet=Nytt abonnement-bokmerkjeprogram (klikk)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Neste ulesne artikkel-bokmerkeprogram (dra til bokmerkemenyen)
 about.translation=Omsetjing
 about.translation.message=Vi behøver di hjelp til å omsetje CommaFeed.
--- a/src/main/resources/i18n/pl.properties
+++ b/src/main/resources/i18n/pl.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Dodatek do Chrome
 about.goodies.firefox_extension=Dodatek do Firefoxa
 about.goodies.opera_extension=Dodatek do Opery
 about.goodies.subscribe_bookmarklet=Dodaj subskrybcje jako skryptozakładkę (kliknij)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Następny nieprzeczytany element jako skryptozakładka (przeciągnij na pasek zakładek)
 about.translation=Tłumaczenia
 about.translation.message=Potrzebujemy pomocy w tłumaczeniu CommaFeed.
--- a/src/main/resources/i18n/pt.properties
+++ b/src/main/resources/i18n/pt.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Extensão para o Chrome
 about.goodies.firefox_extension=Extensão para o Firefox
 about.goodies.opera_extension=Extensão para o Opera
 about.goodies.subscribe_bookmarklet=Bookmarklet para adicionar inscrição (clique)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet para o próximo item não lido (arraste para a barra de favoritos)
 about.translation=Tradução
 about.translation.message=Precisamos de sua ajuda para traduzir CommaFeed.
--- a/src/main/resources/i18n/ru.properties
+++ b/src/main/resources/i18n/ru.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Расширение для Хрома
 about.goodies.firefox_extension=Расширение для Файрфокса
 about.goodies.opera_extension=Расширение для Оперы
 about.goodies.subscribe_bookmarklet=Закладка для быстрой подписки на ленты (нужно кликнуть)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Открыть следующую непочитанную запись в новой вкладке (перетащить на панель закладок)
 about.translation=Перевод
 about.translation.message=Нам нужна ваша помощь в переводе CommaFeed на другие языки.
--- a/src/main/resources/i18n/sk.properties
+++ b/src/main/resources/i18n/sk.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Rozšírenie pre Chrome
 about.goodies.firefox_extension=Rozšírenie pre Firefox
 about.goodies.opera_extension=Rozšírenie pre Opera
 about.goodies.subscribe_bookmarklet=Pridať záložku odoberania(kliknite)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Záložka nasledujúcej neprečítanej položky(pretiahuť k záložkám)
 about.translation=Preklad
 about.translation.message=Pomôžte nám s prekladom CommaFeed.
--- a/src/main/resources/i18n/sv.properties
+++ b/src/main/resources/i18n/sv.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome-tillägg
 about.goodies.firefox_extension=Firefox-tillägg
 about.goodies.opera_extension=Opera-tillägg
 about.goodies.subscribe_bookmarklet=Bokmärke för tillägg av prenumeration (klicka)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bokmärke för nästa olästa post (dra till bokmärkesfält)
 about.translation=Översättning
 about.translation.message=Vi behöver din hjälp med att översätta CommaFeed.
--- a/src/main/resources/i18n/tr.properties
+++ b/src/main/resources/i18n/tr.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome eklentisi
 about.goodies.firefox_extension=Firefox eklentisi
 about.goodies.opera_extension=Opera eklentisi
 about.goodies.subscribe_bookmarklet=Bookmarklet'a abonelik ekle (tıklayın)
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=Bookmarklet'daki en son okunmamış ileti (Sık kullanılan çubuğuna sürükleyin)
 about.translation=Çeviri
 about.translation.message=CommaFeed'i çevirmek için yardımınıza ihtiyacımız var.
--- a/src/main/resources/i18n/zh.properties
+++ b/src/main/resources/i18n/zh.properties
@@ -108,6 +108,8 @@ about.goodies.chrome_extension=Chrome 扩展
 about.goodies.firefox_extension=Firefox 扩展
 about.goodies.opera_extension=Opera 扩展
 about.goodies.subscribe_bookmarklet=添加一个订阅书签 (点击这) 
+about.goodies.subscribe_bookmarklet_asc=Oldest first ####### Needs translation
+about.goodies.subscribe_bookmarklet_desc=Newest first ####### Needs translation
 about.goodies.next_unread_bookmarklet=最新未读文章书签 (拖动到书签栏上) 
 about.translation=翻译
 about.translation.message=我们需要您来帮助翻译 CommaFeed。
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -1272,6 +1272,7 @@ function($scope, CategoryService, AnalyticsService) {
 	AnalyticsService.track();
 	$scope.CategoryService = CategoryService;
 	$scope.categoryId = 'all';
+	$scope.order = 'desc';

 } ]);

--- a/src/main/webapp/sass/components/_help.scss
+++ b/src/main/webapp/sass/components/_help.scss
@@ -3,7 +3,7 @@
 	line-height: 10px;
 }

-.help .category-select {
+.help .bookmarklet-select {
 	margin: 0;
 	padding: 0;
 	height: auto;
--- a/src/main/webapp/templates/feeds.help.html
+++ b/src/main/webapp/templates/feeds.help.html
@@ -57,9 +57,13 @@
 			<p>
 				${about.goodies.next_unread_bookmarklet}: ${subscribe.category} 
 				<select ng-model="categoryId" ng-options="cat.id as cat.name for cat in CategoryService.flatCategories"
-					class="category-select">
+					class="bookmarklet-select">
 				</select> 
-				<a href="next?category={{categoryId}}" target="_blank">${global.link}</a>
+				<select ng-model="order" class="bookmarklet-select">
+					<option value="desc">${about.goodies.subscribe_bookmarklet_desc}</option>
+					<option value="asc">${about.goodies.subscribe_bookmarklet_asc}</option>
+				</select> 
+				<a href="next?category={{categoryId}}&order={{order}}" target="_blank">${global.link}</a>
 			</p>
 		</div>