Display: Fix styles for legacy tabs

assets/css/app.scss

@@ -449,7 +449,7 @@
   cursor: pointer;
 }
 
-.users-list {
+.ul-tablist {
   .nav-tabs {
     display: flex;
     list-style-type: none;

public/main/admin/user_list.php

@@ -1397,19 +1397,20 @@ if (0 == $table->get_total_number_of_items()) {
     }
 }
 
-$tabsHtml = '
+$toolbarActions = Display::tabsOnlyLink(
-<div class="users-list">
+    [
-    <ul class="nav nav-tabs">
+        'all' => [
-      <li class="nav-item '.($view == 'all' ? 'active' : '').'">
+            'url' => 'user_list.php?view=all',
-        <a class="nav-link '.($view == 'all' ? 'active' : '').'" href="user_list.php?view=all">'.get_lang('All users').'</a>
+            'content' => get_lang('All users'),
-      </li>
+        ],
-      <li class="nav-item '.($view == 'deleted' ? 'active' : '').'">
+        'deleted' => [
-        <a class="nav-link '.($view == 'deleted' ? 'active' : '').'" href="user_list.php?view=deleted">'.get_lang('Deleted users').'</a>
+            'url' => 'user_list.php?view=deleted',
-      </li>
+            'content' => get_lang('Deleted users'),
-    </ul>
+        ],
-</div>';
+    ],
-
+    $view,
-$toolbarActions = $tabsHtml;
+    'users-list'
+);
 $toolbarActions .= Display::toolbarAction('toolbarUser', [$actionsLeft, $actionsCenter.$actionsRight]);
 
 $tpl = new Template($tool_name);

public/main/inc/lib/course.lib.php

@@ -6585,27 +6585,17 @@ class CourseManager
     public static function getCourseListTabs($listType)
     {
         $tabs = [
-            [
+            'simple' => [
                 'content' => get_lang('Standard list'),
                 'url' => api_get_path(WEB_CODE_PATH).'admin/course_list.php',
             ],
-            [
+            'admin' => [
                 'content' => get_lang('Management List'),
                 'url' => api_get_path(WEB_CODE_PATH).'admin/course_list_admin.php',
             ],
         ];
 
-        $default = 1;
+        return Display::tabsOnlyLink($tabs, $listType, 'course-list');
-        switch ($listType) {
-            case 'simple':
-                $default = 1;
-                break;
-            case 'admin':
-                $default = 2;
-                break;
-        }
-
-        return Display::tabsOnlyLink($tabs, $default);
     }
 
     public static function getUrlMarker($courseId)

public/main/inc/lib/display.lib.php

@@ -1085,32 +1085,40 @@ class Display
      *
      * @return string
      */
-    public static function tabsOnlyLink($headers, $selected = null)
+    public static function tabsOnlyLink($headers, $selected = null, string $tabList = '')
     {
         $id = uniqid('tabs_');
-        $i = 1;
         $list = '';
-        foreach ($headers as $item) {
+
+        if ('integer' === gettype($selected)) {
+            $selected -= 1;
+        }
+
+        foreach ($headers as $key => $item) {
             $class = null;
-            if ($i == $selected) {
+            if ($key == $selected) {
-                $class = 'btn--primary';
+                $class = 'active';
-            } else {
-                $class = 'btn--plain';
             }
             $item = self::tag(
                 'a',
                 $item['content'],
                 [
-                    'id' => $id.'-'.$i,
+                    'id' => $id.'-'.$key,
                     'href' => $item['url'],
-                    'class' => 'btn '.$class,
+                    'class' => 'nav-link '.$class,
                 ]
             );
-            $list .= $item;
+            $list .= '<li class="nav-item">'.$item.'</li>';
-            $i++;
         }
 
-        return self::toolbarAction($id, [$list]);
+        return self::div(
+            self::tag(
+                'ul',
+                $list,
+                ['class' => 'nav nav-tabs']
+            ),
+            ['class' => "ul-tablist $tabList"]
+        );
     }
 
     /**