Merge branch 'master' of git@stigma:platforma

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 7982059..f699cd6 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -1,6 +1,7 @@
 body {
     margin: 0;
     font: 100%/1.5 Georgia, Verdana, sans-serif;
+    overflow: hidden;
 }
 
 #breadcrumbs {
@@ -71,19 +72,40 @@ label {
     padding: 5px 10px;
     overflow-x: hidden;
     overflow-y: scroll;
-    width: 480px;
-    height: 480px;
-    border: 1px solid #999;
 }
 
 #images-wrap {
-    float: left;
-    width: 49%;
+    width: 0px;
     height: 480px;
-    border: 1px solid #999;
-/*    padding: 5px 10px;*/
+    border-right: 1px solid #999;
     overflow-y: scroll;
     overflow-x: hidden;
+    background-color: #fff;
+    float: left;
+}
+
+#sidebar {
+    float: left;
+    width: 8px;
+    overflow: hidden;
+}
+
+#toggle-sidebar {
+    background-color: #DDD;
+    width: 7px;
+    height: 100%;
+    float: left;
+}
+
+#toggle-sidebar:hover {
+    background-color: #999;
+    cursor: pointer;
+}
+
+#status-bar {
+    border-top: 1px solid #999;
+    background-color: #EEE;
+    padding: 2px 10px;
 }
 
 .errorlist {
@@ -100,4 +122,8 @@ label {
 
 p { 
     margin: 0;
-}
\ No newline at end of file
+}
+
+.image-box {
+    border-top: 1px solid #DDD;
+}

diff --git a/project/static/js/jquery.autoscroll.js b/project/static/js/jquery.autoscroll.js
new file mode 100644 (file)
index 0000000..f8c07fb
--- /dev/null
+++ b/project/static/js/jquery.autoscroll.js
@@ -0,0 +1,47 @@
+(function($) {
+    $.fn.autoscroll = function(synchronizeWith, options) {
+        var $this = $(this);
+        var self = $this;
+        var selfContainer = self.parent();
+        var synchronizeWith = $(synchronizeWith);
+        var synchronizeWithContainer = synchronizeWith.parent();
+        var eventContainer = synchronizeWithContainer;
+
+        // Hack for iframes
+        if (self.is('iframe')) {
+            selfContainer = $('body', $('iframe').contents());
+            self = selfContainer;
+        }
+        
+        if (synchronizeWith.is('iframe')) {
+            eventContainer = synchronizeWith.contents();
+            synchronizeWithContainer = $('body', eventContainer);
+            synchronizeWith = synchronizeWithContainer;
+        }
+        
+        $this.data('autoscroll:enabled', true);
+        synchronizeWithContainer.data('autoscroll:lastCheckedScrollTop', synchronizeWithContainer.scrollTop());
+        
+        eventContainer.scroll(function() {
+            if ($this.data('autoscroll:enabled')) {
+                var distanceScrolled = synchronizeWithContainer.scrollTop() - synchronizeWithContainer.data('autoscroll:lastCheckedScrollTop');
+                var percentScrolled = distanceScrolled / synchronizeWith.height();
+                selfContainer.scrollTop(selfContainer.scrollTop() + percentScrolled * self.height());
+            }
+            synchronizeWithContainer.data('autoscroll:lastCheckedScrollTop', synchronizeWithContainer.scrollTop());
+        });
+    },
+    
+    $.fn.enableAutoscroll = function() {
+        $(this).data('autoscroll:enabled', true);
+    },
+        
+    $.fn.disableAutoscroll = function() {
+        $(this).data('autoscroll:enabled', false);
+    },
+    
+    $.fn.toggleAutoscroll = function() {
+        $(this).data('autoscroll:enabled', !$(this).data('autoscroll:enabled'));
+    }
+})(jQuery);
+

diff --git a/project/static/js/jquery.lazyload.js b/project/static/js/jquery.lazyload.js
index 25c9486..ea3de6f 100644 (file)
--- a/project/static/js/jquery.lazyload.js
+++ b/project/static/js/jquery.lazyload.js
@@ -31,7 +31,13 @@
                         || belowViewport(container, this, settings.threshold)) {
                         $(this).html(settings.placeholder);
                     } else {
-                        $(this).html('<img src="' + $(this).attr('src') + '" width="' + $(this).width() + '" />');
+                        $(this).html('');
+                        var self = this;
+                        $('<img src="' + $(this).attr('src') + '" width="' + $(this).width() + '" />').load(function() {
+                            if ($(this).height() > $(self).height()) {
+                                $(self).height($(this).height());
+                            }
+                        }).appendTo(this);
                     }
                 })
             }

diff --git a/project/templates/explorer/file_html.html b/project/templates/explorer/file_html.html
index f3fe187..ab8e40b 100644 (file)
--- a/project/templates/explorer/file_html.html
+++ b/project/templates/explorer/file_html.html
@@ -10,7 +10,15 @@
                 });
             });
             
-            $('#images').lazyload('.image-box', {threshold: 600});
+            function resizePanels() {
+                $('#images-wrap').height($(window).height() - 80);
+                $('#file-text').height($(window).height() - 80);
+            }
+            
+            $(window).resize(resizePanels)
+            resizePanels();
+            
+            $('#images-wrap').lazyload('.image-box', {threshold: 600});
         });
     </script>
 {% endblock extrahead %}
@@ -20,8 +28,13 @@
 {% block maincontent %}
     <div id="tabs"><a href="{% url file_xml hash %}">Źródło</a><a href="{% url file_html hash %}" class="active">HTML</a><div style="padding: 3px; margin-left: 10px">{{ image_folders_form.folders }}</div><div style="clear: both; height: 0; width: 0">&nbsp;</div></div>    
 
-    <div id="images">
-        <p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>
+    <div id="sidebar">
+        <div id="images-wrap">
+            <div id="images">
+                <p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>
+            </div>
+        </div>
+        <div id="toggle-sidebar"></div>
     </div>
     <div id="file-text">
     {{ object|safe }}

diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index bd022e9..e9cd85c 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -4,6 +4,7 @@
     <script src="/static/js/jquery.fieldselection.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/static/js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
         function addEditorButton(label, fn) {
             $('<button type="button">' + label + '</button>').click(function(event) {
@@ -19,7 +20,27 @@
                     $('#images').data('lastScroll', -1000);
                 });
             });
-                    
+            
+            function resizePanels() {
+                $('iframe').width($(window).width() - $('#sidebar').outerWidth());
+                $('iframe').height($(window).height() - 100);
+                $('#images-wrap, #toggle-sidebar').height($(window).height() - 100);
+            }
+            
+            $('#toggle-sidebar').toggle(function() {
+                $('#images-wrap').width(480);
+                $('#sidebar').width(488);
+                resizePanels();
+            }, function() {
+                $('#images-wrap').width(0);
+                $('#sidebar').width(8);
+                resizePanels();
+            })
+            
+            $(window).resize(function() {
+                resizePanels();
+            })
+            
             var editor = CodeMirror.fromTextArea("id_text", {
                 parserfile: 'parsexml.js',
                 path: "/static/js/codemirror/",
@@ -28,16 +49,21 @@
             });
             
             $('iframe').load(function() {
-                $($('iframe').contents()).scroll(function() {
-                    var percentScrolled = $('body', this).scrollTop() / $('body', this).height();
-                    $('#images-wrap').scrollTop(percentScrolled * $('#images').height());
-                });
+                $('#images').autoscroll('iframe');
+                $('.toggleAutoscroll').toggle(function() {
+                    $(this).html('Synchronizuj przewijanie');
+                    $('#images').disableAutoscroll();
+                }, function() {
+                    $(this).html('Nie synchronizuj przewijania');
+                    $('#images').enableAutoscroll();
+                })
+                setTimeout(function() {resizePanels();}, 10);
             })
             
             addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });
             addEditorButton('akap', function(text) { return '<akap>' + text + '</akap>'; });
             
-            $('#images').lazyload('.image-box', {threshold: 600});
+            $('#images-wrap').lazyload('.image-box', {threshold: 640 * 10, scrollTreshold: 640 * 5});
         });
 
     </script>
@@ -46,19 +72,30 @@
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 
 {% block maincontent %}
-    <div id="tabs"><a href="{% url file_xml hash %}" class="active">Źródło</a><a href="{% url file_html hash %}">HTML</a>    <div style="padding: 3px; margin-left: 10px">{{ image_folders_form.folders }}</div><div style="clear: both; height: 0; width: 0">&nbsp;</div></div>    
-
-    <div id="images-wrap">
-        <div id="images">
-            <p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>
-        </div>
-    </div>
+    <div id="tabs"><a href="{% url file_xml hash %}" class="active">Źródło</a><a href="{% url file_html hash %}">HTML</a><div style="clear: both; height: 0; width: 0">&nbsp;</div></div>    
+    
     <form action="." method="post" accept-charset="utf-8">
-        {# <div id="buttons"></div> #}
-               <textarea id="id_text" name="text" style="width:50%; height:480px">{{ form.text.field.initial }}</textarea>
-        {{ form.user.errors }}
-        <p>Użytkownik: {{ form.user }}</p> 
-        {{ form.commit_message.errors }}
-        <p>Opis zmian: {{ form.commit_message }} <input type="submit" value="Zapisz"/></p>
+        <div id="panels">
+            <div id="sidebar">
+                <div id="images-wrap">
+                    <div id="images">
+                        <p>Aby zobaczyć obrazki wybierz folder poniżej:</p>
+                        <p>{{ image_folders_form.folders }}</p>
+                    </div>
+                </div>
+                <div id="toggle-sidebar"></div>
+            </div>
+            <textarea id="id_text" name="text" width="480px">{{ form.text.field.initial }}</textarea>
+        </div>
+        
+        <div id="status-bar">
+            {{ form.user.errors }} {{ form.commit_message.errors }}
+            <p>
+                Użytkownik: {{ form.user }}
+                Opis zmian: {{ form.commit_message }}
+                <input type="submit" value="Zapisz"/>
+                <a href="#" class="toggleAutoscroll" style="float: right">Nie synchronizuj przewijania</a>
+            </p>
+        </div>
     </form>
 {% endblock maincontent %}    

diff --git a/project/templates/explorer/folder_images.html b/project/templates/explorer/folder_images.html
index e6beb07..8f5f600 100644 (file)
--- a/project/templates/explorer/folder_images.html
+++ b/project/templates/explorer/folder_images.html
@@ -1,5 +1,3 @@
 {% for image in images %}
-    <div class="image-box" src="{{ image }}" style="width: 460px; height: 460px; margin: 5px; background-color: gray">
-        <p>{{ image }}</p>
-    </div>
+    <div class="image-box" src="{{ image }}" style="width: 480px; height: 640px;">{{ image }}</div>
 {% endfor %}
\ No newline at end of file