Merge remote-tracking branch 'origin/master'

public/main/admin/add_courses_to_usergroup.php

@@ -186,7 +186,7 @@ $actions = Display::url(
 $actions .= Display::url(get_lang('Advanced search'), '#', ['class' => 'advanced_options btn', 'id' => 'advanced_search']);
 
 echo Display::toolbarAction('add_users', [$actions]);
-echo Display::page_header($data['name'].': '.$tool_name);
+echo Display::page_header($data['title'].': '.$tool_name);
 
 echo '<div id="advanced_search_options" style="display:none">';
 $searchForm->display();

public/main/admin/add_sessions_to_usergroup.php

@@ -97,15 +97,15 @@ if ($usergroup->allowTeachers()) {
         $onlyThisSessionList = array_column($sessionList, 'id');
     }
 }
-$session_list = SessionManager::get_sessions_list([], ['name'], null, null, 0, $onlyThisSessionList);
+$session_list = SessionManager::get_sessions_list([], ['title'], null, null, 0, $onlyThisSessionList);
 $elements_not_in = $elements_in = [];
 
 if (!empty($session_list)) {
     foreach ($session_list as $session) {
         if (in_array($session['id'], $session_list_in)) {
-            $elements_in[$session['id']] = $session['name'];
+            $elements_in[$session['id']] = $session['title'];
         } else {
-            $elements_not_in[$session['id']] = $session['name'];
+            $elements_not_in[$session['id']] = $session['title'];
         }
     }
 }
@@ -132,7 +132,7 @@ function search_usergroup_sessions($needle, $type)
             $return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
             foreach ($session_list as $row) {
                 if (!in_array($row['id'], array_keys($elements_in))) {
-                    $return .= '<option value="'.$row['id'].'">'.$row['name'].'</option>';
+                    $return .= '<option value="'.$row['id'].'">'.$row['title'].'</option>';
                 }
             }
             $return .= '</select>';
@@ -178,7 +178,7 @@ echo '<div id="advancedSearch" style="display: none">
             onchange="xajax_search_usergroup_sessions(this.value,\'searchbox\')" onkeyup="this.onchange()">
      </div>';
 
-echo Display::page_header($data['name'].': '.$tool_name);
+echo Display::page_header($data['title'].': '.$tool_name);
 
 $extra = '';
 if (!empty($_GET['add'])) {

public/main/admin/add_users_to_usergroup.php

@@ -407,7 +407,7 @@ echo Display::input('hidden', 'add_type', null);
                 <div class="multiple_select_header">
                     <b><?php echo get_lang('Users on platform'); ?> :</b>
                     <?php echo get_lang('First letter (last name)'); ?> :
-                    <select id="first_letter_user" name="firstLetterUser" onchange="change_select();">
+                    <select id="first_letter_user" name="firstLetterUser" onchange="change_select();" class="block w-full mt-1 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                         <option value = "%">--</option>
                         <?php
                         echo Display :: get_alphabet_options($first_letter_user);
@@ -420,7 +420,7 @@ echo Display::input('hidden', 'add_type', null);
                     $elements_not_in,
                     '',
                     [
-                        'class' => 'form-control',
+                        'class' => 'form-multiselect block w-full mt-1 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm',
                         'multiple' => 'multiple',
                         'id' => 'elements_not_in',
                         'size' => '15px',
@@ -457,7 +457,7 @@ echo Display::input('hidden', 'add_type', null);
                     $elements_in,
                     '',
                     [
-                        'class' => 'form-control',
+                        'class' => 'form-multiselect block w-full mt-1 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm',
                         'multiple' => 'multiple',
                         'id' => 'elements_in',
                         'size' => '15px',

public/main/admin/usergroup_users.php

@@ -37,7 +37,7 @@ if (empty($courseInfo)) {
 } else {
     $interbreadcrumb[] = ['url' => api_get_path(WEB_CODE_PATH).'user/class.php?'.api_get_cidreq(), 'name' => get_lang('Classes')];
 }
-$interbreadcrumb[] = ['url' => '#', 'name' => $userGroupInfo['name']];
+$interbreadcrumb[] = ['url' => '#', 'name' => $userGroupInfo['title']];
 
 if (!empty($action)) {
     $usergroup->protectScript($userGroupInfo);
@@ -137,11 +137,11 @@ $columns = [
 
 // Column config
 $column_model = [
-    ['name' => 'name', 'index' => 'name', 'width' => '35', 'align' => 'left', 'sortable' => 'false'],
+    ['name' => 'name', 'index' => 'name', 'width' => '400', 'align' => 'left', 'sortable' => 'false'],
     [
         'name' => 'actions',
         'index' => 'actions',
-        'width' => '20',
+        'width' => '250',
         'align' => 'center',
         'sortable' => 'false',
         'formatter' => 'action_formatter',

public/main/admin/usergroups.php

@@ -37,7 +37,7 @@ $columns = [
 
 //Column config
 $column_model = [
-    ['name' => 'title', 'index' => 'title', 'align' => 'left'],
+    ['name' => 'title', 'index' => 'title', 'align' => 'left', 'width' => '400'],
     ['name' => 'users', 'index' => 'users', 'align' => 'left', 'search' => 'false'],
     ['name' => 'courses', 'index' => 'courses', 'align' => 'left', 'search' => 'false'],
     ['name' => 'sessions', 'index' => 'sessions', 'align' => 'left', 'search' => 'false'],
@@ -45,7 +45,7 @@ $column_model = [
     [
         'name' => 'actions',
         'index' => 'actions',
-        'width' => '170',
+        'width' => '250',
         'align' => 'center',
         'sortable' => 'false',
         'formatter' => 'action_formatter',

public/main/inc/ajax/model.ajax.php

@@ -1054,10 +1054,10 @@ switch ($action) {
         $result = $calendarPlugin->getUsersPerCalendar($id);
         break;
     case 'get_usergroups_users':
-        $columns = ['name', 'actions'];
+        $columns = ['title', 'actions'];
         if ('true' === api_get_plugin_setting('learning_calendar', 'enabled')) {
             $columns = [
-                'name',
+                'title',
                 'calendar',
                 'gradebook_items',
                 'time_spent',