diff options
| -rw-r--r-- | css/news.css | 8 | ||||
| -rw-r--r-- | js/news.js | 6 | ||||
| -rw-r--r-- | templates/part.items.header.php | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/css/news.css b/css/news.css index 7450d973f..00e4c1ac9 100644 --- a/css/news.css +++ b/css/news.css @@ -77,6 +77,7 @@ div.feed_controls { display: block; float: left; min-width: 1.2em; + display: none; } div.feed_controls .unreaditemcounter.all_read { @@ -456,6 +457,13 @@ div.feed_controls { height: 100%; } + #rightcontent #feed_items.loading { + background-image: url('%webroot%/core/img/loading.gif'); + background-position: center; + background-repeat: no-repeat; + background-size: + } + #rightcontent #feed_items li:active { background: none; } diff --git a/js/news.js b/js/news.js index 2c3c039ac..bba97f11d 100644 --- a/js/news.js +++ b/js/news.js @@ -246,6 +246,9 @@ News={ }); }, load:function(feedId) { + var $feedItems = $('#feed_items'); + $feedItems.empty(); + $feedItems.addClass('loading'); $.post(OC.filePath('news', 'ajax', 'loadfeed.php'), { 'feedId' : feedId }, function(jsonData) { if(jsonData.status == 'success'){ // set active id @@ -253,8 +256,6 @@ News={ $rightContent.attr('data-id', feedId); News.Feed.activeFeedId = parseInt(feedId); // load in new items - var $feedItems = $('#feed_items'); - $feedItems.empty(); $feedItems.html(jsonData.data.feedItems); // scroll to the top position $feedItems.scrollTop(0); @@ -275,6 +276,7 @@ News={ else { OC.dialogs.alert(t('news', 'Error while loading the feed'), t('news', 'Error')); } + $feedItems.removeClass('loading'); }); }, updateAll:function() { diff --git a/templates/part.items.header.php b/templates/part.items.header.php index 831fc54fa..55c125aa0 100644 --- a/templates/part.items.header.php +++ b/templates/part.items.header.php @@ -23,7 +23,7 @@ $showOnlyUnread = true; ?> <div class="feed_controls"> - <span class="unreaditemcounter <?php echo $readClass; ?>"><?php echo $unreadItemsCount; ?></span> + <span title="<?php echo $l->t('Unread items'); ?>" class="unreaditemcounter <?php echo $readClass; ?>"><?php echo $unreadItemsCount; ?></span> <div class="feed_title"> <h1 title="<?php echo $feedTitle; ?>"><?php echo $feedTitle; ?></h1> </div> |