[limb-svn] r6821 - in 3.x/trunk/limb/cms/shared: js styles

[svn at limb-project.com]

Author: momental
Date: 2008-03-03 14:01:56 +0300 (Mon, 03 Mar 2008)
New Revision: 6821
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6821

Modified:
   3.x/trunk/limb/cms/shared/js/cp_layout.js
   3.x/trunk/limb/cms/shared/js/fixpng.js
   3.x/trunk/limb/cms/shared/styles/cp.css
Log:
-- fixed bug in toggle sidebar
-- fixed debug message in fixpng.js

Modified: 3.x/trunk/limb/cms/shared/js/cp_layout.js
===================================================================
--- 3.x/trunk/limb/cms/shared/js/cp_layout.js	2008-03-03 09:48:50 UTC (rev 6820)
+++ 3.x/trunk/limb/cms/shared/js/cp_layout.js	2008-03-03 11:01:56 UTC (rev 6821)
@@ -290,26 +290,18 @@
   var container = jQuery('#container');
   var sidebar = jQuery('#sidebar');
   var toggle = jQuery('.sidebar_toggle');
-  container.css({
-                position:'absolute',
-                overflow: 'auto',
-                top: '38px',
-                left: '0',
-                zIndex: 10
-  });
-  sidebar.css({
-                position:'absolute',
-                overflow: 'hidden',
-                top: '38px',
-                left: '0',
-                zIndex: 20
-  });
+  var text = jQuery('.sidebar_toggle span.text');
 
   var bodyHeight = jQuery('body').height()-40;
   container.height(bodyHeight);
   sidebar.height(bodyHeight);
+
+  if (text.css('display')=='block')
+  return;
+
   toggle.height (bodyHeight -13);
 
+
 };
 
 function initMainMenu(){
@@ -340,15 +332,17 @@
 
 /*============================== WINDOW READY ==============================*/
 jQuery(window).ready(function(){
+    /*SideBar Toggle*/
+    new CMS.SidebarToggle('sidebar_toggle');
+
     initDocumentStructure();
     jQuery(window).resize(initDocumentStructure);
 
     /*Nice Button*/
     jQuery('.button').wrap('<span class="button_wrapper"></span>');
 
-    /*SideBar Toggle*/
-    new CMS.SidebarToggle('sidebar_toggle');
 
+
     // Fiter up/down sliding control
     new CMS.Filter(ShowFilterDefault, HideFilterDefault);
 

Modified: 3.x/trunk/limb/cms/shared/js/fixpng.js
===================================================================
--- 3.x/trunk/limb/cms/shared/js/fixpng.js	2008-03-03 09:48:50 UTC (rev 6820)
+++ 3.x/trunk/limb/cms/shared/js/fixpng.js	2008-03-03 11:01:56 UTC (rev 6821)
@@ -73,7 +73,6 @@
             {
               if (that.attr('src').match(/.*\.png([?].*)?$/i))// make sure it is png image
               {
-                alert(that.attr('src')+' ' + that.height());
                 // use source tag value if set
                 var source = (base && that.attr('src').substring(0,1)!='/') ? base + that.attr('src') : that.attr('src');
                 // apply filter

Modified: 3.x/trunk/limb/cms/shared/styles/cp.css
===================================================================
--- 3.x/trunk/limb/cms/shared/styles/cp.css	2008-03-03 09:48:50 UTC (rev 6820)
+++ 3.x/trunk/limb/cms/shared/styles/cp.css	2008-03-03 11:01:56 UTC (rev 6821)
@@ -192,7 +192,7 @@
   /*SIDEBAR ======================================================================================*/
     #sidebar {float: left;width: 225px;margin: 0 -225px 0 0;}
     #sidebar .sidebar_toggle {width:198px;height:auto;overflow:hidden;_height:1%;_overflow:visible;margin:1px 0 1px 1px;padding:5px 0;background-color:#E5E5E5;border:1px solid #bbbbbb;}
-    #sidebar.hide {width:30px}
+    #sidebar.hide {width:30px;position:absolute;overflow:hidden;top:38px;left:0;z-index:20;}
       #sidebar.hide .sidebar_toggle {position:absolute;top:0;padding:5px;width:10px}
       #sidebar .sidebar_toggle .text {margin:0 10px 0 6px;float:left;}
       #sidebar .sidebar_toggle .arrow {float:right;display:block;width:10px;height:9px;margin:1px 6px 0 0;background: url(../images/icon/arrow.gif) no-repeat left top;cursor:pointer;}