From 9e3b8dad3a369c212c5d7d3cc0af7fc4f3cf2b6c Mon Sep 17 00:00:00 2001
From: zuber <marek@stepniowski.com>
Date: Tue, 26 Jan 2010 22:15:05 +0100
Subject: [PATCH] =?utf8?q?Dodanie=20planszy=20=C5=82adowania=20do=20docume?=
 =?utf8?q?nt=5Fdetails.html.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 platforma/static/css/master.css               |  42 +++++++++++++-
 platforma/static/img/spinner.gif              | Bin 2767 -> 2608 bytes
 platforma/static/js/main.js                   |  53 ++++++++++++------
 .../templates/wiki/document_details.html      |   3 +
 4 files changed, 81 insertions(+), 17 deletions(-)

diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css
index 5c5587d5..9d3efeca 100755
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -3,6 +3,8 @@ body {
     overflow: hidden;
     padding: 0;
     min-width: 960px;
+    width: 100%;
+    height: 100%;
 }
 
 .vsplitbar {
@@ -193,7 +195,7 @@ p { margin: 0;}
     overflow: hidden;
 }
 
-img {
+.gallery-image img {
     position: absolute;
     -moz-drag: none;
     user-select: none;
@@ -201,4 +203,42 @@ img {
     -khtml-user-select: none;
     -moz-user-select: none;
     cursor: pointer;
+}
+
+
+#body-wrap {
+    height: 100%;
+    width: 100%;
+}
+#content {
+    height: 100%;
+    width: 100%;
+}
+
+#loading-overlay {
+    background-color: #FFF;
+    position: absolute;
+    z-index: 1000;
+    padding: 0;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+#loading-message {
+    position: absolute;
+    height: 20px;
+    width: 120px;
+    left: 50%;
+    margin-left: -60px;
+    top: 50%;
+    margin-top: -10px;
+/*    text-align: center;*/
+}
+
+#loading-message img {
+    float: left;
+    margin-right: 10px;
+    margin-top: -6px;
 }
\ No newline at end of file
diff --git a/platforma/static/img/spinner.gif b/platforma/static/img/spinner.gif
index f864d5fd38b7466c76b5a36dc0e3e9455c0126e2..c69e937232b24ea30f01c68bbd2ebc798dcecfcb 100644
GIT binary patch
literal 2608
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
T)6_**#cgp_+?JL9(ew3BlNF>u

literal 2767
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
XWBrHU7iSEP8X8hQyAJO{V6g1pwSv80

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index edd82e35..22ec7332 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -287,41 +287,61 @@ function gallery(element, url) {
 }
 
 
-function transform(editor) {
-    $.blockUI({message: 'Ładowanie...'});
+function transform(editor, callback) {
+    if (!callback) {
+        $.blockUI({message: 'Ładowanie...'});
+    }
     setTimeout(function() {
         xml2html({
             xml: editor.getCode(),
             success: function(element) {
                 $('#html-view').html(element);
                 $.unblockUI();
+                if (callback) {
+                    callback();
+                }
             }, error: function(text) {
                 $('#html-view').html('<p class="error">Wystąpił błąd:</p><pre>' + text + '</pre>');
                 $.unblockUI();
+                if (callback) {
+                    callback();
+                }
             }
         });
     }, 200);
 };
 
 
-function reverseTransform(editor, cont) {
+function reverseTransform(editor, cont, errorCont, dontBlock) {
     var serializer = new XMLSerializer();
     if ($('#html-view .error').length > 0) {
+        if (errorCont) {
+            errorCont();
+        }
         return;
     }
-    $.blockUI({message: 'Ładowanie...'});
+    if (!dontBlock) {
+        $.blockUI({message: 'Ładowanie...'});
+    }
     setTimeout(function() {
         html2xml({
             xml: serializer.serializeToString($('#html-view div').get(0)),
             success: function(text) {
                 editor.setCode(text);
-                $.unblockUI();
+                if (!dontBlock) {
+                    $.unblockUI();
+                }
                 if (cont) {
                     cont();
                 }
             }, error: function(text) {
                 $('#source-editor').html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
-                $.unblockUI();
+                if (!dontBlock) {
+                    $.unblockUI();
+                }
+                if (errorCont) {
+                    errorCont();
+                }
             }
         });
     }, 200);
@@ -688,19 +708,20 @@ $(function() {
             $('#save-cancel').click(function() {
                 $.unblockUI();
             });
-
-            $('#simple-view-tab').click(function() {
-                if ($(this).hasClass('active')) {
+            
+            function changeTab(callback) {
+                if ($('#simple-view-tab').hasClass('active')) {
                     return;
                 }
-                $(this).addClass('active');
+                $('#simple-view-tab').addClass('active');
                 $('#source-view-tab').removeClass('active');
                 $('#source-editor').hide();
                 $('#simple-editor').show();
-                transform(editor);
-            });
-
-            $('#source-view-tab').click(function() {
+                transform(editor, callback);
+            }        
+            $('#simple-view-tab').click(function() { changeTab(); });
+            
+            $('#source-view-tab').click(function() { 
                 if ($(this).hasClass('active')) {
                     return;
                 }
@@ -708,7 +729,7 @@ $(function() {
                 $('#simple-view-tab').removeClass('active');
                 $('#simple-editor').hide();
                 $('#source-editor').show();
-                reverseTransform(editor);
+                reverseTransform(editor);    
             });
 
             $('#source-editor .toolbar button').click(function(event) {
@@ -727,7 +748,7 @@ $(function() {
             $('.toolbar-buttons-container').hide();
             $('.toolbar select').change();
 
-            $('#simple-view-tab').click();
+            changeTab(function() { $('#loading-overlay').fadeOut() }, function() { $('#loading-overlay').fadeOut() }, true)
         }
     });
     
diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
index 10a3af09..ad71c847 100644
--- a/platforma/templates/wiki/document_details.html
+++ b/platforma/templates/wiki/document_details.html
@@ -18,6 +18,9 @@
 {% endblock %}
 
 {% block maincontent %}
+        <div id="loading-overlay">
+            <div id="loading-message"><img src="{{STATIC_URL}}img/spinner.gif" /><p>Ładowanie</p></div>
+        </div>
         <div id="document-meta" style="display:none">
         {% for k, v in document.meta.items %}
             <div class="{{ k }}">{{ v}}</div>
-- 
2.20.1