From 3774fa95fe19215fffb552da0ff2da1d392886e1 Mon Sep 17 00:00:00 2001 From: Nate Date: Fri, 6 Mar 2020 15:25:08 -0700 Subject: [PATCH] Group Members/Permissions/Edit - Minor improvements (maybe). --- core/groups/app_languages.php | 88 +++++++++++++++++++------------ core/groups/group_edit.php | 9 ++++ core/groups/group_permissions.php | 3 ++ core/groups/groupmembers.php | 17 +++--- 4 files changed, 76 insertions(+), 41 deletions(-) diff --git a/core/groups/app_languages.php b/core/groups/app_languages.php index 387654e1f3..8f0885cecc 100644 --- a/core/groups/app_languages.php +++ b/core/groups/app_languages.php @@ -1701,45 +1701,25 @@ $text['header-user_add']['ru-ru'] = "Пользователь"; $text['header-user_add']['sv-se'] = "Användare"; $text['header-user_add']['uk-ua'] = "Користувач"; -$text['header-group_permissions']['en-us'] = "Group Permissions: "; -$text['header-group_permissions']['ar-eg'] = ""; -$text['header-group_permissions']['de-at'] = "Gruppenberechtigungen:"; //copied from de-de -$text['header-group_permissions']['de-ch'] = "Gruppenberechtigungen:"; //copied from de-de -$text['header-group_permissions']['de-de'] = "Gruppenberechtigungen:"; -$text['header-group_permissions']['es-cl'] = "Permisos de Grupo: "; -$text['header-group_permissions']['es-mx'] = "Permisos de Grupo: "; //copied from es-cl -$text['header-group_permissions']['fr-ca'] = "Permissions du Groupe: "; //copied from fr-fr -$text['header-group_permissions']['fr-fr'] = "Permissions du Groupe: "; -$text['header-group_permissions']['he-il'] = "הרשאות קבוצה"; -$text['header-group_permissions']['it-it'] = "Permessi Gruppo: "; -$text['header-group_permissions']['nl-nl'] = ""; -$text['header-group_permissions']['pl-pl'] = "Uprawnienia grupy"; -$text['header-group_permissions']['pt-br'] = "Permissões do Grupo: "; //copied from pt-pt -$text['header-group_permissions']['pt-pt'] = "Permissões do Grupo: "; -$text['header-group_permissions']['ro-ro'] = ""; -$text['header-group_permissions']['ru-ru'] = "Права группы: "; -$text['header-group_permissions']['sv-se'] = "Grupp Rättigheter"; -$text['header-group_permissions']['uk-ua'] = "Привілеї групи:"; - -$text['header-group_members']['en-us'] = "Group Members: "; +$text['header-group_members']['en-us'] = "Group Members "; $text['header-group_members']['ar-eg'] = ""; -$text['header-group_members']['de-at'] = "Gruppenmitglieder:"; //copied from de-de -$text['header-group_members']['de-ch'] = "Gruppenmitglieder:"; //copied from de-de -$text['header-group_members']['de-de'] = "Gruppenmitglieder:"; -$text['header-group_members']['es-cl'] = "Miembros de Grupo: "; -$text['header-group_members']['es-mx'] = "Miembros de Grupo: "; //copied from es-cl -$text['header-group_members']['fr-ca'] = "Membres du Groupe: "; //copied from fr-fr -$text['header-group_members']['fr-fr'] = "Membres du Groupe: "; +$text['header-group_members']['de-at'] = "Gruppenmitglieder"; //copied from de-de +$text['header-group_members']['de-ch'] = "Gruppenmitglieder"; //copied from de-de +$text['header-group_members']['de-de'] = "Gruppenmitglieder"; +$text['header-group_members']['es-cl'] = "Miembros de Grupo "; +$text['header-group_members']['es-mx'] = "Miembros de Grupo "; //copied from es-cl +$text['header-group_members']['fr-ca'] = "Membres du Groupe "; //copied from fr-fr +$text['header-group_members']['fr-fr'] = "Membres du Groupe "; $text['header-group_members']['he-il'] = "משתמשי קבוצה"; $text['header-group_members']['it-it'] = "Membri Gruppo: "; $text['header-group_members']['nl-nl'] = ""; -$text['header-group_members']['pl-pl'] = "Członkowie grupy:"; -$text['header-group_members']['pt-br'] = "Membros do Grupo: "; //copied from pt-pt -$text['header-group_members']['pt-pt'] = "Membros do Grupo: "; +$text['header-group_members']['pl-pl'] = "Członkowie grupy"; +$text['header-group_members']['pt-br'] = "Membros do Grupo "; //copied from pt-pt +$text['header-group_members']['pt-pt'] = "Membros do Grupo "; $text['header-group_members']['ro-ro'] = ""; -$text['header-group_members']['ru-ru'] = "Участники группы: "; -$text['header-group_members']['sv-se'] = "Grupp Medlemmar:"; -$text['header-group_members']['uk-ua'] = "Учасники групи: "; +$text['header-group_members']['ru-ru'] = "Участники группы "; +$text['header-group_members']['sv-se'] = "Grupp Medlemmar"; +$text['header-group_members']['uk-ua'] = "Учасники групи "; $text['header-group_manager']['en-us'] = "Group Manager"; $text['header-group_manager']['ar-eg'] = ""; @@ -2221,6 +2201,46 @@ $text['button-users']['ru-ru'] = "Пользователи"; $text['button-users']['sv-se'] = "Användare"; $text['button-users']['uk-ua'] = "Користувачі"; +$text['button-members']['en-us'] = "Members"; +$text['button-members']['ar-eg'] = ""; +$text['button-members']['de-at'] = "Teilnehmer"; //copied from de-de +$text['button-members']['de-ch'] = "Teilnehmer"; //copied from de-de +$text['button-members']['de-de'] = "Teilnehmer"; +$text['button-members']['es-cl'] = "Miembros"; +$text['button-members']['es-mx'] = "Miembros"; //copied from es-cl +$text['button-members']['fr-ca'] = "Membres"; //copied from fr-fr +$text['button-members']['fr-fr'] = "Membres"; +$text['button-members']['he-il'] = ""; +$text['button-members']['it-it'] = "Membri"; +$text['button-members']['nl-nl'] = "Deelnemers"; +$text['button-members']['pl-pl'] = "Uczestnicy"; +$text['button-members']['pt-br'] = "Total"; +$text['button-members']['pt-pt'] = "Deputados"; +$text['button-members']['ro-ro'] = ""; +$text['button-members']['ru-ru'] = "Участники"; +$text['button-members']['sv-se'] = "Deltagare"; +$text['button-members']['uk-ua'] = "Учасники"; + +$text['button-permissions']['en-us'] = "Permissions"; +$text['button-permissions']['ar-eg'] = ""; +$text['button-permissions']['de-at'] = "Berechtigungen"; //copied from de-de +$text['button-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de +$text['button-permissions']['de-de'] = "Berechtigungen"; +$text['button-permissions']['es-cl'] = "Permisos"; +$text['button-permissions']['es-mx'] = "Permisos"; //copied from es-cl +$text['button-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr +$text['button-permissions']['fr-fr'] = "Permissions"; +$text['button-permissions']['he-il'] = "הרשאות"; +$text['button-permissions']['it-it'] = "Permessi"; +$text['button-permissions']['nl-nl'] = ""; +$text['button-permissions']['pl-pl'] = "Uprawnienia"; +$text['button-permissions']['pt-br'] = "Permissões"; //copied from pt-pt +$text['button-permissions']['pt-pt'] = "Permissões"; +$text['button-permissions']['ro-ro'] = ""; +$text['button-permissions']['ru-ru'] = "Права"; +$text['button-permissions']['sv-se'] = "Rättigheter"; +$text['button-permissions']['uk-ua'] = "Привілеї"; + $text['button-restore_default']['en-us'] = "Restore Default"; $text['button-restore_default']['ar-eg'] = ""; $text['button-restore_default']['de-at'] = "Zurücksetzen"; //copied from de-de diff --git a/core/groups/group_edit.php b/core/groups/group_edit.php index ec43968508..aaeabdd746 100644 --- a/core/groups/group_edit.php +++ b/core/groups/group_edit.php @@ -187,6 +187,15 @@ echo "
\n"; echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'groups.php']); $button_margin = 'margin-left: 15px;'; + if (permission_exists('group_permission_view')) { + echo button::create(['type'=>'button','label'=>$text['button-permissions'],'icon'=>'key','style'=>$button_margin,'link'=>'group_permissions.php?group_uuid='.urlencode($group_uuid)]); + unset($button_margin); + } + if (permission_exists('group_member_view')) { + echo button::create(['type'=>'button','label'=>$text['button-members'],'icon'=>'users','style'=>$button_margin,'link'=>'groupmembers.php?group_uuid='.urlencode($group_uuid)]); + unset($button_margin); + } + $button_margin = 'margin-left: 15px;'; if ($action == 'update' && permission_exists('group_add')) { echo button::create(['type'=>'submit','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'action','value'=>'copy','style'=>$button_margin,'onclick'=>"if (confirm('".$text['confirm-copy']."')) { document.getElementById('frm').submit(); } else { this.blur(); return false; }"]); unset($button_margin); diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php index b8f0f6d9d6..ebedba91c0 100644 --- a/core/groups/group_permissions.php +++ b/core/groups/group_permissions.php @@ -213,6 +213,9 @@ echo "
".$text['title-group_permissions']." (".escape($group_name).")
\n"; echo "
\n"; echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-sm-dn','link'=>'groups.php']); + if (permission_exists('group_member_view')) { + echo button::create(['type'=>'button','label'=>$text['button-members'],'icon'=>'users','style'=>'margin-left: 15px;','link'=>'groupmembers.php?group_uuid='.urlencode($group_uuid)]); + } echo "