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

[svn at limb-project.com]

Author: momental
Date: 2007-12-04 15:09:36 +0300 (Tue, 04 Dec 2007)
New Revision: 6576
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6576

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

Modified: 3.x/trunk/limb/cms/shared/js/cp_layout.js
===================================================================
--- 3.x/trunk/limb/cms/shared/js/cp_layout.js	2007-12-04 11:37:10 UTC (rev 6575)
+++ 3.x/trunk/limb/cms/shared/js/cp_layout.js	2007-12-04 12:09:36 UTC (rev 6576)
@@ -22,11 +22,11 @@
    TODO: продублировать описание на английском. показать пример использования.
 */
 Limb.Class('CMS.Filter',
-{  
+{
   __construct:function(showFilterStr, hideFilterStr)
   {
     this.showFilterStr = showFilterStr || ShowFilterDefault || '';
-    this.hideFilterStr = hideFilterStr || HideFilterDefault || '';      
+    this.hideFilterStr = hideFilterStr || HideFilterDefault || '';
     var filter = jQuery('.filter');
     var filterForm = jQuery('.filter form');
     var list = jQuery('.list');
@@ -238,18 +238,18 @@
 
   showSidebar: function(){
     this.inner.show('slow');
-    this.toggle_text.show('slow');
+    this.toggle_text.show();
+    this.toggle.css('height','');
     this.sidebar.removeClass('hide');
-    this.toggle.css('height','');
     this.content.css('margin-left','225px');
 
   },
 
   hideSidebar: function(){
+    this.toggle.height(jQuery('body').height()-53);
+    this.toggle_text.hide();
     this.inner.hide('slow');
-    this.toggle_text.hide('slow');
     this.sidebar.addClass('hide');
-    this.toggle.height(jQuery('body').height()-53);
     this.sidebar.height(jQuery('body').height()-40);
     this.content.css('margin-left','38px');
   },
@@ -289,6 +289,7 @@
 function initDocumentStructure(){
   var container = jQuery('#container');
   var sidebar = jQuery('#sidebar');
+  var toggle = jQuery('.sidebar_toggle');
   container.css({
                 position:'absolute',
                 overflow: 'auto',
@@ -298,7 +299,7 @@
   });
   sidebar.css({
                 position:'absolute',
-                overflow: 'auto',
+                overflow: 'hidden',
                 top: '38px',
                 left: '0',
                 zIndex: 20
@@ -307,6 +308,7 @@
   var bodyHeight = jQuery('body').height()-40;
   container.height(bodyHeight);
   sidebar.height(bodyHeight);
+  toggle.height (bodyHeight -13);
 
 };
 

Modified: 3.x/trunk/limb/cms/shared/styles/cp.css
===================================================================
--- 3.x/trunk/limb/cms/shared/styles/cp.css	2007-12-04 11:37:10 UTC (rev 6575)
+++ 3.x/trunk/limb/cms/shared/styles/cp.css	2007-12-04 12:09:36 UTC (rev 6576)
@@ -192,7 +192,8 @@
   /*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 .sidebar_toggle {position:absolute;top:0;padding:5px;width:10px;}
+    #sidebar.hide {width:30px}
+      #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;}
         #sidebar .sidebar_toggle .arrow:hover {background-image: url(../images/icon/arrow_hover.gif);}