From 02598e2ba0d244ced3d8bb25448d2a7bacf93ba7 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Fri, 24 Aug 2012 20:47:10 +0200
Subject: Add an "upload in progress" dialog when submiting the edit form

---
 chimere/static/chimere/css/styles.css      |  13 +++++++++++++
 chimere/static/chimere/img/ajax-loader.gif | Bin 0 -> 3208 bytes
 chimere/templates/chimere/edit.html        |  20 +++++++++++++++++++-
 chimere/views.py                           |   1 -
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 chimere/static/chimere/img/ajax-loader.gif

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
new file mode 100644
index 0000000..3c2f7c0
Binary files /dev/null and b/chimere/static/chimere/img/ajax-loader.gif differ
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()
-- 
cgit v1.2.3