Updating feedzilla

Sergio Oliveira
1 parent 9041e712
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
src/planet/templates/feedzilla/base.html
@@ -33,7 +33,8 @@ INSTALLED_APPS = INSTALLED_APPS + (
  
     # Feedzilla and deps
     'feedzilla',
-    'tagging',
+    'taggit',
+    'taggit_templatetags',
     'common',
 )
  
-{% load tagging_tags %}
 {% load i18n %}
  
 <div class="blog-post-item">
@@ -17,11 +16,10 @@
         <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b>
     </div>
  
-    {% if post.tags %}
+    {% if post.tags.count %}
     <div class="tags">
       <span><b>Tags:</b>
-        {% tags_for_object post as tags %}
-        {% for tag in tags %}
+        {% for tag in post.tags.all %}
           <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a>
         {% endfor %}
       </span>
 {% extends 'base.html' %}
 {% load i18n %}
 {% load feedzilla_tags %}
+{% load taggit_extras %}
  
 {% block main-content %}
     <h2>{% trans 'Planet' %}</h2>
@@ -16,7 +17,7 @@
       </div>
       <div class="box">
         <h3>{% trans 'Tags' %}</h3>
-        {% feedzilla_tag_cloud %}
+        {% include_tagcloud 'feedzilla.post' %}
       </div>
       <div class="box">
         <h3>{% trans 'Source Blogs' %}</h3>
...	...	@@ -33,7 +33,8 @@ INSTALLED_APPS = INSTALLED_APPS + (
33	33
34	34	# Feedzilla and deps
35	35	'feedzilla',
36		- 'tagging',
	36	+ 'taggit',
	37	+ 'taggit_templatetags',
37	38	'common',
38	39	)
39	40
...	...
1		-{% load tagging_tags %}
2	1	{% load i18n %}
3	2
4	3	<div class="blog-post-item">
...	...	@@ -17,11 +16,10 @@
17	16	<b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b>
18	17	</div>
19	18
20		- {% if post.tags %}
	19	+ {% if post.tags.count %}
21	20	<div class="tags">
22	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	23	<a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a>
26	24	{% endfor %}
27	25	</span>
...	...
1	1	{% extends 'base.html' %}
2	2	{% load i18n %}
3	3	{% load feedzilla_tags %}
	4	+{% load taggit_extras %}
4	5
5	6	{% block main-content %}
6	7	<h2>{% trans 'Planet' %}</h2>
...	...	@@ -16,7 +17,7 @@
16	17	</div>
17	18	<div class="box">
18	19	<h3>{% trans 'Tags' %}</h3>
19		- {% feedzilla_tag_cloud %}
	20	+ {% include_tagcloud 'feedzilla.post' %}
20	21	</div>
21	22	<div class="box">
22	23	<h3>{% trans 'Source Blogs' %}</h3>
...	...