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

Adding a Delete This Site manage menu item, complete with cancel button.

Browse source
This commit is contained in:
Samuel Clay 2010-07-01 00:29:26 -04:00
parent 71e7d0f926
commit 113a4e058c
5 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/reader/models.py
View file

@ -67,9 +67,9 @@ class UserSubscription(models.Model):
from django.db import connection
connection.queries = []
stories_db = Story.objects.select_related('story_author')\
.exclude(id__in=read_stories_ids)\
.filter(story_feed=self.feed,
story_date__gte=date_delta)
story_date__gte=date_delta)\
.exclude(id__in=read_stories_ids)
# print "Stories_db: %s" % stories_db.count()
stories = self.feed.format_stories(stories_db)
# print ' Stories: %s\t' % stories_db.count(),

17
media/css/reader.css
View file

@ -1839,6 +1839,10 @@ background: transparent;
.NB-module-features .NB-features-add {
float: right;
display: none;
}
.NB-module-features .NB-module-header:hover .NB-features-add {
display: block;
}
.NB-module-features .NB-features-direction {
@ -1990,6 +1994,7 @@ background: transparent;
.NB-menu-manage .NB-menu-manage-feed {
padding-left: 44px;
position: relative;
}
.NB-menu-manage .NB-menu-manage-feed-info {
@ -2019,10 +2024,22 @@ background: transparent;
.NB-menu-manage .NB-menu-manage-feed-delete {
background: transparent url('../img/icons/silk/bin_closed.png') no-repeat 22px 2px;
}
.NB-menu-manage .NB-menu-manage-feed-delete.NB-menu-manage-feed-delete-cancel {
background-image: none;
}
.NB-menu-manage .NB-menu-manage-feed-delete-confirm {
background: transparent url('../img/icons/silk/exclamation.png') no-repeat 22px 2px;
font-weight: bold;
}
.NB-menu-manage .NB-menu-manage-mark-read {
background: transparent url('../img/icons/silk/control_fastforward_blue.png') no-repeat 4px 2px;
}
.NB-menu-manage .NB-menu-manage-preferences {
background: transparent url('../img/icons/silk/color_wheel.png') no-repeat 4px 2px;
}
.NB-menu-manage .NB-menu-manage-feed-delete-confirm {
display: none;
}

BIN
media/img/reader/google-reader-logo.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

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

@ -1717,7 +1717,8 @@
]),
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-manage' }, 'Manage opinions'),
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-stats' }, 'Site statistics'),
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-delete' }, 'Delete this site')
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-delete' }, 'Delete this site'),
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-delete-confirm' }, 'Really delete?')
];
for (var f in $feed_specific) {
$manage_menu.append($feed_specific[f]);
@ -1764,7 +1765,7 @@
'easing': 'easeOutQuint',
'queue': false,
'complete': function() {
$(document).bind('click.menu', function() {
$(document).bind('click.menu', function(e) {
self.hide_manage_menu();
});
}
@ -1800,6 +1801,33 @@
$('.NB-task-manage').removeClass('NB-hover');
},
show_confirm_delete_menu_item: function() {
var $delete = $('.NB-menu-manage-feed-delete');
var $confirm = $('.NB-menu-manage-feed-delete-confirm');
$delete.addClass('NB-menu-manage-feed-delete-cancel');
$delete.text('Cancel delete');
$confirm.slideDown(500);
},
hide_confirm_delete_menu_item: function() {
var $delete = $('.NB-menu-manage-feed-delete');
var $confirm = $('.NB-menu-manage-feed-delete-confirm');
$delete.removeClass('NB-menu-manage-feed-delete-cancel');
$delete.text('Delete this site');
$confirm.slideUp(500);
},
manage_menu_delete_feed: function(feed) {
var self = this;
var feed_id = feed || this.active_feed;
this.model.delete_publisher(feed_id, function() {
self.delete_feed(feed_id);
});
},
// ==========================
// = Taskbar - Intelligence =
// ==========================
@ -2388,6 +2416,19 @@
self.open_manage_feed_modal();
}
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-feed-delete' }, function($t, $p){
e.preventDefault();
e.stopPropagation();
if ($t.hasClass('NB-menu-manage-feed-delete-cancel')) {
self.hide_confirm_delete_menu_item();
} else {
self.show_confirm_delete_menu_item();
}
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-feed-delete-confirm' }, function($t, $p){
e.preventDefault();
self.manage_menu_delete_feed(self.active_feed);
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-mark-read' }, function($t, $p){
e.preventDefault();
if (!$t.hasClass('NB-disabled')) {

2
utils/feed_fetcher.py
View file

@ -156,7 +156,7 @@ class ProcessFeed:
pass
self.feed.feed_title = self.fpf.feed.get('title', self.feed.feed_title)
self.feed.feed_tagline = self.fpf.feed.get('tagline', self.feed.feed_tagline)
self.feed.feed_tagline = self.fpf.feed.get('tagline', self.feed.feed_tagline)[:1024]
self.feed.feed_link = self.fpf.feed.get('link', self.feed.feed_link)
self.feed.last_update = datetime.datetime.now()