From b67f0a13468c2e640955d07e98445f8415173e1e Mon Sep 17 00:00:00 2001 From: MageFroh Date: Mon, 1 Jul 2013 21:25:09 +0100 Subject: [PATCH 1/3] feed title is now a link to the feed website --- .../java/com/commafeed/frontend/model/Entries.java | 11 +++++++++++ .../commafeed/frontend/rest/resources/FeedREST.java | 1 + src/main/webapp/js/controllers.js | 1 + src/main/webapp/templates/feeds.view.html | 5 ++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/commafeed/frontend/model/Entries.java b/src/main/java/com/commafeed/frontend/model/Entries.java index 83820925..1ce2a0a6 100644 --- a/src/main/java/com/commafeed/frontend/model/Entries.java +++ b/src/main/java/com/commafeed/frontend/model/Entries.java @@ -26,6 +26,9 @@ public class Entries implements Serializable { @ApiProperty("times the server tried to refresh the feed and failed") private int errorCount; + @ApiProperty("URL of the website, extracted from the feed") + private String feedLink; + @ApiProperty("list generation timestamp") private long timestamp; @@ -67,6 +70,14 @@ public class Entries implements Serializable { this.errorCount = errorCount; } + public String getFeedLink() { + return feedLink; + } + + public void setFeedLink(String feedLink) { + this.feedLink = feedLink; + } + public long getTimestamp() { return timestamp; } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java index d0e91681..27c97501 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java @@ -99,6 +99,7 @@ public class FeedREST extends AbstractResourceREST { entries.setName(subscription.getTitle()); entries.setMessage(subscription.getFeed().getMessage()); entries.setErrorCount(subscription.getFeed().getErrorCount()); + entries.setFeedLink(subscription.getFeed().getLink()); List list = null; if (unreadOnly) { diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index f2e0283b..380d5fc0 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -703,6 +703,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer $scope.timestamp = data.timestamp; $scope.busy = false; $scope.hasMore = data.hasMore; + $scope.feedLink = data.feedLink; }; if (!$scope.keywords) { var service = $scope.selectedType == 'feed' ? FeedService diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index 62da49f4..cc5cef8f 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -4,7 +4,10 @@ ${tree.all} ${tree.starred} - {{name}} + + {{name}} + {{name}} +   » From 65dd0ec8bd484e6a7f1d32e996844579993e5933 Mon Sep 17 00:00:00 2001 From: MageFroh Date: Mon, 1 Jul 2013 21:42:26 +0100 Subject: [PATCH 2/3] show feed website link in feed details --- src/main/resources/i18n/ar.properties | 1 + src/main/resources/i18n/cs.properties | 1 + src/main/resources/i18n/cy.properties | 1 + src/main/resources/i18n/da.properties | 1 + src/main/resources/i18n/de.properties | 1 + src/main/resources/i18n/en.properties | 1 + src/main/resources/i18n/es.properties | 1 + src/main/resources/i18n/fa.properties | 1 + src/main/resources/i18n/fi.properties | 1 + src/main/resources/i18n/fr.properties | 1 + src/main/resources/i18n/gl.properties | 1 + src/main/resources/i18n/glk.properties | 1 + src/main/resources/i18n/hu.properties | 1 + src/main/resources/i18n/it.properties | 1 + src/main/resources/i18n/ko.properties | 1 + src/main/resources/i18n/ms.properties | 1 + src/main/resources/i18n/nb.properties | 1 + src/main/resources/i18n/nl.properties | 1 + src/main/resources/i18n/nn.properties | 1 + src/main/resources/i18n/pl.properties | 1 + src/main/resources/i18n/pt.properties | 1 + src/main/resources/i18n/ru.properties | 1 + src/main/resources/i18n/sk.properties | 1 + src/main/resources/i18n/sv.properties | 1 + src/main/resources/i18n/tr.properties | 1 + src/main/resources/i18n/zh.properties | 1 + src/main/webapp/templates/feeds.feed_details.html | 6 ++++++ 27 files changed, 32 insertions(+) diff --git a/src/main/resources/i18n/ar.properties b/src/main/resources/i18n/ar.properties index 20b5b8bc..3e3e79bb 100644 --- a/src/main/resources/i18n/ar.properties +++ b/src/main/resources/i18n/ar.properties @@ -67,6 +67,7 @@ settings.custom_css=Custom CSS details.feed_details=Feed details details.url=URL +details.website=Website ####### Needs translation details.name=Name details.category=Category details.position=Position diff --git a/src/main/resources/i18n/cs.properties b/src/main/resources/i18n/cs.properties index d1f8514c..e2b9cb49 100644 --- a/src/main/resources/i18n/cs.properties +++ b/src/main/resources/i18n/cs.properties @@ -67,6 +67,7 @@ settings.custom_css=Vlastní téma (CSS) details.feed_details=Detaily odběru details.url=URL odkaz +details.website=Website ####### Needs translation details.name=Název details.category=Kategorie details.position=Pozice diff --git a/src/main/resources/i18n/cy.properties b/src/main/resources/i18n/cy.properties index 42e481f7..5080da4e 100644 --- a/src/main/resources/i18n/cy.properties +++ b/src/main/resources/i18n/cy.properties @@ -67,6 +67,7 @@ settings.custom_css=CSS wedi'i addasu details.feed_details=Manylion ffrwd details.url=URL +details.website=Website ####### Needs translation details.name=Enw details.category=Categori details.position=Safle diff --git a/src/main/resources/i18n/da.properties b/src/main/resources/i18n/da.properties index fc8e7294..4a4cb501 100644 --- a/src/main/resources/i18n/da.properties +++ b/src/main/resources/i18n/da.properties @@ -67,6 +67,7 @@ settings.custom_css=Brugerdefineret CSS details.feed_details=Abonnementsdetaljer details.url=URL +details.website=Website ####### Needs translation details.name=Navn details.category=Kategori details.position=Position diff --git a/src/main/resources/i18n/de.properties b/src/main/resources/i18n/de.properties index b2d5ee67..f7970c83 100644 --- a/src/main/resources/i18n/de.properties +++ b/src/main/resources/i18n/de.properties @@ -67,6 +67,7 @@ settings.custom_css=Eigenes CSS details.feed_details=Feed details details.url=URL +details.website=Website ####### Needs translation details.name=Name details.category=Kategorie details.position=Position diff --git a/src/main/resources/i18n/en.properties b/src/main/resources/i18n/en.properties index eedd1576..5f60ac4d 100644 --- a/src/main/resources/i18n/en.properties +++ b/src/main/resources/i18n/en.properties @@ -67,6 +67,7 @@ settings.custom_css=Custom CSS details.feed_details=Feed details details.url=URL +details.website=Website details.name=Name details.category=Category details.position=Position diff --git a/src/main/resources/i18n/es.properties b/src/main/resources/i18n/es.properties index d5dfab5d..99cdd282 100644 --- a/src/main/resources/i18n/es.properties +++ b/src/main/resources/i18n/es.properties @@ -67,6 +67,7 @@ settings.custom_css=CSS Personalizado details.feed_details=Detalles de Canales details.url=URL +details.website=Website ####### Needs translation details.name=Nombre details.category=Categoría details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/fa.properties b/src/main/resources/i18n/fa.properties index 4bd2ad7b..0b0275b3 100644 --- a/src/main/resources/i18n/fa.properties +++ b/src/main/resources/i18n/fa.properties @@ -67,6 +67,7 @@ settings.custom_css=سی‌اس‌اس شخصی‌سازی‌شده details.feed_details=جزئیات خوراک details.url=نشانی +details.website=Website ####### Needs translation details.name=نام details.category=دسته details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/fi.properties b/src/main/resources/i18n/fi.properties index abcdf30f..711bbc7c 100644 --- a/src/main/resources/i18n/fi.properties +++ b/src/main/resources/i18n/fi.properties @@ -67,6 +67,7 @@ settings.custom_css=Oma CSS details.feed_details=Tilauksen tiedot details.url=Osoite +details.website=Website ####### Needs translation details.name=Nimi details.category=Kansio details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/fr.properties b/src/main/resources/i18n/fr.properties index c7f4f4eb..d05ba941 100644 --- a/src/main/resources/i18n/fr.properties +++ b/src/main/resources/i18n/fr.properties @@ -67,6 +67,7 @@ settings.custom_css=CSS personnelle details.feed_details=Détails du flux details.url=URL +details.website=Site web details.name=Nom details.category=Catégorie details.position=Position diff --git a/src/main/resources/i18n/gl.properties b/src/main/resources/i18n/gl.properties index 88110053..9446a5b5 100644 --- a/src/main/resources/i18n/gl.properties +++ b/src/main/resources/i18n/gl.properties @@ -67,6 +67,7 @@ settings.custom_css=CSS Personalizado details.feed_details=Detalles de fontes details.url=URL +details.website=Website ####### Needs translation details.name=Nome details.category=Categoría details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/glk.properties b/src/main/resources/i18n/glk.properties index 87e7e859..78ecee99 100644 --- a/src/main/resources/i18n/glk.properties +++ b/src/main/resources/i18n/glk.properties @@ -67,6 +67,7 @@ settings.custom_css=سی‌اس‌اس شخصی‌سازی‌شده details.feed_details=جزئیات خوراک details.url=نشانی +details.website=Website ####### Needs translation details.name=نام details.category=جرگه details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/hu.properties b/src/main/resources/i18n/hu.properties index f0ba9936..94bf8977 100644 --- a/src/main/resources/i18n/hu.properties +++ b/src/main/resources/i18n/hu.properties @@ -67,6 +67,7 @@ settings.custom_css=Saját CSS details.feed_details=Hírcsatorna részletei details.url=URL +details.website=Website ####### Needs translation details.name=Név details.category=Kategória details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/it.properties b/src/main/resources/i18n/it.properties index 327bc8c8..e805b65f 100644 --- a/src/main/resources/i18n/it.properties +++ b/src/main/resources/i18n/it.properties @@ -67,6 +67,7 @@ settings.custom_css=Css modificato details.feed_details=Dettagli feed details.url=URL +details.website=Website ####### Needs translation details.name=Nome details.category=Categoria details.position=Posizione diff --git a/src/main/resources/i18n/ko.properties b/src/main/resources/i18n/ko.properties index 6f6ac6df..f053f1d2 100644 --- a/src/main/resources/i18n/ko.properties +++ b/src/main/resources/i18n/ko.properties @@ -67,6 +67,7 @@ settings.custom_css=커스톰 CSS details.feed_details=피드 세부 details.url=유알엘 +details.website=Website ####### Needs translation details.name=이름 details.category=카테고리 details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/ms.properties b/src/main/resources/i18n/ms.properties index e5b5bf75..6fcd0230 100644 --- a/src/main/resources/i18n/ms.properties +++ b/src/main/resources/i18n/ms.properties @@ -67,6 +67,7 @@ settings.custom_css=Custom CSS details.feed_details=Butir-butir Feed details.url=URL +details.website=Website ####### Needs translation details.name=Nama details.category=Kategori details.position=Posisi diff --git a/src/main/resources/i18n/nb.properties b/src/main/resources/i18n/nb.properties index f4259fbc..66252e0f 100644 --- a/src/main/resources/i18n/nb.properties +++ b/src/main/resources/i18n/nb.properties @@ -67,6 +67,7 @@ settings.custom_css=Egendefinert CSS details.feed_details=Abonnementsdetaljer details.url=URL +details.website=Website ####### Needs translation details.name=Navn details.category=Kategori details.position=Posisjon diff --git a/src/main/resources/i18n/nl.properties b/src/main/resources/i18n/nl.properties index 2984257f..39bceb60 100644 --- a/src/main/resources/i18n/nl.properties +++ b/src/main/resources/i18n/nl.properties @@ -67,6 +67,7 @@ settings.custom_css=Op maat gemaakte CSS details.feed_details=Feed Details details.url=URL +details.website=Website ####### Needs translation details.name=Naam details.category=Categorie details.position=Position ####### Needs translation diff --git a/src/main/resources/i18n/nn.properties b/src/main/resources/i18n/nn.properties index a4ae3798..7f771a35 100644 --- a/src/main/resources/i18n/nn.properties +++ b/src/main/resources/i18n/nn.properties @@ -67,6 +67,7 @@ settings.custom_css=Skreddarsydd CSS details.feed_details=Abonnementsdetaljar details.url=URL +details.website=Website ####### Needs translation details.name=Namn details.category=Kategori details.position=Posisjon diff --git a/src/main/resources/i18n/pl.properties b/src/main/resources/i18n/pl.properties index 99ea65b6..a9a54df9 100644 --- a/src/main/resources/i18n/pl.properties +++ b/src/main/resources/i18n/pl.properties @@ -67,6 +67,7 @@ settings.custom_css=Własny styl CSS details.feed_details=Szczegóły kanału details.url=URL +details.website=Website ####### Needs translation details.name=Nazwa details.category=Kategoria details.position=Pozycja diff --git a/src/main/resources/i18n/pt.properties b/src/main/resources/i18n/pt.properties index 99180998..626d5deb 100644 --- a/src/main/resources/i18n/pt.properties +++ b/src/main/resources/i18n/pt.properties @@ -67,6 +67,7 @@ settings.custom_css=CSS personalizado details.feed_details=Detalhes do feed details.url=URL +details.website=Website ####### Needs translation details.name=Nome details.category=Categoria details.position=Posição diff --git a/src/main/resources/i18n/ru.properties b/src/main/resources/i18n/ru.properties index 0509ef93..4b2f16df 100644 --- a/src/main/resources/i18n/ru.properties +++ b/src/main/resources/i18n/ru.properties @@ -67,6 +67,7 @@ settings.custom_css=Собственная CSS details.feed_details=Информация о ленте details.url=URL +details.website=Website ####### Needs translation details.name=Название details.category=Категория details.position=Позиция diff --git a/src/main/resources/i18n/sk.properties b/src/main/resources/i18n/sk.properties index 468a975e..314a9792 100644 --- a/src/main/resources/i18n/sk.properties +++ b/src/main/resources/i18n/sk.properties @@ -67,6 +67,7 @@ settings.custom_css=Vlastný motív (CSS) details.feed_details=Detaily odoberania details.url=URL odkaz +details.website=Website ####### Needs translation details.name=Meno details.category=Kategória details.position=Pozícia diff --git a/src/main/resources/i18n/sv.properties b/src/main/resources/i18n/sv.properties index f7ff2ad5..5a3ff3cc 100644 --- a/src/main/resources/i18n/sv.properties +++ b/src/main/resources/i18n/sv.properties @@ -67,6 +67,7 @@ settings.custom_css=Anpassad CSS details.feed_details=Prenumerationsdetaljer details.url=URL +details.website=Website ####### Needs translation details.name=Namn details.category=Kategori details.position=Position diff --git a/src/main/resources/i18n/tr.properties b/src/main/resources/i18n/tr.properties index 5df55c3f..5dac90ea 100644 --- a/src/main/resources/i18n/tr.properties +++ b/src/main/resources/i18n/tr.properties @@ -67,6 +67,7 @@ settings.custom_css=Kişiselleştirilmiş CSS details.feed_details=Yayın detayları details.url=URL +details.website=Website ####### Needs translation details.name=İsim details.category=Kategori details.position=Pozisyon diff --git a/src/main/resources/i18n/zh.properties b/src/main/resources/i18n/zh.properties index d1f0e26f..69328b53 100644 --- a/src/main/resources/i18n/zh.properties +++ b/src/main/resources/i18n/zh.properties @@ -67,6 +67,7 @@ settings.custom_css=自定义 CSS 样式 details.feed_details=订阅详情 details.url=地址 +details.website=Website ####### Needs translation details.name=名称 details.category=目录 details.position=Position ####### Needs translation diff --git a/src/main/webapp/templates/feeds.feed_details.html b/src/main/webapp/templates/feeds.feed_details.html index ca3ac81e..78f40d35 100644 --- a/src/main/webapp/templates/feeds.feed_details.html +++ b/src/main/webapp/templates/feeds.feed_details.html @@ -9,6 +9,12 @@ {{sub.feedUrl}} +
+ +
+ {{sub.feedLink}} +
+
From a2ccd0d682ac683b4bf78e56510a463a74211090 Mon Sep 17 00:00:00 2001 From: MageFroh Date: Mon, 1 Jul 2013 22:36:20 +0100 Subject: [PATCH 3/3] middle-clicking on the feed in the category tree opens its website --- src/main/webapp/js/directives.js | 28 +++++++++++++++--------- src/main/webapp/templates/_category.html | 5 +++-- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/js/directives.js b/src/main/webapp/js/directives.js index f1e9b6f7..737b19ba 100644 --- a/src/main/webapp/js/directives.js +++ b/src/main/webapp/js/directives.js @@ -257,16 +257,24 @@ module.directive('category', [ function() { return label; }; - $scope.feedClicked = function(id) { - MobileService.toggleLeftMenu(); - if ($scope.selectedType == 'feed' - && id == $scope.selectedId) { - $scope.$emit('emitReload'); - } else { - $state.transitionTo('feeds.view', { - _type : 'feed', - _id : id - }); + $scope.feedClicked = function(id, event) { + // Could be called by a middle click + if (!event || (!event.ctrlKey && event.which == 1)) { + MobileService.toggleLeftMenu(); + if ($scope.selectedType == 'feed' + && id == $scope.selectedId) { + $scope.$emit('emitReload'); + } else { + $state.transitionTo('feeds.view', { + _type : 'feed', + _id : id + }); + } + + if (event) { + event.preventDefault(); + event.stopPropagation(); + } } }; diff --git a/src/main/webapp/templates/_category.html b/src/main/webapp/templates/_category.html index 069a0877..5806b1d3 100644 --- a/src/main/webapp/templates/_category.html +++ b/src/main/webapp/templates/_category.html @@ -34,7 +34,8 @@
- @@ -47,4 +48,4 @@ - \ No newline at end of file +