Fixed #730, #733: problems with saving

Added an option to hide the saving process, allowing the user to
save their work locally in case of connection problems.

diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html
index 28567e1..f86f936 100644 (file)
--- a/apps/wiki/templates/wiki/document_details_base.html
+++ b/apps/wiki/templates/wiki/document_details_base.html
@@ -38,6 +38,7 @@
         | {% trans "Version" %}: <span id="document-revision">{% trans "Unknown" %}</span>
                {% if not readonly %}
             | <button style="margin-left: 6px" id="save-button">{% trans "Save" %}</button>
         | {% trans "Version" %}: <span id="document-revision">{% trans "Unknown" %}</span>
                {% if not readonly %}
             | <button style="margin-left: 6px" id="save-button">{% trans "Save" %}</button>

+                       <span id='save-attempt-info'>{% trans "Save attempt in progress" %}</span>

                {% endif %}
     </div>
     <ol id="tabs">
                {% endif %}
     </div>
     <ol id="tabs">

diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index c14a3dc..fd05daa 100644 (file)
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -87,6 +87,20 @@ body {
     font-weight: bold;
 }
 
     font-weight: bold;
 }
 

+#header.saving {
+       background-color: #E1C1C1;
+}
+#header.saving #save-button {
+    display: none;
+}
+#save-attempt-info {
+    color: #801000;
+    display: none;
+}
+.saving #save-attempt-info {
+    display: inline;
+}
+

 #header h1, #header h1 a {
     margin: 0;
     padding: 0;
 #header h1, #header h1 a {
     margin: 0;
     padding: 0;

diff --git a/redakcja/static/js/wiki/dialog_save.js b/redakcja/static/js/wiki/dialog_save.js
index 916f326..aa9258d 100644 (file)
--- a/redakcja/static/js/wiki/dialog_save.js
+++ b/redakcja/static/js/wiki/dialog_save.js
@@ -28,9 +28,10 @@
                        var self = this;
 
                        self.$elem.block({
                        var self = this;
 
                        self.$elem.block({

-                               message: "Zapisywanie...",
+                               message: "Zapisywanie... <br/><button id='save-hide'>ukryj</button>",

                                fadeIn: 0,
                        });
                                fadeIn: 0,
                        });

+            $.wiki.blocking = self.$elem;

 
                        try {
 
 
                        try {
 

diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index ad31af3..b6388f1 100644 (file)
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -222,6 +222,8 @@
                        success: function(data) {
                                var changed = false;
 
                        success: function(data) {
                                var changed = false;
 

+                $('#header').removeClass('saving');
+

                                if (data.text) {
                                        self.text = data.text;
                                        self.revision = data.revision;
                                if (data.text) {
                                        self.text = data.text;
                                        self.revision = data.revision;


@@ -233,17 +235,31 @@
                                params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
                        },
                        error: function(xhr) {
                                params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
                        },
                        error: function(xhr) {

-                               try {
-                                       params['failure'](self, $.parseJSON(xhr.responseText));
-                               }
-                               catch (e) {
-                                       params['failure'](self, {
-                                               "__message": "<p>Nie udało się zapisać - błąd serwera.</p>"
-                                       });
-                               };
+                if ($('#header').hasClass('saving')) {
+                    $('#header').removeClass('saving');
+                    $.blockUI({
+                        message: "<p>Nie udało się zapisać zmian. <br/><button onclick='$.unblockUI()'>OK</button></p>"
+                    })
+                }
+                else {
+                    try {
+                        params['failure'](self, $.parseJSON(xhr.responseText));
+                    }
+                    catch (e) {
+                        params['failure'](self, {
+                            "__message": "<p>Nie udało się zapisać - błąd serwera.</p>"
+                        });
+                    };
+                }

 
                        }
                });
 
                        }
                });

+
+        $('#save-hide').click(function(){
+            $('#header').addClass('saving');
+            $.unblockUI();
+            $.wiki.blocking.unblock();
+        });

        }; /* end of save() */
 
        WikiDocument.prototype.publish = function(params) {
        }; /* end of save() */
 
        WikiDocument.prototype.publish = function(params) {