Merge branch 'master' of git@stigma:platforma

diff --git a/project/static/css/master.css b/project/static/css/master.css
index f2ca8c1..12085b2 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -127,12 +127,13 @@ label {
 .panel-overlay {
        position: absolute;
        top: 0px; bottom: 0px; left: 0px; right: 0px;
-       z-index: 10;
+       z-index: 100;
        background: gray;
        opacity: 0.8;
        text-align: center;
        overflow: hidden;
        display: none;
+       cursor: col-resize;
 }
 
 .panel-content-overlay {
@@ -155,6 +156,7 @@ label {
     background-color: #DDD;
     white-space: nowrap;
     overflow: hidden;
+    z-index: 80;
 }
 
 .panel-toolbar label {
@@ -168,19 +170,19 @@ label {
     position: absolute;
        background-color: #DDD;
 
-    top: 0px; bottom: 0px; right: 0px; width: 6px;
+    top: 0px; bottom: 0px; right: 0px; width: 4px;
 
     border-left: 1px solid #999;
     border-right: 1px solid #999;
     border-top: none;
     border-bottom: none;
 
-       z-index: 5;
+       z-index: 90;
+       cursor: col-resize;
 }
 
 .panel-wrap .panel-slider:hover {
     background-color: #999;
-    cursor: hand;
 }
 
 .panel-content-overlay.panel-wrap .panel-slider {
@@ -190,7 +192,7 @@ label {
 /* ================= */
 /* = Gallery panel = */
 /* ================= */
-.images-wrap, .panel-htmleditor {
+.images-wrap {
     overflow-x: hidden;
     overflow-y: scroll;
 }
@@ -201,8 +203,8 @@ label {
 /* ==================== */
 
 .toolbar {
-    height: 48px;
     overflow: hidden;
+    z-index: 70;
 }
 
 .toolbar, .toolbar ol {
@@ -232,7 +234,7 @@ label {
 
 .toolbar-tabs {
     height: 21px;
-    z-index: 1000;
+/*    z-index: 1000;*/
 /*    overflow: hidden;*/
 }
 
@@ -272,6 +274,7 @@ label {
 }
 
 .panel-dceditor label {
+    display: block;
     font-size: 12px;
     margin-top: 10px;
     color: #666;
@@ -280,6 +283,7 @@ label {
 
 .panel-dceditor input, .panel-dceditor textarea {
     width: 400px;
+    display: block;
 }
 
 div.isection {

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 805f59c..94f9e01 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -28,7 +28,7 @@
                     <strong class="change-notification" style="display: none">Widok nieaktualny!</strong>
                </div>
                <div id="left-panel-content" class="panel-content"></div>
-               <button type="button" class="panel-slider" id="slider01">&nbsp;</button>
+               <button type="button" class="panel-slider" id="slider01"></button>
             </div>
             <div id="right-panel-wrap" class="panel-wrap last-panel">
                 <div id="right-panel-toolbar" class="panel-toolbar">

diff --git a/project/templates/explorer/panels/gallery.html b/project/templates/explorer/panels/gallery.html
index d339bce..987875a 100644 (file)
--- a/project/templates/explorer/panels/gallery.html
+++ b/project/templates/explorer/panels/gallery.html
@@ -1,11 +1,12 @@
 <div class="panel">
-    <div class="images-wrap">
-        <div class="images">
-            <p>Aby zobaczyć obrazki wybierz folder poniżej:</p>
-            <p><select name="folders" class="id_folders">
+    <div class="toolbar">
+        <select name="folders" class="id_folders">
             <option value="" selected="selected">-- Wybierz folder z obrazkami --</option>
             <option value="andersen_basnie">andersen_basnie</option>
-            </select></p>
+        </select>
+    </div>
+    <div class="images-wrap">
+        <div class="images">
         </div>
     </div>
 </div>
@@ -16,7 +17,7 @@ panel_hooks = {
                var contentDiv = this.contentDiv;
                $('.id_folders', contentDiv).change(function() 
                {
-               $('.images', contentDiv).load('{% url folder_image_ajax %}' + $('.id_folders', panel).val() + '/', 
+               $('.images', contentDiv).load('{% url folder_image_ajax %}' + $('.id_folders', contentDiv).val() + '/', 
                                function() {
                     $('.images-wrap', contentDiv).data('lazyload:lastCheckedScrollTop', -10000);
                 });