Merge branch 'master' into remove-harcoded-values-in-feeds

Conflicts: .travis.yml
Fantomas42 · Aug 1, 2013 · a3923e5 · a3923e5
2 parents 1e557ba + 289a26d
commit a3923e5
Show file tree

Hide file tree

Showing 40 changed files with 232 additions and 213 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,10 @@ python:
 install:
     - pip install -U setuptools
     - python bootstrap.py
-    - ./bin/buildout -c ci/travis.cfg
+    - ./bin/buildout -c travis.cfg
 before_script:
-    - make kwalitee
+    - ./bin/pyflakes zinnia
+    - ./bin/pep8 --count --show-source --statistics --exclude=migrations zinnia
 script:
     - ./bin/test
 after_success:

diff --git a/ci/shiningpanda.cfg b/ci/shiningpanda.cfg
diff --git a/demo/settings.py b/demo/settings.py
@@ -4,6 +4,7 @@
 gettext = lambda s: s
 
 DEBUG = True
+TEMPLATE_DEBUG = DEBUG
 
 DATABASES = {'default':
              {'ENGINE': 'django.db.backends.sqlite3',

diff --git a/docs/development/tests.rst b/docs/development/tests.rst
@@ -51,7 +51,7 @@ Coverage
 Despite my best efforts, some functionnalities are not yet tested, that's why
 I need your help !
 
-As I write these lines the **175** tests in Zinnia cover **96%** of the code
+As I write these lines the **182** tests in Zinnia cover **96%** of the code
 bundled in Zinnia. A real effort has been made to obtain this percentage,
 for ensuring the quality of the code.
 

diff --git a/ci/travis.cfg → travis.cfg b/ci/travis.cfg → travis.cfg
@@ -1,20 +1,13 @@
 [buildout]
-extends			= ../buildout.cfg
-
-develop			= ..
-
-bin-directory		= ../bin
-
-parts-directory		= ../parts
-
-eggs-directory		= ../eggs
-
-develop-eggs-directory	= ../develop-eggs
+extends			= buildout.cfg
 
 parts			= test
+			  pep8
+			  pyflakes
 			  coveralls
 
-eggs                   -= tweepy
+eggs                   -= django-bitly
+			  tweepy
 			  gdata
 			  feedparser
 			  South

diff --git a/zinnia/templates/403.html b/zinnia/templates/403.html
@@ -5,16 +5,16 @@
 <ul class="breadcrumbs">
   <li>{% trans "Error 403" %}</li>
 </ul>
-{% endblock %}
+{% endblock breadcrumbs %}
 
-{% block title %}{% trans "Permission denied" %}{% endblock %}
+{% block title %}{% trans "Permission denied" %}{% endblock title %}
 
-{% block body-class %}error-403{% endblock %}
+{% block body-class %}error-403{% endblock body-class %}
 
 {% block content %}
 <h2>{% trans "Permission denied" %}</h2>
 
 <p>{% trans "Sorry but you don't have the permission to do this action." %}</p>
 
 {{ block.super }}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/404.html b/zinnia/templates/404.html
@@ -5,16 +5,16 @@
 <ul class="breadcrumbs">
   <li>{% trans "Error 404" %}</li>
 </ul>
-{% endblock %}
+{% endblock breadcrumbs %}
 
-{% block title %}{% trans "Page not found" %}{% endblock %}
+{% block title %}{% trans "Page not found" %}{% endblock title %}
 
-{% block body-class %}error-404{% endblock %}
+{% block body-class %}error-404{% endblock body-class %}
 
 {% block content %}
 <h2>{% trans "Page not found" %}</h2>
 
 <p>{% trans "Sorry, but the requested page could not be found." %}</p>
 
 {{ block.super }}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/500.html b/zinnia/templates/500.html
@@ -5,16 +5,16 @@
 <ul class="breadcrumbs">
   <li>{% trans "Error 500" %}</li>
 </ul>
-{% endblock %}
+{% endblock breadcrumbs %}
 
-{% block title %}{% trans "Server error" %}{% endblock %}
+{% block title %}{% trans "Server error" %}{% endblock title %}
 
-{% block body-class %}error-500{% endblock %}
+{% block body-class %}error-500{% endblock body-class %}
 
 {% block content %}
 <h2>{% trans "Server error" %}</h2>
 
 <p>{% trans "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." %}</p>
 
 {{ block.super }}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/admin/zinnia/app_index.html b/zinnia/templates/admin/zinnia/app_index.html
@@ -5,7 +5,7 @@
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% static "zinnia/css/jquery.autocomplete.css" %}" />
 <link rel="stylesheet" type="text/css" href="{% static "zinnia/css/dashboard_zinnia.css" %}" />
-{% endblock %}
+{% endblock extrastyle %}
 
 {% block extrahead %}
 {{ block.super }}
@@ -21,7 +21,7 @@
   });
 });
 </script>
-{% endblock %}
+{% endblock extrahead %}
 
 {% block content %}
 <div id="content-main">
@@ -31,4 +31,4 @@
   {% include "admin/zinnia/widgets/draft_entries.html" %}
   {% include "admin/zinnia/widgets/recent_linkbacks.html" %}
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/admin/zinnia/widgets/base.html b/zinnia/templates/admin/zinnia/widgets/base.html
@@ -1,6 +1,6 @@
-<div id="{% block module_id %}{% endblock %}" class="module">
-  <table summary="{% block summary %}{% endblock %}">
-    <caption>{% block title %}{% endblock %}</caption>
-    {% block content %}{% endblock %}
+<div id="{% block module_id %}{% endblock module_id %}" class="module">
+  <table summary="{% block summary %}{% endblock summary %}">
+    <caption>{% block title %}{% endblock title %}</caption>
+    {% block content %}{% endblock content %}
   </table>
 </div>
diff --git a/zinnia/templates/admin/zinnia/widgets/content_stats.html b/zinnia/templates/admin/zinnia/widgets/content_stats.html
@@ -1,12 +1,12 @@
 {% extends "admin/zinnia/widgets/base.html" %}
 {% load i18n zinnia_tags %}
 
-{% block module_id %}contents{% endblock %}
+{% block module_id %}contents{% endblock module_id %}
 
-{% block summary %}{% trans "Today" %}{% endblock %}
+{% block summary %}{% trans "Today" %}{% endblock summary %}
 
-{% block title %}{% trans "Today" %}{% endblock %}
+{% block title %}{% trans "Today" %}{% endblock title %}
 
 {% block content %}
   {% zinnia_statistics "admin/zinnia/widgets/_content_stats.html" %}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/admin/zinnia/widgets/draft_entries.html b/zinnia/templates/admin/zinnia/widgets/draft_entries.html
@@ -1,12 +1,12 @@
 {% extends "admin/zinnia/widgets/base.html" %}
 {% load i18n zinnia_tags %}
 
-{% block module_id %}drafts{% endblock %}
+{% block module_id %}drafts{% endblock module_id %}
 
-{% block summary %}{% trans "Draft entries" %}{% endblock %}
+{% block summary %}{% trans "Draft entries" %}{% endblock summary %}
 
-{% block title %}{% trans "Draft entries" %}{% endblock %}
+{% block title %}{% trans "Draft entries" %}{% endblock title %}
 
 {% block content %}
   {% get_draft_entries template="admin/zinnia/widgets/_draft_entries.html" %}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/admin/zinnia/widgets/recent_comments.html b/zinnia/templates/admin/zinnia/widgets/recent_comments.html
@@ -1,12 +1,12 @@
 {% extends "admin/zinnia/widgets/base.html" %}
 {% load i18n zinnia_tags %}
 
-{% block module_id %}comments{% endblock %}
+{% block module_id %}comments{% endblock module_id %}
 
-{% block summary %}{% trans "Recent comments" %}{% endblock %}
+{% block summary %}{% trans "Recent comments" %}{% endblock summary %}
 
-{% block title %}{% trans "Recent comments" %}{% endblock %}
+{% block title %}{% trans "Recent comments" %}{% endblock title %}
 
 {% block content %}
   {% get_recent_comments template="admin/zinnia/widgets/_recent_comments.html" %}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/admin/zinnia/widgets/recent_linkbacks.html b/zinnia/templates/admin/zinnia/widgets/recent_linkbacks.html
@@ -1,12 +1,12 @@
 {% extends "admin/zinnia/widgets/base.html" %}
 {% load i18n zinnia_tags %}
 
-{% block module_id %}linkbacks{% endblock %}
+{% block module_id %}linkbacks{% endblock module_id %}
 
-{% block summary %}{% trans "Recent linkbacks" %}{% endblock %}
+{% block summary %}{% trans "Recent linkbacks" %}{% endblock summary %}
 
-{% block title %}{% trans "Recent linkbacks" %}{% endblock %}
+{% block title %}{% trans "Recent linkbacks" %}{% endblock title %}
 
 {% block content %}
   {% get_recent_linkbacks template="admin/zinnia/widgets/_recent_linkbacks.html" %}
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/comments/zinnia/entry/posted.html b/zinnia/templates/comments/zinnia/entry/posted.html
@@ -1,9 +1,9 @@
 {% extends "zinnia/base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Thanks for your comment" %}{% endblock %}
+{% block title %}{% trans "Thanks for your comment" %}{% endblock title %}
 
-{% block body-class %}comment-posted{% endblock %}
+{% block body-class %}comment-posted{% endblock body-class %}
 
 {% block content %}
 <h2>{% trans "Thanks for your comment" %}</h2>
@@ -28,4 +28,4 @@ <h2>{% trans "Thanks for your comment" %}</h2>
     </a>
   </li>
 </ul>
-{% endblock %}
+{% endblock content %}
diff --git a/zinnia/templates/comments/zinnia_entry_preview.html b/zinnia/templates/comments/zinnia_entry_preview.html
@@ -1,9 +1,9 @@
 {% extends "zinnia/base.html" %}
 {% load i18n zinnia_tags comments %}
 
-{% block title %}{% trans "Comment preview" %}{% endblock %}
+{% block title %}{% trans "Comment preview" %}{% endblock title %}
 
-{% block body-class %}comment-preview{% endblock %}
+{% block body-class %}comment-preview{% endblock body-class %}
 
 {% block content %}
   {% if form.errors %}
@@ -33,4 +33,4 @@ <h2>{% trans "Preview of the comment" %}</h2>
   </ol>
   {% endif %}
   {% include "comments/zinnia/entry/form.html" %}
-{% endblock %}
+{% endblock content %}