diff options
| -rw-r--r-- | chimere/forms.py | 2 | ||||
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 4 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/routing.html | 4 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit.html | 3 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 3ee4566..ed06805 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -122,7 +122,7 @@ class MarkerAdminFormBase(forms.ModelForm): """ Main form for marker """ - description = forms.CharField(widget=TextareaWidget) + description = forms.CharField(widget=TextareaWidget, blank=True, null=True) class Meta: model = Marker diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 6529981..454480a 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -699,6 +699,10 @@ table.inline-table td input[type=file]{ margin-right: auto; } +.alert-box .ui-dialog-titlebar { + display:none; +} + ul#multimedia_list_content{ padding:0; margin:0; diff --git a/chimere/templates/chimere/blocks/routing.html b/chimere/templates/chimere/blocks/routing.html index 639fd18..20a0606 100644 --- a/chimere/templates/chimere/blocks/routing.html +++ b/chimere/templates/chimere/blocks/routing.html @@ -54,10 +54,10 @@ $(document).ready(function() { $('#chimere_itinerary_form').show(); }); $('#chimere_itinerary_new').click(function(){ - $('#map').chimere('routingClear'); + $('#main-map').chimere('routingClear'); }); $('#search_routing').click(function(){ - $('#map').chimere('route'); + $('#main-map').chimere('route'); }); }); </script> diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html index 66862cd..867437e 100644 --- a/chimere/templates/chimere/edit.html +++ b/chimere/templates/chimere/edit.html @@ -139,7 +139,8 @@ modal: true, resizable:false, height:110, - autoOpen:false + autoOpen:false, + dialogClass:'alert-box' } ); $(".ui-dialog-titlebar").hide(); diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 71ac9b0..b2f045f 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -135,6 +135,7 @@ def routing(context): @register.inclusion_tag('chimere/blocks/map_params.html', takes_context=True) def map_params(context): context_data = {} + context_data['STATIC_URL'] = settings.STATIC_URL context_data['icon_offset_x'] = settings.CHIMERE_ICON_OFFSET_X context_data['icon_offset_y'] = settings.CHIMERE_ICON_OFFSET_Y context_data['icon_width'] = settings.CHIMERE_ICON_WIDTH |