summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoretienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864>2009-01-15 11:38:52 +0000
committeretienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864>2009-01-15 11:38:52 +0000
commit386c30ef568e7e5cfdc31654c83fc972c9094c15 (patch)
tree07c416ef0f406667f3f878b1f0f0c0e1cff6008c
parent2e323678536f896f67a3ceafbbb59ca985838481 (diff)
downloadChimère-386c30ef568e7e5cfdc31654c83fc972c9094c15.tar.bz2
Chimère-386c30ef568e7e5cfdc31654c83fc972c9094c15.zip
Bug correction on administration pages
git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@15 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864
-rw-r--r--main/views.py3
-rw-r--r--main/widgets.py6
-rw-r--r--templates/base.html1
3 files changed, 6 insertions, 4 deletions
diff --git a/main/views.py b/main/views.py
index 0aadb18..04b6919 100644
--- a/main/views.py
+++ b/main/views.py
@@ -51,7 +51,8 @@ def index(request):
if all_checked:
cat.selected = True
extra_js = ""
- for url in URL_OSM_JS + ["%smain_map.js" % settings.MEDIA_URL]:
+ for url in URL_OSM_JS + ["%sbase.js" % settings.MEDIA_URL,
+ "%smain_map.js" % settings.MEDIA_URL,]:
extra_js += '<script src="%s"></script>\n' % url
extra_js += '<script src="/chimere/jsi18n/"></script>\n'
# show the welcome page
diff --git a/main/widgets.py b/main/widgets.py
index 2f2154b..c0aa2f4 100644
--- a/main/widgets.py
+++ b/main/widgets.py
@@ -56,7 +56,8 @@ class PointChooserWidget(forms.TextInput):
css = {
"all": ("%sforms.css" % settings.MEDIA_URL,)
}
- js = URL_OSM_JS + ["%sedit_map.js" % settings.MEDIA_URL]
+ js = URL_OSM_JS + ["%sedit_map.js" % settings.MEDIA_URL,
+ "%sbase.js" % settings.MEDIA_URL,]
def render(self, name, value, attrs=None):
'''
@@ -119,7 +120,8 @@ class RouteChooserWidget(forms.TextInput):
css = {
"all": ("%sforms.css" % settings.MEDIA_URL,)
}
- js = ["%sedit_route_map.js" % settings.MEDIA_URL] + URL_OSM_JS
+ js = ["%sedit_route_map.js" % settings.MEDIA_URL,
+ "%sbase.js" % settings.MEDIA_URL,] + URL_OSM_JS
def render(self, name, value, attrs=None):
'''
diff --git a/templates/base.html b/templates/base.html
index f54450d..e089032 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,7 +8,6 @@
<script type="text/javascript"><!--
var media_path = '{{ media_path }}';
// --></script>
- <script src="{{ media_path }}base.js"></script>
{% block extra_head %}{{extra_head|safe}}{% endblock %}
</head>