diff options
| -rw-r--r-- | js/items.js | 19 | ||||
| -rw-r--r-- | templates/part.items.php | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/js/items.js b/js/items.js index 4a71094b6..48ac53bdb 100644 --- a/js/items.js +++ b/js/items.js @@ -396,6 +396,7 @@ var News = News || {}; if(i === 0){ item.setViewed(true); } + // show items if(News.Objects.Menu.isShowAll() || type === News.MenuNodeType.Starred || !item.isRead()){ @@ -403,6 +404,12 @@ var News = News || {}; $itemHtml.removeClass('keep_unread'); $html.append($itemHtml); } + // hide the additional feed anme if its just a normal feed + if(type === News.MenuNodeType.Feed){ + item.showAdditionalFeedTitle(false); + } else { + item.showAdditionalFeedTitle(true); + } } return $html; }; @@ -492,6 +499,18 @@ var News = News || {}; } }; + + /** + * @param show if true, show the feedtitle on the left side of the author + */ + Item.prototype.showAdditionalFeedTitle = function(show) { + if(show){ + this._$html.find('.from_feed').show(); + } else { + this._$html.find('.from_feed').hide(); + } + }; + /** * @return true if locked, otherwise false */ diff --git a/templates/part.items.php b/templates/part.items.php index bcbc8da37..72cf8393c 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="feed_title"> ' . $l->t('from') . ' ' . $item->getFeedTitle() . '</span>'; + $feedTitle = '<span class="from_feed"> ' . $l->t('from') . ' ' . $item->getFeedTitle() . '</span>'; } else { $feedTitle = ''; } |