diff --git a/resources/lang/en/admin/groups/titles.php b/resources/lang/en/admin/groups/titles.php index 8807f5e54a..d875f190d7 100644 --- a/resources/lang/en/admin/groups/titles.php +++ b/resources/lang/en/admin/groups/titles.php @@ -10,5 +10,7 @@ return [ 'group_admin' => 'Group Admin', 'allow' => 'Allow', 'deny' => 'Deny', - + 'permission' => 'Permission', + 'grant' => 'Grant', + 'no_permissions' => 'This group has no permissions.' ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index e11a0a0bab..d3aff38869 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -265,5 +265,4 @@ 'view_all' => 'view all', 'hide_deleted' => 'Hide Deleted', 'email' => 'Email', - 'Help' ]; diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 7370c3a38a..f97c6c5644 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -35,7 +35,7 @@ {{ trans('general.name')}} - {{ trans('button.actions')}} + {{ trans('table.actions')}} diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 351e27cf5d..01314fb7b7 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -48,7 +48,7 @@ {{ trans('general.name') }} {{ trans('admin/custom_fields/general.qty_fields') }} {{ trans('admin/custom_fields/general.used_by_models') }} - {{ trans('button.actions') }} + {{ trans('table.actions') }} diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index 8f280dfe9a..3c8769f56a 100755 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -65,9 +65,9 @@ - - - + + + @foreach ($permissions as $area => $area_permission) @@ -87,11 +87,11 @@ @endunless @@ -108,11 +108,11 @@ @@ -128,11 +128,11 @@ {{ $this_permission['label'] }} diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php index 84e91c9dde..9b6c098638 100644 --- a/resources/views/groups/view.blade.php +++ b/resources/views/groups/view.blade.php @@ -57,7 +57,7 @@ @else -

This group has no permissions.

+

{{ trans('admin/groups/title.no_permissions') }}

@endif
PermissionGrantDeny{{ trans('admin/groups/titles.permission')}}{{ trans('admin/groups/titles.grant')}}{{ trans('admin/groups/titles.deny')}}
- + {{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} - + {{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
- + {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }} - + {{ Form::radio("$area", '0',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
- + {{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }} - + {{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}