summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2012-10-16 18:45:49 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2012-10-16 18:45:49 +0200
commitbf83f65545f68515cc75c103b4b6cdaccad8e427 (patch)
treed88e589ac29922b71ce21bdc49cf1f3b77c2c55a
parentad665a3116fb866304cab3a3aa3fc0cabaefe2a4 (diff)
click on from_feed loads the feed
-rw-r--r--css/news.css8
-rw-r--r--js/items.js6
-rw-r--r--templates/part.items.php2
3 files changed, 15 insertions, 1 deletions
diff --git a/css/news.css b/css/news.css
index 10bfe5f30..4d4f6bbfd 100644
--- a/css/news.css
+++ b/css/news.css
@@ -529,6 +529,14 @@ div.add_parentfolder {
margin: .2em 0 0 3em;
}
+ .feed_item h2.item_author a {
+ color: inherit;
+ }
+
+ .feed_item h2.item_author a:hover {
+ text-decoration: underline;
+ }
+
.timestamp {
display: none;
}
diff --git a/js/items.js b/js/items.js
index 847647206..f8dc3bae8 100644
--- a/js/items.js
+++ b/js/items.js
@@ -605,6 +605,12 @@ var News = News || {};
self.setRead(true);
});
+ // bind click to load feed when the from_feed link is viewable
+ this._$html.find('.from_feed').click(function(){
+ News.Objects.Items.load(News.MenuNodeType.Feed, self.getFeedId(), function(){});
+ return false;
+ });
+
// single hover on item should mark it as read too
this._$html.find('.body').click(function(){
var $item = $(this).parent('.feed_item');
diff --git a/templates/part.items.php b/templates/part.items.php
index ebfe76b4f..eafdf7777 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -34,7 +34,7 @@ foreach($items as $item) {
echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . htmlspecialchars($item->getTitle(), ENT_QUOTES, 'UTF-8') . '</a></h1>';
if ((int)$lastViewedFeedType !== OCA\News\FeedType::FEED) {
- $feedTitle = '<span class="from_feed"> ' . $l->t('from') . ' ' . $item->getFeedTitle() . '</span> ';
+ $feedTitle = '<a href="#" class="from_feed"> ' . $l->t('from') . ' ' . $item->getFeedTitle() . '</a> ';
} else {
$feedTitle = '';
}