diff --git a/apps/recommendations/templatetags/recommendations_tags.py b/apps/recommendations/templatetags/recommendations_tags.py
index aa07f0243..f0fca31a6 100644
--- a/apps/recommendations/templatetags/recommendations_tags.py
+++ b/apps/recommendations/templatetags/recommendations_tags.py
@@ -9,10 +9,12 @@ def render_recommended_feed(context, recommended_feeds):
user = get_user(context['user'])
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 {
- '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,
'user': context['user'],
'has_next_page': len(recommended_feeds) > 1
diff --git a/apps/recommendations/views.py b/apps/recommendations/views.py
index fca3dccc0..7c86b8e14 100644
--- a/apps/recommendations/views.py
+++ b/apps/recommendations/views.py
@@ -15,12 +15,15 @@ def load_recommended_feed(request):
recommended_feeds = RecommendedFeed.objects.all()[page:page+2]
if recommended_feeds:
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))
- return render_to_response('recommendations/render_recommended_feed.xhtml', {
- 'recommended_feed' : recommended_feeds and recommended_feeds[0],
- 'usersub' : usersub,
- 'has_next_page' : len(recommended_feeds) > 1,
- 'has_previous_page' : page != 0,
- }, context_instance=RequestContext(request))
\ No newline at end of file
+ recommended_feed = recommended_feeds and recommended_feeds[0]
+
+ if recommended_feed:
+ return render_to_response('recommendations/render_recommended_feed.xhtml', {
+ 'recommended_feed' : recommended_feed,
+ '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))
\ No newline at end of file
diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js
index be79191fb..740dd7b45 100644
--- a/media/js/newsblur/reader.js
+++ b/media/js/newsblur/reader.js
@@ -4850,6 +4850,8 @@
},
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' }, [
$.make('div', { className: 'NB-tryfeed-add NB-modal-submit-green NB-modal-submit-button' }, 'Add')
]).css({'opacity': 0});
diff --git a/templates/recommendations/render_recommended_feed.xhtml b/templates/recommendations/render_recommended_feed.xhtml
index 3e5c8192d..faa792faa 100644
--- a/templates/recommendations/render_recommended_feed.xhtml
+++ b/templates/recommendations/render_recommended_feed.xhtml
@@ -21,7 +21,7 @@