diff options
Diffstat (limited to 'app')
29 files changed, 52 insertions, 3 deletions
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index f3c90aa9..2e084275 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php index 93291475..d177d6e5 100644 --- a/app/Locale/ca_ES/translations.php +++ b/app/Locale/ca_ES/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Only moving task between those columns is permitted for tasks assigned to the current user', '[DUPLICATE]' => '[DUPLICATE]', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 75d2c135..c04a704d 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index 2db7df2c..c772e6d5 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index e23dbaeb..80d26ab1 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Das Bewegen einer Aufgabe zwischen diesen Spalten ist nur für Aufgaben zulässig, die dem aktuellen Benutzer zugewiesen sind', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index ca7a2c3e..a4217f0a 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index debaed96..8261d4a0 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 09090ac1..b206c8bc 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index dec12412..9f0de891 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Seulement le déplacement des tâches entre ces colonnes est autorisé pour l\'utilisateur courant', '[DUPLICATE]' => '[COPIE]', 'DKK - Danish Krona' => 'DKK - Couronne danoise', + 'Remove user from group' => 'Supprimer cet utilisateur du groupe', ); diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php index 6b8492bc..e167f6ac 100644 --- a/app/Locale/hr_HR/translations.php +++ b/app/Locale/hr_HR/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 21902e67..3f943509 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Az aktuális felhasználóhoz rendelt feladatok csak az engedélyezett oszlopok között mozgathatóak', '[DUPLICATE]' => '[Duplikált]', 'DKK - Danish Krona' => 'Dán korona', + // 'Remove user from group' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index 725a4b2e..7d40c521 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 65e892a9..8cbbe377 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 6ad99370..d10582c1 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index 54c76885..febb600c 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index fb9b76fb..a588f4dc 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 85a55f1f..d92ec776 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index e07567d8..2af5c5c5 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 4f17e104..0fd1a8c6 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 43b0e617..7f3a99f2 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Somente movimentação de tarefas entre aquelas colunas são permitidas para tarefas designadas para o usuário atual', '[DUPLICATE]' => '[DUPLICADO]', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index c09eee8d..38de094e 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Apenas é permitido mover a tarefa entre essas colunas para tarefas atribuídas ao utilizador atual', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 23eded70..9b67c36e 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1333,4 +1333,5 @@ return array( 'Only moving task between those columns is permitted for tasks assigned to the current user' => 'Текущий пользователь может перемещать назначенные ему задачи только между этими колонками', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 87dba515..f1bdd9cb 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 211ba18a..8e349885 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index fc83440e..66171f7a 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index 3f703eef..642e7f77 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 67792bd5..9aef6216 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1333,4 +1333,5 @@ return array( // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '', // '[DUPLICATE]' => '', // 'DKK - Danish Krona' => '', + // 'Remove user from group' => '', ); diff --git a/app/Template/group/user_dropdown.php b/app/Template/group/user_dropdown.php new file mode 100644 index 00000000..48acb955 --- /dev/null +++ b/app/Template/group/user_dropdown.php @@ -0,0 +1,11 @@ +<div class="dropdown"> + <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong>#<?= $user['id'] ?> <i class="fa fa-caret-down"></i></strong></a> + <ul> + <li> + <?= $this->url->icon('user', t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> + </li> + <li> + <?= $this->modal->medium('trash', t('Remove user from group'), 'GroupListController', 'dissociate', array('group_id' => $user['group_id'], 'user_id' => $user['id'])) ?> + </li> + </ul> +</div> diff --git a/app/Template/group/users.php b/app/Template/group/users.php index 5025ca7a..2469296a 100644 --- a/app/Template/group/users.php +++ b/app/Template/group/users.php @@ -13,9 +13,20 @@ <?= $this->render('user_list/header', array('paginator' => $paginator)) ?> <?php foreach ($paginator->getCollection() as $user): ?> <div class="table-list-row table-border-left"> - <?= $this->render('user_list/user_title', array( - 'user' => $user, - )) ?> + <div> + <?= $this->render('group/user_dropdown', array('user' => $user)) ?> + <span class="table-list-title <?= $user['is_active'] == 0 ? 'status-closed' : '' ?>"> + <?= $this->avatar->small( + $user['id'], + $user['username'], + $user['name'], + $user['email'], + $user['avatar_path'], + 'avatar-inline' + ) ?> + <?= $this->url->link($this->text->e($user['name'] ?: $user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> + </span> + </div> <?= $this->render('user_list/user_details', array( 'user' => $user, |