diff options
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 13 | ||||
| -rw-r--r-- | chimere/static/chimere/img/ajax-loader.gif | bin | 0 -> 3208 bytes | |||
| -rw-r--r-- | chimere/templates/chimere/edit.html | 20 | ||||
| -rw-r--r-- | chimere/views.py | 1 |
4 files changed, 32 insertions, 2 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 2fc42df..f8ed3fe 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -583,6 +583,19 @@ table.inline-table td input[type=file]{ display:inline-table; } +#upload_in_progress{ + display:none; + text-align:center; + z-index:10; +} + +#upload_in_progress img{ + display: block; + margin-left: auto; + margin-right: auto; +} + + /* openlayer customisation */ .olControlPermalink { display: block; diff --git a/chimere/static/chimere/img/ajax-loader.gif b/chimere/static/chimere/img/ajax-loader.gif Binary files differnew file mode 100644 index 0000000..3c2f7c0 --- /dev/null +++ b/chimere/static/chimere/img/ajax-loader.gif diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html index 447de71..66862cd 100644 --- a/chimere/templates/chimere/edit.html +++ b/chimere/templates/chimere/edit.html @@ -130,7 +130,25 @@ {{ form.submiter_comment }} </div> </div> - <p><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p> + <div id='upload_in_progress'> + <p>{% trans "Upload in progress. Please wait..." %}</p> + <p><img src='{{STATIC_URL}}chimere/img/ajax-loader.gif'/></p> + </div> + <script text='text/javascript'> + $( "#upload_in_progress" ).dialog({ + modal: true, + resizable:false, + height:110, + autoOpen:false + } + ); + $(".ui-dialog-titlebar").hide(); + function displayProgress(){ + $("#upload_in_progress").dialog('open'); + return true; + } + </script> + <p><input type='submit' onclick='saveExtent();displayProgress();' value="{% trans 'Propose'%}"/></p> </form> </fieldset> </div> diff --git a/chimere/views.py b/chimere/views.py index 35c9179..f10b7fa 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -253,7 +253,6 @@ def edit(request, area_name="", item_id=None, submited=False): return response item_id, init_item, response_dct, form, formset_multi, formset_picture = \ values - # get the "manualy" declared_fields. Ie: properties declared_fields = form.declared_fields.keys() declared_fields = PropertyModel.objects.filter(available=True).all() |
