Browse Source

mdif ergonomiques lorsque l'on ouvre les menu du sidemenu

Sevajol Bastien 11 years ago
parent
commit
79a770954a
1 changed files with 21 additions and 3 deletions
  1. 21 3
      src/Muzich/CoreBundle/Resources/public/js/muzich.js

+ 21 - 3
src/Muzich/CoreBundle/Resources/public/js/muzich.js View File

2594
       $(this).parents('li.top_menu_element').find('ul.submenu').hide();
2594
       $(this).parents('li.top_menu_element').find('ul.submenu').hide();
2595
       $(this).parents('li.top_menu_element').removeClass('close');
2595
       $(this).parents('li.top_menu_element').removeClass('close');
2596
       $(this).parents('li.top_menu_element').addClass('open');
2596
       $(this).parents('li.top_menu_element').addClass('open');
2597
-      $(this).parents('li.top_menu_element').find('ul.submenu').slideDown();
2597
+      $(this).parents('li.top_menu_element').find('ul.submenu').slideDown('500', function(){
2598
+        if ($('.sidebar').css('position') == 'absolute')
2599
+        {
2600
+          contentHeight = $('.content').height();
2601
+          sidebarHeight = $('.sidebar').outerHeight();
2602
+          //$('.sidebar').css('top', contentHeight - sidebarHeight);
2603
+          $(".sidebar").animate({ 
2604
+            top: contentHeight - sidebarHeight,
2605
+          }, 500 );
2606
+        }
2607
+      });
2598
     }
2608
     }
2599
     else
2609
     else
2600
     {
2610
     {
2601
       $(this).parents('li.top_menu_element').removeClass('open');
2611
       $(this).parents('li.top_menu_element').removeClass('open');
2602
       $(this).parents('li.top_menu_element').addClass('close');
2612
       $(this).parents('li.top_menu_element').addClass('close');
2613
+      
2614
+      if ($('.sidebar').css('position') == 'absolute')
2615
+        {
2616
+          contentHeight = $('.content').height();
2617
+          sidebarHeight = $('.sidebar').outerHeight();
2618
+          //$('.sidebar').css('top', contentHeight - sidebarHeight);
2619
+          $(".sidebar").animate({ 
2620
+            top: contentHeight - sidebarHeight,
2621
+          }, 500 );
2622
+        }
2603
     }
2623
     }
2604
     
2624
     
2605
     return false;
2625
     return false;
3276
   if ($('#sidebar .sidebar').height() < $('#content .content').height() &&
3296
   if ($('#sidebar .sidebar').height() < $('#content .content').height() &&
3277
     $('#sidebar .sidebar').height() > $(window).height())
3297
     $('#sidebar .sidebar').height() > $(window).height())
3278
   {
3298
   {
3279
-    console.log('sticky sidebar');
3280
     $('#content').stickySidebar();
3299
     $('#content').stickySidebar();
3281
   }
3300
   }
3282
   else
3301
   else
3283
   {
3302
   {
3284
-    console.log('sticky tout court');
3285
     $('#sidebar .sidebar').css('padding-bottom', '155px');
3303
     $('#sidebar .sidebar').css('padding-bottom', '155px');
3286
     $("#sidebar .sidebar").sticky({topSpacing:25});
3304
     $("#sidebar .sidebar").sticky({topSpacing:25});
3287
   }
3305
   }