- Dopracowanie dopasowywania paneli Platformy Redakcyjnej do

wielkości okna przeglądarki.
 - Dodanie możliwości chowania panelu z galerią skanów.

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 7982059..aeb1f09 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;
 body {
     margin: 0;
     font: 100%/1.5 Georgia, Verdana, sans-serif;

+    overflow: hidden;

 }
 
 #breadcrumbs {
 }
 
 #breadcrumbs {


@@ -71,19 +72,34 @@ label {
     padding: 5px 10px;
     overflow-x: hidden;
     overflow-y: scroll;
     padding: 5px 10px;
     overflow-x: hidden;
     overflow-y: scroll;

-    width: 480px;
-    height: 480px;
-    border: 1px solid #999;

 }
 
 #images-wrap {
 }
 
 #images-wrap {

-    float: left;
-    width: 49%;
+    width: 480px;

     height: 480px;
     height: 480px;

-    border: 1px solid #999;
-/*    padding: 5px 10px;*/
+    border-right: 1px solid #999;

     overflow-y: scroll;
     overflow-x: hidden;
     overflow-y: scroll;
     overflow-x: hidden;

+    background-color: #fff;
+    float: left;
+}
+
+#sidebar {
+    float: left;
+    width: 488px;
+}
+
+#toggle-sidebar {
+    background-color: #999;
+    width: 7px;
+    height: 100%;
+    float: left;
+}
+
+#status-bar {
+    border-top: 1px solid #999;
+    background-color: #EEE;
+    padding: 2px 10px;

 }
 
 .errorlist {
 }
 
 .errorlist {

diff --git a/project/templates/explorer/file_html.html b/project/templates/explorer/file_html.html
index f3fe187..23a1367 100644 (file)
--- a/project/templates/explorer/file_html.html
+++ b/project/templates/explorer/file_html.html
@@ -10,6 +10,14 @@
                 });
             });
             
                 });
             });
             

+            function resizePanels() {
+                $('#images-wrap').height($(window).height() - 80);
+                $('#file-text').height($(window).height() - 80);
+            }
+            
+            $(window).resize(resizePanels)
+            resizePanels();
+            

             $('#images').lazyload('.image-box', {threshold: 600});
         });
     </script>
             $('#images').lazyload('.image-box', {threshold: 600});
         });
     </script>


@@ -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>    
 
 {% 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 }}
     </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..350d078 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -19,7 +19,27 @@
                     $('#images').data('lastScroll', -1000);
                 });
             });
                     $('#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(0);
+                $('#sidebar').width(8);
+                resizePanels();
+            }, function() {
+                $('#images-wrap').width(480);
+                $('#sidebar').width(488);
+                resizePanels();
+            })
+            
+            $(window).resize(function() {
+                resizePanels();
+            })
+            

             var editor = CodeMirror.fromTextArea("id_text", {
                 parserfile: 'parsexml.js',
                 path: "/static/js/codemirror/",
             var editor = CodeMirror.fromTextArea("id_text", {
                 parserfile: 'parsexml.js',
                 path: "/static/js/codemirror/",


@@ -32,6 +52,8 @@
                     var percentScrolled = $('body', this).scrollTop() / $('body', this).height();
                     $('#images-wrap').scrollTop(percentScrolled * $('#images').height());
                 });
                     var percentScrolled = $('body', this).scrollTop() / $('body', this).height();
                     $('#images-wrap').scrollTop(percentScrolled * $('#images').height());
                 });

+                
+                setTimeout(function() {resizePanels();}, 10);

             })
             
             addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });
             })
             
             addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });


@@ -47,18 +69,23 @@
 
 {% 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>    
 
 {% 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>
+    

     <form action="." method="post" accept-charset="utf-8">
     <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 z obrazkami powyżej.</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"/></p>
+        </div>

     </form>
 {% endblock maincontent %}    
     </form>
 {% endblock maincontent %}