Django 1.9 compatibility templates

matagus · Aug 6, 2016 · e2935e2 · e2935e2
1 parent aab666f
commit e2935e2
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 26 deletions.
diff --git a/README.rst b/README.rst
@@ -44,6 +44,9 @@ INSTALLATION
 ============
 
     * For installation instructions, see `the docs <http://django-planet.readthedocs.org/>`_.
+
+Note for Django 1.9 : you have to clone the `django-pagination-py3 repository <https://github.com/matagus/django-pagination-py3>`_ as
+the pip version is not yet compatible with Django 1.9.
 
 Contribute
 ==========

diff --git a/planet/templates/base.html b/planet/templates/base.html
@@ -1,5 +1,5 @@
 {% load staticfiles i18n %}
-{% load url from future %}
+
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}">
     <head>

diff --git a/planet/templates/planet/authors/blocks/list_for_tag.html b/planet/templates/planet/authors/blocks/list_for_tag.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 {% ifnotequal authors|length 1 %}
 <ul class="nav nav-list authors list">
     <li class="nav-header">{% trans "Authors talking about" %} {{ tag|safe }}</li>

diff --git a/planet/templates/planet/authors/detail.html b/planet/templates/planet/authors/detail.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags tagging_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title %}{{ author.name }}{% endblock %}
 

diff --git a/planet/templates/planet/authors/list.html b/planet/templates/planet/authors/list.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title %}{% trans 'Authors list' %}{% endblock %}
 

diff --git a/planet/templates/planet/authors/list_for_tag.html b/planet/templates/planet/authors/list_for_tag.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags %}
-{% load url from future %}
 
 {% block head_title %}{% trans 'Authors under tag' %} {{ tag|safe }}{% endblock %}
 

diff --git a/planet/templates/planet/base.html b/planet/templates/planet/base.html
@@ -1,6 +1,5 @@
 {% extends 'site_base.html' %}
 {% load i18n tagging_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title_base %}{% block head_title %}{% endblock %}{% endblock %}
 

diff --git a/planet/templates/planet/blogs/detail.html b/planet/templates/planet/blogs/detail.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Blog" %}: {{ blog.title }}{% endblock %}
 

diff --git a/planet/templates/planet/blogs/list.html b/planet/templates/planet/blogs/list.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags  %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Blogs list" %}{% endblock %}
 

diff --git a/planet/templates/planet/feeds/add.html b/planet/templates/planet/feeds/add.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Add a New Feed" %}{% endblock %}
 

diff --git a/planet/templates/planet/feeds/blocks/syndication_block.html b/planet/templates/planet/feeds/blocks/syndication_block.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load url from future %}
+
 <br/>
 <ul class="nav nav-list">
     <li class="nav-header">{% trans 'Feeds' %}</li>

diff --git a/planet/templates/planet/feeds/detail.html b/planet/templates/planet/feeds/detail.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags tagging_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Feed" %}: {{ feed.title }}{% endblock %}
 

diff --git a/planet/templates/planet/feeds/list_for_tag.html b/planet/templates/planet/feeds/list_for_tag.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Feeds under tag" %} {{ tag|safe }}{% endblock %}
 

diff --git a/planet/templates/planet/posts/detail.html b/planet/templates/planet/posts/detail.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n planet_tags %}
-{% load url from future %}
 
 {% block head_title %}
   {{ post.title|safe }}

diff --git a/planet/templates/planet/posts/details.html b/planet/templates/planet/posts/details.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load url from future %}
+
 <h2>
   <a href="{{ post.url }}" title="{% trans 'Read ' %} {{ post.title|safe }}"
     onclick="javascript: _gaq.push(['_trackEvent', 'Title Link', 'Click', 'long-content']);">

diff --git a/planet/templates/planet/posts/full_details.html b/planet/templates/planet/posts/full_details.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load url from future %}
+
 <div class="date">{{ post.date_modified|date:"M d Y" }}</div>
 <h1>{{ post.title|striptags|safe }}</h1>
 <table class="blog details table table-hover table-bordered">

diff --git a/planet/templates/planet/posts/list.html b/planet/templates/planet/posts/list.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title %}
   {% trans 'django-planet: django blog news aggregator' %}{{ block.super }}

diff --git a/planet/templates/planet/posts/short.html b/planet/templates/planet/posts/short.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load url from future %}
+
 <h2>
   <a href="{{ post.url }}" title="{% trans 'Read ' %} {{ post.title|safe }}"
     onclick="javascript: _gaq.push(['_trackEvent', 'Title Link', 'Click', 'short-content']);">

diff --git a/planet/templates/planet/tags/blocks/authors_cloud.html b/planet/templates/planet/tags/blocks/authors_cloud.html
@@ -1,5 +1,4 @@
 {% load i18n  %}
-{% load url from future %}
 {% if tags_cloud %}
 <h4>{% trans "Tag cloud" %}</h4>
 <ul class="nav nav-list">

diff --git a/planet/templates/planet/tags/blocks/blogs_cloud.html b/planet/templates/planet/tags/blocks/blogs_cloud.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 {% if tags_cloud %}
 <h4>{% trans "Tag cloud" %}</h4>
 <div class="tags cloud">

diff --git a/planet/templates/planet/tags/blocks/cloud.html b/planet/templates/planet/tags/blocks/cloud.html
@@ -1,5 +1,4 @@
 {% load i18n  %}
-{% load url from future %}
 <h4>{% trans "Tag cloud" %}</h4>
 <div class="tags cloud">
     {% for tag in tags_cloud %}

diff --git a/planet/templates/planet/tags/blocks/feeds_cloud.html b/planet/templates/planet/tags/blocks/feeds_cloud.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 {% if tags_cloud %}
 <h4>{% trans "Tag cloud" %}</h3>
 <div class="tags cloud">

diff --git a/planet/templates/planet/tags/blocks/related_list.html b/planet/templates/planet/tags/blocks/related_list.html
@@ -1,5 +1,4 @@
 {% load i18n  %}
-{% load url from future %}
 {% if related_tags %}
     <ul class="nav nav-list tags related">
         <li class="nav-header"><h3>{% trans "Related tags" %}</h3></li>

diff --git a/planet/templates/planet/tags/cloud.html b/planet/templates/planet/tags/cloud.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags  %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Tags cloud" %}{% endblock %}
 

diff --git a/planet/templates/planet/tags/detail.html b/planet/templates/planet/tags/detail.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags tagging_tags planet_tags %}
-{% load url from future %}
 
 {% block head_title %}
   {{ tag|safe }}: {% trans "django blog posts news" %}

diff --git a/planet/templates/planet/tags/list.html b/planet/templates/planet/tags/list.html
@@ -1,6 +1,5 @@
 {% extends "planet/base.html" %}
 {% load i18n pagination_tags planet_tags  %}
-{% load url from future %}
 
 {% block head_title %}{% trans "List of tags and categories" %}{% endblock %}
 

diff --git a/planet/templates/site_base.html b/planet/templates/site_base.html
@@ -1 +1 @@
-{% extends "base.html" %}
+{% extends "base.html" %}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{% extends "base.html" %}
		{% extends "base.html" %}