Commit 72f262e515fb5c4e264f34fd66493779bafb45af
1 parent
9041e712
Exists in
master
and in
39 other branches
Updating feedzilla
Showing
3 changed files
with
6 additions
and
6 deletions
Show diff stats
src/colab/custom_settings.py
src/planet/templates/feedzilla/_post_template.html
| 1 | -{% load tagging_tags %} | ||
| 2 | {% load i18n %} | 1 | {% load i18n %} |
| 3 | 2 | ||
| 4 | <div class="blog-post-item"> | 3 | <div class="blog-post-item"> |
| @@ -17,11 +16,10 @@ | @@ -17,11 +16,10 @@ | ||
| 17 | <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b> | 16 | <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b> |
| 18 | </div> | 17 | </div> |
| 19 | 18 | ||
| 20 | - {% if post.tags %} | 19 | + {% if post.tags.count %} |
| 21 | <div class="tags"> | 20 | <div class="tags"> |
| 22 | <span><b>Tags:</b> | 21 | <span><b>Tags:</b> |
| 23 | - {% tags_for_object post as tags %} | ||
| 24 | - {% for tag in tags %} | 22 | + {% for tag in post.tags.all %} |
| 25 | <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a> | 23 | <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a> |
| 26 | {% endfor %} | 24 | {% endfor %} |
| 27 | </span> | 25 | </span> |
src/planet/templates/feedzilla/base.html
| 1 | {% extends 'base.html' %} | 1 | {% extends 'base.html' %} |
| 2 | {% load i18n %} | 2 | {% load i18n %} |
| 3 | {% load feedzilla_tags %} | 3 | {% load feedzilla_tags %} |
| 4 | +{% load taggit_extras %} | ||
| 4 | 5 | ||
| 5 | {% block main-content %} | 6 | {% block main-content %} |
| 6 | <h2>{% trans 'Planet' %}</h2> | 7 | <h2>{% trans 'Planet' %}</h2> |
| @@ -16,7 +17,7 @@ | @@ -16,7 +17,7 @@ | ||
| 16 | </div> | 17 | </div> |
| 17 | <div class="box"> | 18 | <div class="box"> |
| 18 | <h3>{% trans 'Tags' %}</h3> | 19 | <h3>{% trans 'Tags' %}</h3> |
| 19 | - {% feedzilla_tag_cloud %} | 20 | + {% include_tagcloud 'feedzilla.post' %} |
| 20 | </div> | 21 | </div> |
| 21 | <div class="box"> | 22 | <div class="box"> |
| 22 | <h3>{% trans 'Source Blogs' %}</h3> | 23 | <h3>{% trans 'Source Blogs' %}</h3> |