From: Radek Czajka Date: Tue, 11 May 2010 08:36:19 +0000 (+0200) Subject: Templates bugs, gitignore. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3c3017d22da6f0a990ee88417e6e79ed7450245c?ds=inline;hp=-c Templates bugs, gitignore. Fixed template bugs (load before extends). .tmp_* Eclipse stuff in .gitignore. --- 3c3017d22da6f0a990ee88417e6e79ed7450245c diff --git a/.gitignore b/.gitignore index 1152ea7a0..d78f78f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ thumbs.db .project .settings .pydevproject +.tmp_* + diff --git a/wolnelektury/templates/1percent.html b/wolnelektury/templates/1percent.html index 2e4c5576b..e53caeefd 100644 --- a/wolnelektury/templates/1percent.html +++ b/wolnelektury/templates/1percent.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends 'base.html' %} +{% load i18n %} {% 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 ee2b43f39..09e567a5d 100644 --- 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" %} +{% load i18n %} {% block content %}
diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html index 733314dac..2e80c55a3 100644 --- a/wolnelektury/templates/auth/login.html +++ b/wolnelektury/templates/auth/login.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends "base.html" %} +{% load i18n %} {% 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 4cc4ea82a..414012fe5 100644 --- a/wolnelektury/templates/catalogue/book_detail.html +++ b/wolnelektury/templates/catalogue/book_detail.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends "base.html" %} +{% load i18n %} {% 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 bb5fba2b8..0a90e459c 100644 --- a/wolnelektury/templates/catalogue/book_fragments.html +++ b/wolnelektury/templates/catalogue/book_fragments.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends "base.html" %} +{% load i18n %} {% 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 47567f3eb..281e5e73d 100644 --- a/wolnelektury/templates/catalogue/book_list.html +++ b/wolnelektury/templates/catalogue/book_list.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends "base.html" %} +{% load i18n %} {% 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 d5cb775f3..d36fb1d57 100644 --- 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" %} +{% load i18n %} {% 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 17faaea48..7c6406c19 100644 --- a/wolnelektury/templates/lessons/document_detail.html +++ b/wolnelektury/templates/lessons/document_detail.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends 'base.html' %} +{% load i18n %} {% 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 9d30d519e..84dee5352 100644 --- a/wolnelektury/templates/lessons/document_list.html +++ b/wolnelektury/templates/lessons/document_list.html @@ -1,5 +1,5 @@ -{% load i18n %} {% extends "base.html" %} +{% load i18n %} {% load catalogue_tags chunks %} {% block bodyid %}document-list-body{% endblock %}