Podzielenie paska z przyciskami na oddzielne paski dla głównego panelu i dla panelu...

diff --git a/project/static/css/master.css b/project/static/css/master.css
index c31c4fe..6b53ec5 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -74,10 +74,13 @@ label {
     overflow-y: scroll;
 }
 
     overflow-y: scroll;
 }
 

+#whatever {
+    float: left;
+}
+

 #images-wrap {
 /*    width: 0px;*/
     height: 480px;
 #images-wrap {
 /*    width: 0px;*/
     height: 480px;

-    border-right: 1px solid #999;

     overflow-y: scroll;
     overflow-x: hidden;
     background-color: #fff;
     overflow-y: scroll;
     overflow-x: hidden;
     background-color: #fff;


@@ -91,8 +94,10 @@ label {
 }
 
 #toggle-sidebar {
 }
 
 #toggle-sidebar {

+    border-left: 1px solid #999;
+    border-right: 1px solid #999;

     background-color: #DDD;
     background-color: #DDD;

-    width: 7px;
+    width: 8px;

     height: 100%;
     float: left;
 }
     height: 100%;
     float: left;
 }


@@ -141,15 +146,22 @@ p {
     width: 400%;
 }
 
     width: 400%;
 }
 

-#toolbar-tabs li {
+#sidebar-toolbar, #sidebar-toolbar ol {
+    overflow: hidden;
+    display: block;
+    margin: 0;
+    padding: 0;
+    background-color: #CCC;
+    border-bottom: 1px solid #AAA;
+}
+
+#sidebar-tabs li, #toolbar-tabs li {

     font-size: 14px;
     display: block;
     float: left;
     font-size: 14px;
     display: block;
     float: left;

-    margin: 4px 4px 0 0;
+    margin: 4px 0 -1px 4px;

     padding: 2px 10px 0 10px;
     padding: 2px 10px 0 10px;

-    border-left: 1px solid #EEE;
-    border-right: 1px solid #AAA;
-    margin-bottom: -1px;
+    background-color: #CCC;

     border: 1px solid #AAA;
     border-radius-topleft: 8px;
     border-radius-topright: 8px;
     border: 1px solid #AAA;
     border-radius-topleft: 8px;
     border-radius-topright: 8px;


@@ -159,7 +171,7 @@ p {
     -webkit-border-top-right-radius: 8px;
 }
 
     -webkit-border-top-right-radius: 8px;
 }
 

-#toolbar-tabs li:hover, #toolbar-tabs li.active {
+#sidebar-tabs li:hover, #sidebar-tabs li.active, #toolbar-tabs li:hover, #toolbar-tabs li.active {

     cursor: default;
     background-color: #EEE;
     border-bottom: 1px solid #EEE;
     cursor: default;
     background-color: #EEE;
     border-bottom: 1px solid #EEE;

diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index b78e3de..e4c7371 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -19,8 +19,9 @@
             function resizePanels() {
                 $('iframe').width($(window).width() - $('#sidebar').outerWidth());
                 $('iframe').height($(window).height() - 100);
             function resizePanels() {
                 $('iframe').width($(window).width() - $('#sidebar').outerWidth());
                 $('iframe').height($(window).height() - 100);

-                $('#images-wrap, #toggle-sidebar').height($(window).height() - 100);
-                $('#images-wrap').width($('#sidebar').width() - 8);
+                $('#toggle-sidebar').height($(window).height() - 55);
+                $('#images-wrap').height($(window).height() - 82)
+                $('#images-wrap, #sidebar-toolbar').width($('#sidebar').width() - 10);

             }
             
             $('#toggle-sidebar').toggle(function() {
             }
             
             $('#toggle-sidebar').toggle(function() {


@@ -114,19 +115,28 @@
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 
 {% block maincontent %}
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 
 {% block maincontent %}

-    {% toolbar %}
-    

     <form action="." method="post" accept-charset="utf-8">
         <div id="panels">
             <div id="sidebar">
     <form action="." method="post" accept-charset="utf-8">
         <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 id="toggle-sidebar" style="float: right"></div>
+                <div id="whatever">
+                    <div id="sidebar-toolbar">
+                        <ol id="sidebar-tabs">
+                            <li>Tab</li>
+                            <li>Tab 2</li>
+                        </ol>
+                    </div>
+                    <div id="images-wrap">
+
+                        <div style="clear: both; height: 0; width: 0">&nbsp;</div>
+                        <div id="images">
+                            <p>Aby zobaczyć obrazki wybierz folder poniżej:</p>
+                            <p>{{ image_folders_form.folders }}</p>
+                        </div>

                     </div>
                 </div>
                     </div>
                 </div>

-                <div id="toggle-sidebar"></div>

             </div>
             </div>

+            {% toolbar %}

             <textarea id="id_text" name="text" width="480px">{{ form.text.field.initial }}</textarea>
         </div>
         
             <textarea id="id_text" name="text" width="480px">{{ form.text.field.initial }}</textarea>
         </div>