diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-25 18:54:57 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-25 18:54:57 +0200 |
| commit | 4c009dfbdccfac94d6e6a99b8701205922cb2fac (patch) | |
| tree | dcf341e6eee2834ac3eab1c6198f146bac766389 /ishtar_common | |
| parent | 223aa279414dae547db923212babc0b5017745c0 (diff) | |
| download | Ishtar-4c009dfbdccfac94d6e6a99b8701205922cb2fac.tar.bz2 Ishtar-4c009dfbdccfac94d6e6a99b8701205922cb2fac.zip | |
Fix messup between static and media files
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/404.html | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/window.html | 6 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 6 |
5 files changed, 12 insertions, 12 deletions
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 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"> + <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> - <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> + <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> </head> <body> <div> 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 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"/> + <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"/> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> <script language="javascript" type="text/javascript"> @@ -13,9 +13,9 @@ <script language="javascript" type="text/javascript" src="{{JQUERY_URL}}"></script> <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}jquery-ui.js"></script> <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script> - <script language="javascript" type="text/javascript" src="{{MEDIA_URL}}/js/ishtar.js"></script> + <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script> <link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" /> - <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> + <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> {% block extra_head %} {% endblock %} </head> 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 @@ <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> {% block css_head %} - <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> + <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> {% endblock %} </head> <body> 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 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"> + <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> <script language="javascript" type="text/javascript"> @@ -13,9 +13,9 @@ <script language="javascript" type="text/javascript" src="{{JQUERY_URL}}"></script> <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}jquery-ui.js"></script> <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script> - <script language="javascript" type="text/javascript" src="{{MEDIA_URL}}/js/ishtar.js"></script> + <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script> <link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" /> - <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> + <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> {% block extra_head %} {% endblock %} </head> 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={},
|