public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not append more than one Add button in tryfeed.

Browse source
This commit is contained in:
Samuel Clay 2011-03-16 19:20:38 -04:00
parent 8342741e07
commit d937bf694a
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/recommendations/templatetags/recommendations_tags.py
View file

@ -9,10 +9,12 @@ def render_recommended_feed(context, recommended_feeds):
user = get_user(context['user']) user = get_user(context['user'])
usersub = UserSubscription.objects.filter(user=user, feed=recommended_feeds[0].feed) usersub = UserSubscription.objects.filter(user=user, feed=recommended_feeds[0].feed)
recommended_feed = recommended_feeds and recommended_feeds[0]
if recommended_feeds[0].feed: if recommended_feed:
return { return {
'recommended_feed': recommended_feeds and recommended_feeds[0], 'recommended_feed': recommended_feed,
'description': recommended_feed.description or recommended_feed.feed.data.feed_tagline,
'usersub': usersub, 'usersub': usersub,
'user': context['user'], 'user': context['user'],
'has_next_page': len(recommended_feeds) > 1 'has_next_page': len(recommended_feeds) > 1

17
apps/recommendations/views.py
View file

@ -15,12 +15,15 @@ def load_recommended_feed(request):
recommended_feeds = RecommendedFeed.objects.all()[page:page+2] recommended_feeds = RecommendedFeed.objects.all()[page:page+2]
if recommended_feeds: if recommended_feeds:
usersub = UserSubscription.objects.filter(user=user, feed=recommended_feeds[0].feed) usersub = UserSubscription.objects.filter(user=user, feed=recommended_feeds[0].feed)
print recommended_feeds, len(recommended_feeds)
logging.user(request.user, "~FBBrowse recommended feed: ~SBPage #%s" % (page+1)) logging.user(request.user, "~FBBrowse recommended feed: ~SBPage #%s" % (page+1))
return render_to_response('recommendations/render_recommended_feed.xhtml', { recommended_feed = recommended_feeds and recommended_feeds[0]
'recommended_feed' : recommended_feeds and recommended_feeds[0],
'usersub' : usersub, if recommended_feed:
'has_next_page' : len(recommended_feeds) > 1, return render_to_response('recommendations/render_recommended_feed.xhtml', {
'has_previous_page' : page != 0, 'recommended_feed' : recommended_feed,
}, context_instance=RequestContext(request)) 'description' : recommended_feed.description or recommended_feed.feed.data.feed_tagline,
'usersub' : usersub,
'has_next_page' : len(recommended_feeds) > 1,
'has_previous_page' : page != 0,
}, context_instance=RequestContext(request))

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

@ -4850,6 +4850,8 @@
}, },
show_tryfeed_add_button: function() { show_tryfeed_add_button: function() {
if (this.$s.$story_taskbar.find('.NB-tryfeed-add:visible').length) return;
var $add = $.make('div', { className: 'NB-modal-submit' }, [ var $add = $.make('div', { className: 'NB-modal-submit' }, [
$.make('div', { className: 'NB-tryfeed-add NB-modal-submit-green NB-modal-submit-button' }, 'Add') $.make('div', { className: 'NB-tryfeed-add NB-modal-submit-green NB-modal-submit-button' }, 'Add')
]).css({'opacity': 0}); ]).css({'opacity': 0});

2
templates/recommendations/render_recommended_feed.xhtml
View file

@ -21,7 +21,7 @@
<img class="NB-recommended-favicon" src="data:image/png;base64,{{ recommended_feed.feed.icon.data }}" /> <img class="NB-recommended-favicon" src="data:image/png;base64,{{ recommended_feed.feed.icon.data }}" />
<div class="NB-recommended-title">{{ recommended_feed.feed.feed_title }}</div> <div class="NB-recommended-title">{{ recommended_feed.feed.feed_title }}</div>
{# <div class="NB-recommended-link">{{ recommended_feed.feed.feed_link }}</div> #} {# <div class="NB-recommended-link">{{ recommended_feed.feed.feed_link }}</div> #}
<div class="NB-recommended-description">{{ recommended_feed.feed.data.feed_tagline }}</div> <div class="NB-recommended-description">{{ description }}</div>
<div class="NB-modal-submit"> <div class="NB-modal-submit">
<div class="NB-recommended-subscribers"> <div class="NB-recommended-subscribers">
<b>{{ recommended_feed.feed.num_subscribers }}</b> subscriber{{ recommended_feed.feed.num_subscribers|pluralize }} <b>{{ recommended_feed.feed.num_subscribers }}</b> subscriber{{ recommended_feed.feed.num_subscribers|pluralize }}