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

Merge branch 'master' of github.com:samuelclay/NewsBlur

Browse source
This commit is contained in:
Samuel Clay 2010-08-13 18:19:44 -04:00
commit c1ac17c942
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/feed_import/views.py
View file

@ -71,6 +71,7 @@ def reader_authorize(request):
auth_token_dict['user'] = request.user
else:
OAuthToken.objects.filter(session_id=request.session.session_key).delete()
OAuthToken.objects.filter(remote_ip=request.META['REMOTE_ADDR']).delete()
auth_token_dict['session_id'] = request.session.session_key
auth_token_dict['remote_ip'] = request.META['REMOTE_ADDR']
OAuthToken.objects.create(**auth_token_dict)
@ -103,7 +104,7 @@ def reader_callback(request):
user_token.session_id = request.session.session_key
user_token.save()
print "Found ip token in user_tokens: %s" % user_token
print "Google Reader request.GET: %s" % request.GET
# Authenticated in Google, so verify and fetch access tokens
token = oauth.Token(user_token.request_token, user_token.request_token_secret)
token.set_verifier(request.GET['oauth_verifier'])
@ -111,8 +112,8 @@ def reader_callback(request):
resp, content = client.request(access_token_url, "POST")
access_token = dict(urlparse.parse_qsl(content))
print " ---> [%s] OAuth Reader Content: %s -- %s" % (token, access_token, content)
user_token.access_token = access_token['oauth_token'] or request.GET.get('oauth_token')
user_token.access_token_secret = access_token['oauth_token_secret']
user_token.access_token = access_token.get('oauth_token') or request.GET.get('oauth_token')
user_token.access_token_secret = access_token.get('oauth_token_secret') or request.GET.get('oauth_token_secret')
user_token.save()
# Fetch imported feeds on next page load

12
media/css/reader.css
View file

@ -639,7 +639,16 @@ background: transparent;
text-transform: uppercase;
display: none;
}
#story_titles .NB-feedbar .NB-feedbar-statistics {
background: transparent url('../img/icons/silk/chart_curve.png') no-repeat 0 0;
width: 16px;
height: 16px;
float: left;
display: none;
cursor: pointer;
padding: 0 4px 0 0px;
margin: 3px 0 0 0;
}
#story_titles .NB-feedbar .NB-feedbar-last-updated {
color: #808080;
text-shadow: 0 1px 0 #e6e6e6;
@ -654,6 +663,7 @@ background: transparent;
}
#story_titles .NB-feedbar.NB-feedbar-hover .NB-feedbar-manage-feed,
#story_titles .NB-feedbar.NB-feedbar-hover .NB-feedbar-statistics,
#story_titles .NB-feedbar.NB-feedbar-hover .NB-feedbar-mark-feed-read {
display: block;
}

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

@ -635,7 +635,8 @@
]),
$.make('img', { className: 'feed_favicon', src: this.google_favicon_url + feed.feed_link }),
$.make('span', { className: 'feed_title' }, feed.feed_title),
$.make('div', { className: 'NB-feedbar-manage-feed' }),
$.make('div', { className: 'NB-feedbar-manage-feed', title: 'Manage Opinions' }),
(type == 'story' && $.make('div', { className: 'NB-feedbar-statistics', title: 'Statistics' })),
(type == 'story' && $.make('div', { className: 'NB-feedbar-last-updated' }, [
$.make('span', { className: 'NB-feedbar-last-updated-label' }, 'Updated: '),
$.make('span', { className: 'NB-feedbar-last-updated-date' }, feed.updated)
@ -1330,8 +1331,8 @@
]),
$.make('span', { className: 'story_date' }, story.short_parsed_date),
$.make('span', { className: 'story_id' }, ''+story.id),
$.make('div', { className: 'NB-story-sentiment NB-story-like' }),
$.make('div', { className: 'NB-story-sentiment NB-story-dislike' })
$.make('div', { className: 'NB-story-sentiment NB-story-like', title: 'What I like about this story...' }),
$.make('div', { className: 'NB-story-sentiment NB-story-dislike', title: 'What I dislike about this story...' })
]).data('story_id', story.id);
if (unread_view > score) {
@ -1589,8 +1590,8 @@
var $feedbar = $.make('div', { className: 'NB-feedbar' }, [
this.make_feed_title_line(feed, false, 'story'),
$.make('div', { className: 'NB-feedbar-intelligence' }, [
$.make('div', { className: 'NB-feed-sentiment NB-feed-like' }),
$.make('div', { className: 'NB-feed-sentiment NB-feed-dislike' })
$.make('div', { className: 'NB-feed-sentiment NB-feed-like', title: 'What I like about this site...' }),
$.make('div', { className: 'NB-feed-sentiment NB-feed-dislike', title: 'What I dislike about this site...' })
]),
$.make('span', { className: 'feed_id' }, ''+feed.id)
]).hover(function() {
@ -2678,6 +2679,9 @@
self.mark_feed_as_read(feed_id, $t);
$t.fadeOut(400);
});
$.targetIs(e, { tagSelector: '.NB-feedbar-statistics' }, function($t, $p){
self.open_feed_statistics_modal();
});
$.targetIs(e, { tagSelector: '.NB-feedbar-manage-feed' }, function($t, $p){
e.preventDefault();
if (!$('.NB-task-manage').hasClass('NB-disabled')) {

4
media/js/newsblur/reader_statistics.js
View file

@ -134,7 +134,7 @@ NEWSBLUR.ReaderStatistics.prototype = {
setTimeout(function() {
$.modal.impl.resize(self.$modal);
}, 50);
}, 100);
},
make_stats: function(data, interval) {
@ -163,7 +163,7 @@ NEWSBLUR.ReaderStatistics.prototype = {
var $subscribers = $.make('div', { className: 'NB-statistics-subscribers' }, [
$.make('span', { className: 'NB-statistics-subscribers-count' }, ''+data['subscriber_count']),
$.make('span', { className: 'NB-statistics-subscribers-label' }, 'subscriber' + data['subscriber_count']==1?'':'s')
$.make('span', { className: 'NB-statistics-subscribers-label' }, 'subscriber' + (data['subscriber_count']==1?'':'s'))
]);
$('.NB-statistics-subscribers', this.$modal).remove();
$('.NB-modal-subtitle', this.$modal).prepend($subscribers);