Skip to content

A free open source IT asset/license management system

Nicer UI for groups

snipe6e100177da39
diff --git a/resources/lang/en-US/admin/groups/message.php b/resources/lang/en-US/admin/groups/message.php
index 11ab88ffbb..9b08de953f 100644
--- a/resources/lang/en-US/admin/groups/message.php
+++ b/resources/lang/en-US/admin/groups/message.php
@@ -5,6 +5,7 @@ return [
'group_exists' => 'Group already exists!',
'group_not_found' => 'Group ID :id does not exist.',
'group_name_required' => 'The name field is required',
+ 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
'success' => [
'create' => 'Group was successfully created.',
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
index d45cf414b8..25a5b3cd20 100755
--- a/resources/views/groups/index.blade.php
+++ b/resources/views/groups/index.blade.php
@@ -6,9 +6,7 @@
@parent
@stop
-@section('header_right')
-<a href="{{ route('groups.create') }}" class="btn btn-primary text-right"> {{ trans('general.create') }}</a>
-@stop
+
{{-- Page content --}}
diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php
index 59e28adec2..4e7921d36c 100644
--- a/resources/views/groups/view.blade.php
+++ b/resources/views/groups/view.blade.php
@@ -7,45 +7,41 @@
@stop
@section('header_right')
- <a href="{{ route('groups.edit', ['group' => $group->id]) }}" class="btn btn-primary text-right">{{ trans('admin/groups/titles.update') }} </a>
-@stop
-
+ <i class="fa-regular fa-2x fa-square-caret-right pull-right" id="expand-info-panel-button" data-tooltip="true" title="{{ trans('button.show_hide_info') }}"></i>
+@endsection
{{-- Page content --}}
@section('content')
<x-container columns="2">
- <x-page-column class="col-md-9">
+
+ <x-page-column class="col-md-9 main-panel">
<x-box>
- <table
- data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
- data-cookie-id-table="groupsUsersTable"
- data-side-pagination="server"
- id="groupsUsersTable"
- class="table table-striped snipe-table"
- data-url="{{ route('api.users.index',['group_id'=> $group->id]) }}"
- data-export-options='{
- "fileName": "export-{{ str_slug($group->name) }}-group-users-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
+ <x-table.users name="groupsUsersTable" :route="route('api.users.index', ['group_id' => $group->id])"/>
</x-box>
-
</x-page-column>
- <x-page-column class="col-md-3">
+ <x-page-column class="col-md-3 hidden-print">
- @if (is_array($group->decodePermissions()))
- <ul class="list-unstyled">
- @foreach ($group->decodePermissions() as $permission_name => $permission)
- <li>{!! ($permission == '1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i><span class="sr-only">'.trans('general.yes').': </span>' : '<i class="fas fa-times text-danger" aria-hidden="true"></i><span class="sr-only">'.trans('general.no').': </span>' !!} {{ e(str_replace('.', ': ', ucwords($permission_name))) }} </li>
- @endforeach
+ <x-box class="side-box expanded">
+ <x-box.info-panel :infoPanelObj="$group">
- </ul>
- @else
- <p>{{ trans('admin/groups/titles.no_permissions') }}</p>
- @endif
+ <x-slot:buttons>
+ <x-button :item="$group" permission="update" :route="route('groups.edit', $group->id)" class="btn-warning"/>
+ <x-button.delete :item="$group"/>
+ </x-slot:buttons>
+ @if (is_array($group->decodePermissions()))
+ @foreach ($group->decodePermissions() as $permission_name => $permission)
+ <li class="list-group-item">{!! ($permission == '1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i><span class="sr-only">'.trans('general.yes').': </span>' : '<i class="fas fa-times text-danger" aria-hidden="true"></i><span class="sr-only">'.trans('general.no').': </span>' !!} {{ e(str_replace('.', ': ', ucwords($permission_name))) }} </li>
+ @endforeach
+ @else
+ <p>{{ trans('admin/groups/titles.no_permissions') }}</p>
+ @endif
+
+ </x-box.info-panel>
+ </x-box>
</x-page-column>
+
</x-container>
@stop