diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-09-11 18:36:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-09-11 18:36:18 +0200 |
| commit | 44f59415bcd14040d60dfca8b7741945ac0b45d6 (patch) | |
| tree | 4df265f129030355ddefaeb80139ff64742b840d | |
| parent | 5b8ae1b8b14346c3108e6235aa31e7a850361b0d (diff) | |
| download | Chimère-44f59415bcd14040d60dfca8b7741945ac0b45d6.tar.bz2 Chimère-44f59415bcd14040d60dfca8b7741945ac0b45d6.zip | |
Correct bad jquery inclusion
| -rw-r--r-- | chimere/main/widgets.py | 1 | ||||
| -rw-r--r-- | chimere/templates/base.html | 1 | ||||
| -rw-r--r-- | chimere/templates/upload_file.html | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/chimere/main/widgets.py b/chimere/main/widgets.py index daaaff8..74fc022 100644 --- a/chimere/main/widgets.py +++ b/chimere/main/widgets.py @@ -315,7 +315,6 @@ class MultiSelectWidget(forms.SelectMultiple): ) } js = ( - settings.MEDIA_URL + 'jquery/jquery-1.4.4.min.js', settings.MEDIA_URL + 'jquery/bsmSelect/js/jquery.bsmselect.js', settings.MEDIA_URL + 'jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', ) diff --git a/chimere/templates/base.html b/chimere/templates/base.html index e45cfa2..70ee914 100644 --- a/chimere/templates/base.html +++ b/chimere/templates/base.html @@ -11,6 +11,7 @@ {% block extra_head %}{{extra_head|safe}}{% endblock %} <link rel="stylesheet" href="{{media_path}}styles.css" /> {%if css_area%}<link rel="stylesheet" href="{{media_path}}{{css_area}}" />{%endif%} + <script type="text/javascript" src="{{JQUERY_URL}}"></script> {% block head %}{% endblock %} </head> diff --git a/chimere/templates/upload_file.html b/chimere/templates/upload_file.html index a4288da..b6e8d40 100644 --- a/chimere/templates/upload_file.html +++ b/chimere/templates/upload_file.html @@ -21,7 +21,7 @@ <div class="fieldWrapper"> {% if gpx_id %} <script type="text/javascript"><!-- - $.get(extra_url + "process_route_file/{{gpx_id}}/", function(data) { + jQuery.get(extra_url + "process_route_file/{{gpx_id}}/", function(data) { var data = jQuery.parseJSON(data); var main_page = opener.document; jQuery(main_page).find("#id_route").val(data.wkt); |