Improve the list of project members

app/Locale/da_DK/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Tillad denne bruger',
     'Only those users have access to this project:' => 'Kunne disse brugere har adgang til dette projekt:',
     'Don\'t forget that administrators have access to everything.' => 'Glem ikke at administratorer har adgang til alt.',
-    'revoke' => 'fjern',
+    'Revoke' => 'Fjern',
     'List of authorized users' => 'Liste over autoriserede brugere',
     'User' => 'Bruger',
     'Nobody have access to this project.' => 'Ingen har adgang til dette projekt.',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/de_DE/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Diesen Benutzer autorisieren',
     'Only those users have access to this project:' => 'Nur diese Benutzer haben Zugriff zum Projekt:',
     'Don\'t forget that administrators have access to everything.' => 'Nicht vergessen: Administratoren haben überall Zugriff.',
-    'revoke' => 'entfernen',
+    'Revoke' => 'Entfernen',
     'List of authorized users' => 'Liste der autorisierten Benutzer',
     'User' => 'Benutzer',
     'Nobody have access to this project.' => 'Niemand hat Zugriff auf dieses Projekt.',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/es_ES/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Autorizar este usuario',
     'Only those users have access to this project:' => 'Solo estos usuarios tienen acceso a este proyecto:',
     'Don\'t forget that administrators have access to everything.' => 'No olvide que los administradores tienen acceso a todo.',
-    'revoke' => 'revocar',
+    'Revoke' => 'Revocar',
     'List of authorized users' => 'Lista de los usuarios autorizados',
     'User' => 'Usuario',
     // 'Nobody have access to this project.' => '',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/fi_FI/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Salli tämä projekti',
     'Only those users have access to this project:' => 'Vain näillä käyttäjillä on pääsy projektiin:',
     'Don\'t forget that administrators have access to everything.' => 'Muista että ylläpitäjät pääsevät kaikkialle.',
-    'revoke' => 'poista',
+    'Revoke' => 'Poista',
     'List of authorized users' => 'Sallittujen käyttäjien lista',
     'User' => 'Käyttäjät',
     // 'Nobody have access to this project.' => '',
@@ -609,8 +609,8 @@ return array(
     'Default swimlane' => 'Oletuskaista',
     'Do you really want to remove this swimlane: "%s"?' => 'Haluatko varmasti poistaa tämän kaistan: "%s"?',
     'Inactive swimlanes' => 'Passiiviset kaistat',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     'Remove a swimlane' => 'Poista kaista',
     'Rename' => 'Uudelleennimeä',
     'Show default swimlane' => 'Näytä oletuskaista',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/fr_FR/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Autoriser cet utilisateur',
     'Only those users have access to this project:' => 'Seulement ces utilisateurs ont accès à ce projet :',
     'Don\'t forget that administrators have access to everything.' => 'N\'oubliez pas que les administrateurs ont accès à tout.',
-    'revoke' => 'révoquer',
+    'Revoke' => 'Révoquer',
     'List of authorized users' => 'Liste des utilisateurs autorisés',
     'User' => 'Utilisateur',
     'Nobody have access to this project.' => 'Personne n\'est autorisé à accéder au projet.',
@@ -609,8 +609,8 @@ return array(
     'Default swimlane' => 'Swimlane par défaut',
     'Do you really want to remove this swimlane: "%s"?' => 'Voulez-vous vraiment supprimer cette swimlane : « %s » ?',
     'Inactive swimlanes' => 'Swimlanes inactives',
-    'set manager' => 'mettre gérant',
+    'Set project manager' => 'Mettre chef de projet',
-    'set user' => 'mettre utilisateur',
+    'Set project member' => 'Mettre membre du projet',
     'Remove a swimlane' => 'Supprimer une swimlane',
     'Rename' => 'Renommer',
     'Show default swimlane' => 'Afficher la swimlane par défaut',
@@ -633,4 +633,8 @@ return array(
     'Help on Gitlab webhooks' => 'Aide sur les webhooks Gitlab',
     'Integrations' => 'Intégrations',
     'Integration with third-party services' => 'Intégration avec des services externes',
+    'Role for this project' => 'Rôle pour ce projet',
+    'Project manager' => 'Chef de projet',
+    'Project member' => 'Membre du projet',
+    'A project manager can change the settings of the project and have more privileges than a standard user.' => 'Un chef de projet peut changer les paramètres du projet et possède plus de privilèges qu\'un utilisateur standard.',
 );

app/Locale/hu_HU/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Engedélyezi ezt a felhasználót',
     'Only those users have access to this project:' => 'Csak ezek a felhasználók férhetnek hozzá a projekthez:',
     'Don\'t forget that administrators have access to everything.' => 'Ne felejtsük el: a rendszergazdák mindenhez hozzáférnek.',
-    'revoke' => 'visszavon',
+    'Revoke' => 'Visszavon',
     'List of authorized users' => 'Az engedélyezett felhasználók',
     'User' => 'Felhasználó',
     'Nobody have access to this project.' => 'Senkinek sincs hozzáférése a projekthez.',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/it_IT/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Permettere a questo utente',
     'Only those users have access to this project:' => 'Solo questi utenti hanno accesso a questo progetto:',
     'Don\'t forget that administrators have access to everything.' => 'Non dimenticare che gli amministratori hanno accesso a tutto.',
-    'revoke' => 'revocare',
+    'Revoke' => 'Revocare',
     'List of authorized users' => 'Lista di utenti autorizzati',
     'User' => 'Utente',
     // 'Nobody have access to this project.' => '',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/ja_JP/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'このユーザを許可する',
     'Only those users have access to this project:' => 'これらのユーザのみがプロジェクトにアクセスできます:',
     'Don\'t forget that administrators have access to everything.' => '管理者には全ての権限が与えられます。',
-    'revoke' => '許可を取り下げる',
+    'Revoke' => '許可を取り下げる',
     'List of authorized users' => '許可されたユーザ',
     'User' => 'ユーザ',
     'Nobody have access to this project.' => 'だれもプロジェクトにアクセスできません。',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/pl_PL/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Dodaj użytkownika',
     'Only those users have access to this project:' => 'Użytkownicy mający dostęp:',
     'Don\'t forget that administrators have access to everything.' => 'Pamiętaj: Administratorzy mają zawsze dostęp do wszystkiego!',
-    'revoke' => 'odbierz dostęp',
+    'Revoke' => 'Odbierz dostęp',
     'List of authorized users' => 'Lista użytkowników mających dostęp',
     'User' => 'Użytkownik',
     // 'Nobody have access to this project.' => '',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/pt_BR/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Permitir esse usuário',
     'Only those users have access to this project:' => 'Somente estes usuários têm acesso a este projeto:',
     'Don\'t forget that administrators have access to everything.' => 'Não esqueça que administradores têm acesso a tudo.',
-    'revoke' => 'revogar',
+    'Revoke' => 'Revogar',
     'List of authorized users' => 'Lista de usuários autorizados',
     'User' => 'Usuário',
     'Nobody have access to this project.' => 'Ninguém tem acesso a este projeto.',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/ru_RU/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Разрешить этого пользователя',
     'Only those users have access to this project:' => 'Только эти пользователи имеют доступ к проекту :',
     'Don\'t forget that administrators have access to everything.' => 'Помните, администратор имеет доступ ко всему.',
-    'revoke' => 'отозвать',
+    'Revoke' => 'отозвать',
     'List of authorized users' => 'Список авторизованных пользователей',
     'User' => 'Пользователь',
     'Nobody have access to this project.' => 'Ни у кого нет доступа к этому проекту',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/sv_SE/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'Tillåt användare',
     'Only those users have access to this project:' => 'Bara de användarna har tillgång till detta projekt.',
     'Don\'t forget that administrators have access to everything.' => 'Glöm inte att administratörerna har rätt att göra allt.',
-    'revoke' => 'Dra tillbaka behörighet',
+    'Revoke' => 'Dra tillbaka behörighet',
     'List of authorized users' => 'Lista med behöriga användare',
     'User' => 'Användare',
     'Nobody have access to this project.' => 'Ingen har tillgång till detta projekt.',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/th_TH/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => 'อนุญาตผู้ใช้นี้',
     'Only those users have access to this project:' => 'ผู้ใช้ที่สามารถเข้าถึงโปรเจคนี้:',
     'Don\'t forget that administrators have access to everything.' => 'อย่าลืมผู้ดูแลระบบสามารถเข้าถึงได้ทุกอย่าง',
-    'revoke' => 'ยกเลิก',
+    'Revoke' => 'ยกเลิก',
     'List of authorized users' => 'รายชื่อผู้ใช้ที่ได้รับการยืนยัน',
     'User' => 'ผู้ใช้',
     // 'Nobody have access to this project.' => '',
@@ -609,8 +609,8 @@ return array(
     // 'Default swimlane' => '',
     // 'Do you really want to remove this swimlane: "%s"?' => '',
     // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
+    // 'Set project manager' => '',
-    // 'set user' => '',
+    // 'Set project member' => '',
     // 'Remove a swimlane' => '',
     // 'Rename' => '',
     // 'Show default swimlane' => '',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Locale/zh_CN/translations.php

@@ -194,7 +194,7 @@ return array(
     'Allow this user' => '允许该用户',
     'Only those users have access to this project:' => '只有这些用户有该项目的存取权限：',
     'Don\'t forget that administrators have access to everything.' => '别忘了管理员有一切的权限。',
-    'revoke' => '撤销',
+    'Revoke' => '撤销',
     'List of authorized users' => '已授权的用户列表',
     'User' => '用户',
     'Nobody have access to this project.' => '无用户可以访问此项目.',
@@ -609,8 +609,8 @@ return array(
     'Default swimlane' => '默认泳道',
     'Do you really want to remove this swimlane: "%s"?' => '确定要删除泳道："%s"?',
     'Inactive swimlanes' => '非活动泳道',
-    'set manager' => '设为管理员',
+    // 'Set project manager' => '',
-    'set user' => '设为用户',
+    // 'Set project member' => '',
     'Remove a swimlane' => '删除泳道',
     'Rename' => '重命名',
     'Show default swimlane' => '显示默认泳道',
@@ -633,4 +633,8 @@ return array(
     // 'Help on Gitlab webhooks' => '',
     // 'Integrations' => '',
     // 'Integration with third-party services' => '',
+    // 'Role for this project' => '',
+    // 'Project manager' => '',
+    // 'Project member' => '',
+    // 'A project manager can change the settings of the project and have more privileges than a standard user.' => '',
 );

app/Template/project/users.php

@@ -3,34 +3,37 @@
 </div>
 
 <?php if ($project['is_everybody_allowed']): ?>
-    <div class="alert alert-info"><?= t('Everybody have access to this project.') ?></div>
+    <div class="alert"><?= t('Everybody have access to this project.') ?></div>
 <?php else: ?>
 
     <?php if (empty($users['allowed'])): ?>
         <div class="alert alert-error"><?= t('Nobody have access to this project.') ?></div>
     <?php else: ?>
-    <div class="alert alert-info">
+        <table>
-        <p><?= t('Only those users have access to this project:') ?></p>
+            <tr>
-        <ul>
+                <th><?= t('User') ?></th>
-        <?php foreach ($users['allowed'] as $user_id => $username): ?>
+                <th><?= t('Role for this project') ?></th>
-            <li>
+                <th><?= t('Actions') ?></th>
-                <strong><?= $this->e($username) ?></strong>
+            </tr>
-                <?php $is_owner = array_key_exists($user_id, $users['owners']);
+            <?php foreach ($users['allowed'] as $user_id => $username): ?>
-                      if ($is_owner): ?> [owner] <?php endif ?>
+            <tr>
-                <?php if ($project['is_private'] == 0): ?>
+                <td><?= $this->e($username) ?></td>
-                    <?php if ($is_owner): ?>
+                <td><?= isset($users['owners'][$user_id]) ? t('Project manager') : t('Project member') ?></td>
-                        (<a href=<?= $this->u('project', 'setOwner', array('project_id' => $project['id'], 'user_id' => $user_id, 'is_owner' => 0), true) ?> ><?= t('set user') ?></a>
+                <td>
-                    <?php else: ?>
+                    <ul>
-                        (<a href=<?= $this->u('project', 'setOwner', array('project_id' => $project['id'], 'user_id' => $user_id, 'is_owner' => 1), true) ?> ><?= t('set manager') ?></a>
+                        <li><?= $this->a(t('Revoke'), 'project', 'revoke', array('project_id' => $project['id'], 'user_id' => $user_id), true) ?></li>
-                    <?php endif ?>
+                        <li>
-                    or
+                            <?php if (isset($users['owners'][$user_id])): ?>
-                    <?= $this->a(t('revoke'), 'project', 'revoke', array('project_id' => $project['id'], 'user_id' => $user_id), true) ?>)
+                                <?= $this->a(t('Set project member'), 'project', 'setOwner', array('project_id' => $project['id'], 'user_id' => $user_id, 'is_owner' => 0), true) ?>
-                <?php endif ?>
+                            <?php else: ?>
-            </li>
+                                <?= $this->a(t('Set project manager'), 'project', 'setOwner', array('project_id' => $project['id'], 'user_id' => $user_id, 'is_owner' => 1), true) ?>
-        <?php endforeach ?>
+                            <?php endif ?>
-        </ul>
+                        </li>
-        <p><?= t('Don\'t forget that administrators have access to everything.') ?></p>
+                    </ul>
-    </div>
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </table>
     <?php endif ?>
 
     <?php if ($project['is_private'] == 0 && ! empty($users['not_allowed'])): ?>
@@ -65,3 +68,10 @@
     </div>
 </form>
 <?php endif ?>
+
+<div class="alert alert-info">
+    <ul>
+        <li><?= t('A project manager can change the settings of the project and have more privileges than a standard user.') ?></li>
+        <li><?= t('Don\'t forget that administrators have access to everything.') ?></li>
+    </ul>
+</div>