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' into ruserstory

Browse source 
# By Samuel Clay (2) and daanzu (1)
* master:
  Fixing bug in autocomplete returning lost feeds.
  Fixing issue where user agent doesn't exist.
  Change crossover to narrow view from 700 to 720px.
This commit is contained in:
Samuel Clay 2013-05-03 12:21:01 -07:00
commit 882a307026
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/views.py
View file

@ -98,7 +98,7 @@ def feed_autocomplete(request):
'label': feed.feed_title,
'tagline': feed.data and feed.data.feed_tagline,
'num_subscribers': feed.num_subscribers,
} for feed in feeds]
} for feed in feeds if feed]
feeds = sorted(feeds, key=lambda f: -1 * f['num_subscribers'])
feed_ids = [f['id'] for f in feeds]

2
apps/social/views.py
View file

@ -1200,7 +1200,7 @@ def shared_stories_rss_feed(request, user_id, username):
logging.user(request, "~FBGenerating ~SB%s~SN's RSS feed: ~FM%s" % (
user.username,
request.META['HTTP_USER_AGENT'][:24]
request.META.get('HTTP_USER_AGENT', "")[:24]
))
return HttpResponse(rss.writeString('utf-8'), content_type='application/rss+xml')

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

@ -186,7 +186,7 @@
if ((NEWSBLUR.reader.layout.contentLayout.panes.north &&
NEWSBLUR.reader.layout.contentLayout.panes.north.width() < 600) ||
(NEWSBLUR.reader.layout.contentLayout.panes.center &&
NEWSBLUR.reader.layout.contentLayout.panes.center.width() < 700)) {
NEWSBLUR.reader.layout.contentLayout.panes.center.width() < 720)) {
this.$s.$feed_view.addClass('NB-feed-story-view-narrow');
this.$s.$text_view.addClass('NB-feed-story-view-narrow');
} else {