Skip to content

Commit

Permalink
Cleaning up API YAML. Merging Publishers into FAQ. Now I just need a …
Browse files Browse the repository at this point in the history
…page to replace Publishers and this can launch.
  • Loading branch information
samuelclay committed Apr 24, 2011
1 parent 6b13260 commit 455c1cb
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 125 deletions.
10 changes: 5 additions & 5 deletions apps/recommendations/views.py
Expand Up @@ -37,13 +37,13 @@ def load_recommended_feed(request):
return HttpResponse("")

@json.json_view
def load_feed_info(request):
feed_id = request.GET['feed_id']
def load_feed_info(request, feed_id):
feed = get_object_or_404(Feed, pk=feed_id)
previous_recommendation = None
recommended_feed = RecommendedFeed.objects.filter(user=request.user, feed=feed)
if recommended_feed:
previous_recommendation = recommended_feed[0].created_date
if request.user.is_authenticated():
recommended_feed = RecommendedFeed.objects.filter(user=request.user, feed=feed)
if recommended_feed:
previous_recommendation = recommended_feed[0].created_date

return {
'subscriber_count': feed.num_subscribers,
Expand Down
1 change: 1 addition & 0 deletions media/css/reader.css
Expand Up @@ -5321,6 +5321,7 @@ background: transparent;
font-size: 12px;
line-height: 16px;
margin-bottom: 12px;
padding-top: 4px;
}
.NB-static-api .NB-api-endpoint-param-desc {
width: 100%;
Expand Down
5 changes: 1 addition & 4 deletions templates/static/api.xhtml
Expand Up @@ -24,13 +24,10 @@
<a href="http://github.com/samuelclay/NewsBlur/tree/master/apps/reader/views.py">/reader/ views</a>,
<a href="http://github.com/samuelclay/NewsBlur/tree/master/apps/rss_feeds/views.py">/rss_feeds/ views</a>,
as well as
<a href="http://github.com/samuelclay/NewsBlur/tree/master/templates/static/api.yml">the API definitions in YML</a>.</p>
<a href="http://github.com/samuelclay/NewsBlur/tree/master/templates/static/api.yml">the API definitions in YAML</a>.</p>
</div>
</div>

{# ========= #}
{# = Feeds = #}
{# ========= #}

<div class="NB-module">
<h5 class="NB-module-title">API Table of Contents</h5>
Expand Down

0 comments on commit 455c1cb

Please sign in to comment.