Templates bugs, gitignore.

Fixed template bugs (load before extends).
.tmp_* Eclipse stuff in .gitignore.

diff --git a/.gitignore b/.gitignore
index 1152ea7..d78f78f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ thumbs.db
 .project
 .settings
 .pydevproject
 .project
 .settings
 .pydevproject

+.tmp_*
+

diff --git a/wolnelektury/templates/1percent.html b/wolnelektury/templates/1percent.html
index 2e4c557..e53caee 100644 (file)
--- a/wolnelektury/templates/1percent.html
+++ b/wolnelektury/templates/1percent.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends 'base.html' %}
 {% extends 'base.html' %}

+{% load i18n %}

 
 {% block title %}1% podatku na WolneLektury.pl{% endblock title %}
 
 
 {% block title %}1% podatku na WolneLektury.pl{% endblock title %}
 

diff --git a/wolnelektury/templates/admin/catalogue/book/change_list.html b/wolnelektury/templates/admin/catalogue/book/change_list.html
index ee2b43f..09e567a 100644 (file)
--- a/wolnelektury/templates/admin/catalogue/book/change_list.html
+++ b/wolnelektury/templates/admin/catalogue/book/change_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "admin/change_list.html" %}
 {% extends "admin/change_list.html" %}

+{% load i18n %}

 
 {% block content %}
     <form action="{% url import_book %}" method="post" enctype="multipart/form-data">
 
 {% block content %}
     <form action="{% url import_book %}" method="post" enctype="multipart/form-data">

diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html
index 733314d..2e80c55 100644 (file)
--- a/wolnelektury/templates/auth/login.html
+++ b/wolnelektury/templates/auth/login.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 
 {% block title %}{% trans "Sign in" %} / {% trans "Register on"%} WolneLektury.pl{% endblock %}
 
 
 {% block title %}{% trans "Sign in" %} / {% trans "Register on"%} WolneLektury.pl{% endblock %}
 

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 4cc4ea8..414012f 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}
 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}

diff --git a/wolnelektury/templates/catalogue/book_fragments.html b/wolnelektury/templates/catalogue/book_fragments.html
index bb5fba2..0a90e45 100644 (file)
--- a/wolnelektury/templates/catalogue/book_fragments.html
+++ b/wolnelektury/templates/catalogue/book_fragments.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} {% "on " %} WolneLektury.pl{% endblock %}
 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} {% "on " %} WolneLektury.pl{% endblock %}

diff --git a/wolnelektury/templates/catalogue/book_list.html b/wolnelektury/templates/catalogue/book_list.html
index 47567f3..281e5e7 100644 (file)
--- a/wolnelektury/templates/catalogue/book_list.html
+++ b/wolnelektury/templates/catalogue/book_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags chunks %}
 
 {% block bodyid %}book-a-list{% endblock %}
 {% load catalogue_tags chunks %}
 
 {% block bodyid %}book-a-list{% endblock %}

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index d5cb775..d36fb1d 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{% title_from_tags tags %} w WolneLektury.pl{% endblock %}
 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{% title_from_tags tags %} w WolneLektury.pl{% endblock %}

diff --git a/wolnelektury/templates/lessons/document_detail.html b/wolnelektury/templates/lessons/document_detail.html
index 17faaea..7c6406c 100644 (file)
--- a/wolnelektury/templates/lessons/document_detail.html
+++ b/wolnelektury/templates/lessons/document_detail.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends 'base.html' %}
 {% extends 'base.html' %}

+{% load i18n %}

 
 {% block title %}{{ object.title }} w WolneLektury.pl{% endblock %}
 
 
 {% block title %}{{ object.title }} w WolneLektury.pl{% endblock %}
 

diff --git a/wolnelektury/templates/lessons/document_list.html b/wolnelektury/templates/lessons/document_list.html
index 9d30d51..84dee53 100644 (file)
--- a/wolnelektury/templates/lessons/document_list.html
+++ b/wolnelektury/templates/lessons/document_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}

 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags chunks %}
 
 {% block bodyid %}document-list-body{% endblock %}
 {% load catalogue_tags chunks %}
 
 {% block bodyid %}document-list-body{% endblock %}