public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing front-end issues around showing and hiding the feed chooser in different circumstances.

Browse source
This commit is contained in:
Samuel Clay 2010-10-06 09:42:59 -04:00
parent 93121f51d0
commit 028dc9e646
4 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/reader/views.py
View file

@ -92,7 +92,6 @@ def load_feeds(request):
user = get_user(request)
feeds = {}
not_yet_fetched = False
try:
folders = UserSubscriptionFolders.objects.get(user=user)
@ -589,7 +588,6 @@ def login_as(request):
def save_feed_chooser(request):
approved_feeds = [int(feed_id) for feed_id in request.POST.getlist('approved_feeds')]
activated = 0
usersubs = UserSubscription.objects.filter(user=request.user)
for sub in usersubs:
if sub.feed.pk in approved_feeds:

8
media/css/reader.css
View file

@ -3120,6 +3120,9 @@ background: transparent;
.NB-modal-feedchooser .NB-feedlist .folder_title {
cursor: default;
}
.NB-modal-feedchooser .NB-feedlist .folder_title .feed_counts_floater {
display: none;
}
.NB-modal-feedchooser .NB-feedlist .feed .NB-feedlist-manage-icon:hover {
background: transparent url('../img/icons/silk/bullet_arrow_right.png') no-repeat 3px 4px;
@ -3193,9 +3196,12 @@ background: transparent;
background: transparent url('../img/icons/silk/pictures.png') no-repeat 0 0;
}
.NB-modal-feedchooser .NB-feedchooser-premium-bullets li.NB-3 .NB-feedchooser-premium-bullet-image {
background: transparent url('../img/icons/silk/lorry.png') no-repeat 0 0;
background: transparent url('../img/icons/silk/zoom.png') no-repeat 0 0;
}
.NB-modal-feedchooser .NB-feedchooser-premium-bullets li.NB-4 .NB-feedchooser-premium-bullet-image {
background: transparent url('../img/icons/silk/lorry.png') no-repeat 0 0;
}
.NB-modal-feedchooser .NB-feedchooser-premium-bullets li.NB-5 .NB-feedchooser-premium-bullet-image {
background: transparent url('../img/icons/silk/lightbulb.png') no-repeat 0 0;
}

11
media/js/newsblur/reader.js
View file

@ -583,7 +583,6 @@
detect_all_inactive_feeds: function() {
var feeds = this.model.feeds;
var has_chosen_feeds = _.any(feeds, function(feed) {
NEWSBLUR.log(['active?', feed, feed.active]);
return feed.active;
});
@ -631,15 +630,18 @@
setTimeout(function() {
if (is_collapsed) {
$('ul.folder', $folder).css({'display': 'none'});
$feeds.append($folder);
self.collapse_folder($('.folder_title', $folder).eq(0), true);
$feeds.append($folder.fadeIn(500));
if (collapsed_parent) {
$folder.parents('li.folder').each(function() {
self.collapse_folder($('.folder_title', this).eq(0), true);
});
}
} else {
$feeds.append($folder.fadeIn(500));
$feeds.append($folder);
}
if (self.flags['has_chosen_feeds']) {
$folder.fadeIn(500);
}
$('.feed', $folder).rightClick(function() {
self.show_manage_menu('feed', $(this));
@ -947,6 +949,7 @@
show_collapsed_folder_count: function($folder_title, $children) {
var $counts = $('.feed_counts_floater', $folder_title);
$counts.remove();
$children = $('li.feed', $children).not('.NB-feed-inactive');
var positive_count = 0;
var neutral_count = 0;
@ -1066,7 +1069,7 @@
this.flags['opening_feed'] = true;
if (!$feed_link) {
$feed_link = $('.feed.selected', this.$feed_list).eq(0);
$feed_link = $('.feed.selected', this.$s.$feed_list).eq(0);
}
if (feed_id != this.active_feed || force) {

13
media/js/newsblur/reader_feedchooser.js
View file

@ -54,7 +54,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
$.make('div', { className: 'NB-feedchooser-info'}, [
$.make('div', { className: 'NB-feedchooser-info-type' }, [
$.make('span', { className: 'NB-feedchooser-subtitle-type-prefix' }, 'Super-Mega'),
' Fancy Account'
' Premium Account'
])
]),
$.make('ul', { className: 'NB-feedchooser-premium-bullets' }, [
@ -67,11 +67,15 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
'Unlimited number of sites.'
]),
$.make('li', { className: 'NB-3' }, [
$.make('div', { className: 'NB-feedchooser-premium-bullet-image' }),
'Access to future premium-only features like search, starring, sending to Instapaper.'
]),
$.make('li', { className: 'NB-4' }, [
$.make('div', { className: 'NB-feedchooser-premium-bullet-image' }),
'You feed my poor, hungry dog for 6 days!',
$.make('img', { className: 'NB-feedchooser-premium-poor-hungry-dog', src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/shiloh.jpg' })
]),
$.make('li', { className: 'NB-4' }, [
$.make('li', { className: 'NB-5' }, [
$.make('div', { className: 'NB-feedchooser-premium-bullet-image' }),
$.make('span', { className: 'NB-feedchooser-premium-cost-dollars' }, '$12'),
'/',
@ -104,7 +108,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
});
// Expand collapsed folders
$('ul.folder', $feeds).css({
$('.folder', $feeds).css({
'display': 'block',
'opacity': 1
});
@ -149,9 +153,6 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
$('#simplemodal-container').corner('6px');
},
'onClose': function(dialog) {
if (!self.approve_list.length) {
NEWSBLUR.reader.show_feed_chooser_button();
}
dialog.data.hide().empty().remove();
dialog.container.hide().empty().remove();
dialog.overlay.fadeOut(200, function() {