Merge

main/inc/lib/display.lib.php

@@ -775,7 +775,7 @@ class Display {
      * @param   array   attributes for the ul
      *
      */
-    public static function tabs($header_list, $content_list, $id = 'tabs', $ul_attributes = array()) {
+    public static function tabs($header_list, $content_list, $id = 'tabs', $attributes = array(), $ul_attributes = array()) {
 
         if (empty($header_list) || count($header_list) == 0 ) {
             return '';
@@ -798,7 +798,8 @@ class Display {
             $divs .=self::tag('div', $content, array('id'=>$id.'-'.$i));
             $i++;
         }
-        $main_div = self::tag('div',$ul.$divs, array('id'=>$id));
+        $attributes['id'] = $id;
+        $main_div = self::tag('div',$ul.$divs, $attributes);
         return $main_div ;
     }
 

main/session/index.php

@@ -351,10 +351,7 @@ $(function() {
     $("#tabs").bind('tabsselect', function(event, ui) {
 		window.location.href=ui.tab;
     });
-    
-    //Generate tabs with jquery-ui
-    $('#tabs').tabs();
-    $( "#sub_tab" ).tabs();     
+   
          
 <?php 
 
@@ -365,6 +362,11 @@ $(function() {
      echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');     
      echo Display::grid_js('exercises',      '',            $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);        
 ?>
+        
+            
+    //Generate tabs with jquery-ui
+    $('#tabs').tabs();
+    $( "#sub_tab" ).tabs();  
 });
 </script>