diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-22 02:03:30 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-22 02:03:30 +0100 |
| commit | 9cc423cd1aab71ba1b5ebc5076f77e23a43e57a5 (patch) | |
| tree | f5104fc5d3a6c8c9e1019f1cbd8422e8d9e69567 /chimere | |
| parent | aefe06930781dd6abad98d0011fcab976d98ad7b (diff) | |
| download | Chimère-9cc423cd1aab71ba1b5ebc5076f77e23a43e57a5.tar.bz2 Chimère-9cc423cd1aab71ba1b5ebc5076f77e23a43e57a5.zip | |
Importer admin: Improve UI - fix bad bounding box on OSM importer
Diffstat (limited to 'chimere')
| -rw-r--r-- | chimere/models.py | 2 | ||||
| -rw-r--r-- | chimere/static/chimere/js/importer_interface.js | 9 | ||||
| -rw-r--r-- | chimere/widgets.py | 10 |
3 files changed, 15 insertions, 6 deletions
diff --git a/chimere/models.py b/chimere/models.py index fe38e11..dfca2f2 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -231,7 +231,7 @@ class Importer(models.Model): choices=IMPORTER_CHOICES) filtr = models.CharField(_(u"Filter"), max_length=200, blank=True, null=True) - source = models.CharField(_(u"Source"), max_length=200, + source = models.CharField(_(u"Web address"), max_length=200, blank=True, null=True) source_file = models.FileField(_(u"Source file"), upload_to='import_files', blank=True, null=True) diff --git a/chimere/static/chimere/js/importer_interface.js b/chimere/static/chimere/js/importer_interface.js index fc52b4c..9dc669f 100644 --- a/chimere/static/chimere/js/importer_interface.js +++ b/chimere/static/chimere/js/importer_interface.js @@ -23,6 +23,11 @@ django.jQuery(function($) { for (k=0; k<form_filters.length;k++){ $('.form-row.'+form_filters[k]).show(); } + if (importer_val == 'KML'){ + $('.help-kml').show(); + } else { + $('.help-kml').hide(); + } if (importer_val == 'OSM'){ $('.form-row.field-filtr').addClass('field-map'); $('#map_edit').show(); @@ -65,9 +70,9 @@ django.jQuery(function($) { value += '[' + $("#id_filtr_tag").val() + ']'; value += '[bbox='; value += $('#upper_left_lon').val() + ','; - value += $('#upper_left_lat').val() + ','; + value += $('#lower_right_lat').val() + ','; value += $('#lower_right_lon').val() + ','; - value += $('#lower_right_lat').val(); + value += $('#upper_left_lat').val(); value += ']'; $('#id_filtr').val(value); return false; diff --git a/chimere/widgets.py b/chimere/widgets.py index 219f30d..7fa8893 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -522,8 +522,12 @@ class ImportFiltrWidget(AreaWidget): tpl += u'var msg_missing_filtr = "%s";' % \ _(u"You have to insert a filter tag.") tpl += u"</script>\n" - help_msg = _(u"Don't forget to refresh before submit") - tpl += u"<p class='help-osm'>%s</p>\n" % help_msg + help_msg = _(u"If you change the above form don't forget to refresh "\ + u"before submit!") + tpl += u"<p class='help-osm errornote'>%s</p>\n" % help_msg + help_msg = _(u"You can put a Folder name in the KML file to filter on "\ + u"it.") + tpl += u"<p class='help-kml'>%s</p>\n" % help_msg if not value: value = '' tpl += u"<div><input type='text' id='id_%s' name='id_%s' "\ @@ -552,7 +556,7 @@ class ImportFiltrWidget(AreaWidget): lower_right_lon # as the regexp pass, we could be pretty confident self.xapi_type, self.xapi_tag, self.bounding_box = xapi_m.groups() - upper_left_lon, upper_left_lat, lower_right_lon, lower_right_lat = \ + upper_left_lon, lower_right_lat, lower_right_lon, upper_left_lat = \ self.bounding_box.split(',') return float(upper_left_lat), float(upper_left_lon), \ float(lower_right_lat), float(lower_right_lon) |