From 8b0f39478994c556243df536a399fcf9c9359c46 Mon Sep 17 00:00:00 2001 From: Oleg Lobanov Date: Fri, 19 Apr 2013 15:00:33 +0500 Subject: [PATCH] add django 1.5 support --- filebrowser/templates/filebrowser/append.html | 2 +- .../templates/filebrowser/include/breadcrumbs.html | 6 +++--- .../templates/filebrowser/include/filelisting.html | 14 ++++++++------ .../templates/filebrowser/include/toolbar.html | 4 +++- filebrowser/templates/filebrowser/index.html | 8 ++++---- filebrowser/templates/filebrowser/makedir.html | 4 ++-- filebrowser/templates/filebrowser/rename.html | 4 ++-- filebrowser/templates/filebrowser/upload.html | 12 ++++++------ filebrowser/templates/filebrowser/versions.html | 4 ++-- 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/filebrowser/templates/filebrowser/append.html b/filebrowser/templates/filebrowser/append.html index a96b3861..f531ec1f 100644 --- a/filebrowser/templates/filebrowser/append.html +++ b/filebrowser/templates/filebrowser/append.html @@ -4,7 +4,7 @@ - + diff --git a/filebrowser/templates/filebrowser/include/breadcrumbs.html b/filebrowser/templates/filebrowser/include/breadcrumbs.html index c847e7be..9b98743d 100644 --- a/filebrowser/templates/filebrowser/include/breadcrumbs.html +++ b/filebrowser/templates/filebrowser/include/breadcrumbs.html @@ -5,16 +5,16 @@ {% trans "Home" %} › {% endif %} {% if breadcrumbs or breadcrumbs_title %} - {% trans 'FileBrowser' %} › + {% trans 'FileBrowser' %} › {% else %} {% trans 'FileBrowser' %} {% endif %} {% for item in breadcrumbs %} {% if not forloop.last %} - {{ item.0 }} › + {{ item.0 }} › {% else %} {% if breadcrumbs_title %} - {{ item.0 }} › + {{ item.0 }} › {% else %} {{ item.0 }} {% endif %} diff --git a/filebrowser/templates/filebrowser/include/filelisting.html b/filebrowser/templates/filebrowser/include/filelisting.html index c8a04dea..eaf6949e 100644 --- a/filebrowser/templates/filebrowser/include/filelisting.html +++ b/filebrowser/templates/filebrowser/include/filelisting.html @@ -1,4 +1,6 @@ -{% load i18n adminmedia fb_tags fb_versions %} +{% load i18n fb_tags fb_versions %} +{% load admin_static admin_list %} +{% load admin_urls %} {% for file in page.object_list %} @@ -53,7 +55,7 @@ {% if file.filetype == "Folder" %} - + {% else %} {% endif %} @@ -82,16 +84,16 @@ - + {% if results_var.delete_total %} diff --git a/filebrowser/templates/filebrowser/include/toolbar.html b/filebrowser/templates/filebrowser/include/toolbar.html index ed533a2f..f73e7955 100644 --- a/filebrowser/templates/filebrowser/include/toolbar.html +++ b/filebrowser/templates/filebrowser/include/toolbar.html @@ -1,4 +1,6 @@ -{% load i18n adminmedia fb_tags %} +{% load i18n fb_tags %} +{% load admin_static admin_list %} +{% load admin_urls %}
diff --git a/filebrowser/templates/filebrowser/index.html b/filebrowser/templates/filebrowser/index.html index 7ca9382f..8e1c91a0 100644 --- a/filebrowser/templates/filebrowser/index.html +++ b/filebrowser/templates/filebrowser/index.html @@ -1,12 +1,12 @@ {% extends "admin/base_site.html" %} -{% load i18n adminmedia fb_tags fb_pagination %} +{% load admin_static admin_urls admin_list i18n fb_tags fb_pagination %} {% block extrastyle %} {{ block.super }} - + {% endblock %} @@ -45,8 +45,8 @@
{% block object-tools %} {% endblock %}
diff --git a/filebrowser/templates/filebrowser/makedir.html b/filebrowser/templates/filebrowser/makedir.html index 4dd4bbea..b22a79b4 100644 --- a/filebrowser/templates/filebrowser/makedir.html +++ b/filebrowser/templates/filebrowser/makedir.html @@ -1,12 +1,12 @@ {% extends "admin/base_site.html" %} -{% load i18n adminmedia fb_tags fb_csrf %} +{% load i18n admin_static fb_tags fb_csrf %} {% block extrastyle %} {{ block.super }} - + {% endblock %} diff --git a/filebrowser/templates/filebrowser/rename.html b/filebrowser/templates/filebrowser/rename.html index 37cad835..75940dce 100644 --- a/filebrowser/templates/filebrowser/rename.html +++ b/filebrowser/templates/filebrowser/rename.html @@ -1,12 +1,12 @@ {% extends "admin/base_site.html" %} -{% load i18n adminmedia fb_tags fb_csrf %} +{% load i18n admin_static fb_tags fb_csrf %} {% block extrastyle %} {{ block.super }} - + {% endblock %} diff --git a/filebrowser/templates/filebrowser/upload.html b/filebrowser/templates/filebrowser/upload.html index 17fc025e..9b8cd8da 100644 --- a/filebrowser/templates/filebrowser/upload.html +++ b/filebrowser/templates/filebrowser/upload.html @@ -1,12 +1,12 @@ {% extends "admin/base_site.html" %} -{% load i18n adminmedia fb_tags %} +{% load i18n admin_static admin_urls admin_list fb_tags %} {% block extrastyle %} {{ block.super }} - + {% endblock %} @@ -15,20 +15,20 @@ {% block extrahead %} {{ block.super }} - + - +
{% trans "FileBrowser" %}
{% trans "FileBrowser" %}{% trans "FileBrowser" %}
{{ file.filename }}{{ file.filename }} {{ file.filename }} @@ -69,7 +71,7 @@ {% endif %} {% endcomment %} {% if results_var.images_total and settings_var.ADMIN_VERSIONS and file.filetype == "Image" %} - {% trans 'Versions' %} + {% trans 'Versions' %} {% endif %} {{ file.datetime|date:"N j, Y" }} {% ifnotequal file.filetype 'Folder' %} - + {% else %} {% if file.is_empty %} - + {% endif %} {% endifnotequal %}