From 4c009dfbdccfac94d6e6a99b8701205922cb2fac Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 25 Aug 2013 18:54:57 +0200 Subject: Fix messup between static and media files --- ishtar_common/templates/404.html | 4 ++-- ishtar_common/templates/base.html | 6 +++--- ishtar_common/templates/ishtar/sheet.html | 2 +- ishtar_common/templates/window.html | 6 +++--- ishtar_common/widgets.py | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/templates/404.html b/ishtar_common/templates/404.html index 8ab3b07de..aec82ca88 100644 --- a/ishtar_common/templates/404.html +++ b/ishtar_common/templates/404.html @@ -4,10 +4,10 @@ - + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} - +
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 007314892..e2aef1ca0 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -4,7 +4,7 @@ - + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} - + - + {% block extra_head %} {% endblock %} diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html index 5608a684f..ff21f26e9 100644 --- a/ishtar_common/templates/ishtar/sheet.html +++ b/ishtar_common/templates/ishtar/sheet.html @@ -7,7 +7,7 @@ {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} {% block css_head %} - + {% endblock %} diff --git a/ishtar_common/templates/window.html b/ishtar_common/templates/window.html index a92f859ab..c473eff89 100644 --- a/ishtar_common/templates/window.html +++ b/ishtar_common/templates/window.html @@ -4,7 +4,7 @@ - + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} - + - + {% block extra_head %} {% endblock %} diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 82c0c0ac0..b3e366e0d 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -185,11 +185,11 @@ class JQueryAutoComplete(forms.TextInput): class JQueryJqGrid(forms.RadioSelect): COL_TPL = "{name:'%(idx)s', index:'%(idx)s', sortable:true}" class Media: - js = ['%s/js/i18n/grid.locale-%s.js' % (settings.MEDIA_URL, + js = ['%s/js/i18n/grid.locale-%s.js' % (settings.STATIC_URL, settings.COUNTRY), - '%s/js/jquery.jqGrid.min.js' % settings.MEDIA_URL, + '%s/js/jquery.jqGrid.min.js' % settings.STATIC_URL, ] - css = {'all':['%s/media/ui.jqgrid.css' % settings.MEDIA_URL, + css = {'all':['%s/media/ui.jqgrid.css' % settings.STATIC_URL, ]} def __init__(self, source, form, associated_model, attrs={}, -- cgit v1.2.3