#1, #3: Added icons to all the "primary" action buttons. Groups now displays the number of members and links between the users and groups screens directly. Added the number of groups to the admin stats widget.

app/Group.php

@@ -14,4 +14,9 @@ class Group extends Model
     protected $fillable = [
         'name'
     ];
+
+    public function users()
+    {
+        return $this->belongsToMany(User::class, 'user_groups');
+    }
 }

app/Http/Controllers/Admin/DefaultController.php

@@ -6,6 +6,7 @@ use App\Album;
 use App\Configuration;
 use App\Facade\Theme;
 use App\Facade\UserConfig;
+use App\Group;
 use App\Helpers\ConfigHelper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveSettingsRequest;
@@ -33,11 +34,13 @@ class DefaultController extends Controller
 
         $albumCount = Album::all()->count();
         $photoCount = Photo::all()->count();
+        $groupCount = Group::all()->count();
         $userCount = User::where('is_activated', true)->count();
 
         return Theme::render('admin.index', [
             'album_count' => $albumCount,
             'app_version' => config('app.version'),
+            'group_count' => $groupCount,
             'memory_limit' => ini_get('memory_limit'),
             'photo_count' => $photoCount,
             'php_version' => phpversion(),

resources/lang/en/admin.php

@@ -72,6 +72,11 @@ return [
     'edit_user_title' => 'Edit user account: :name',
     'group_deletion_failed' => 'An error occurred while removing the ":name" group: :error_message',
     'group_deletion_successful' => 'The ":name" group was removed successfully.',
+    'group_details_tab' => 'Details',
+    'group_no_users_message' => 'This group has no users assigned to it. Assign users to this group by using the Groups tab on the Edit User page.',
+    'group_number_users' => '{0} No users|{1} 1 user|[2,Inf] :count users',
+    'group_users_message' => 'The users shown below are linked to this group. To remove a user, click the user\'s name and untick the ":group_name" group from the Groups tab.',
+    'group_users_tab' => 'Users',
     'inactive_storage_legend' => 'Inactive storage location that cannot be used for new albums.',
     'is_uploading' => 'Uploading in progress...',
     'legend' => 'Legend/Key',
@@ -127,6 +132,7 @@ return [
     'settings_title' => 'Settings',
     'stats_widget' => [
         'albums' => 'album|albums',
+        'groups' => 'group|groups',
         'panel_header' => 'Statistics',
         'photos' => 'photo|photos',
         'users' => 'user|users',

resources/views/themes/base/admin/create_album.blade.php

@@ -54,7 +54,7 @@
 
                 <div class="form-actions">
                     <a href="{{ route('albums.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.create_action'), ['class' => 'btn btn-success']) !!}
+                    <button class="btn btn-success" type="submit"><i class="fa fa-fw fa-check"></i> @lang('forms.create_action')</button>
                 </div>
                 {!! Form::close() !!}
             </div>

resources/views/themes/base/admin/create_group.blade.php

@@ -38,7 +38,7 @@
 
                         <div class="form-actions">
                             <a href="{{ route('groups.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                            {!! Form::submit(trans('forms.create_action'), ['class' => 'btn btn-success']) !!}
+                            <button class="btn btn-success" type="submit"><i class="fa fa-fw fa-check"></i> @lang('forms.create_action')</button>
                         </div>
                     </div>
                 </div>

resources/views/themes/base/admin/create_storage.blade.php

@@ -180,7 +180,7 @@
 
                 <div class="form-actions">
                     <a href="{{ route('storage.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.create_action'), ['class' => 'btn btn-success']) !!}
+                    <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.create_action')</button>
                 </div>
                 {!! Form::close() !!}
             </div>

resources/views/themes/base/admin/create_user.blade.php

@@ -88,7 +88,7 @@
 
                 <div class="form-actions">
                     <a href="{{ route('users.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.create_action'), ['class' => 'btn btn-success']) !!}
+                    <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.create_action')</button>
                 </div>
                 {!! Form::close() !!}
             </div>

resources/views/themes/base/admin/delete_album.blade.php

@@ -21,13 +21,13 @@
             <div class="col-xs-12">
                 <h1>@yield('title')</h1>
                 <p>@lang('admin.delete_album_confirm', ['name' => $album->name])</p>
-                <div class="alert alert-warning">
+                <div class="alert alert-danger">
                     @lang('admin.delete_album_warning')
                 </div>
                 <div class="form-actions">
                     {!! Form::open(['route' => ['albums.destroy', $album->id], 'method' => 'DELETE']) !!}
                     <a href="{{ route('albums.show', ['id' => $album->id]) }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.delete_action'), ['class' => 'btn btn-danger']) !!}
+                    <button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-trash"></i> @lang('forms.delete_action')</button>
                     {!! Form::close() !!}
                 </div>
             </div>

resources/views/themes/base/admin/delete_group.blade.php

@@ -26,7 +26,7 @@
                 <div class="form-actions">
                     {!! Form::open(['route' => ['groups.destroy', $group->id], 'method' => 'DELETE']) !!}
                     <a href="{{ route('groups.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.delete_action'), ['class' => 'btn btn-danger']) !!}
+                    <button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-trash"></i> @lang('forms.delete_action')</button>
                     {!! Form::close() !!}
                 </div>
             </div>

resources/views/themes/base/admin/delete_storage.blade.php

@@ -20,13 +20,13 @@
             <div class="col-xs-12">
                 <h1>@yield('title')</h1>
                 <p>@lang('admin.delete_storage_confirm', ['name' => $storage->name])</p>
-                <div class="alert alert-warning">
+                <div class="alert alert-danger">
                     @lang('admin.delete_storage_warning')
                 </div>
                 <div class="form-actions">
                     {!! Form::open(['route' => ['storage.destroy', $storage->id], 'method' => 'DELETE']) !!}
                     <a href="{{ route('storage.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.delete_action'), ['class' => 'btn btn-danger']) !!}
+                    <button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-trash"></i> @lang('forms.delete_action')</button>
                     {!! Form::close() !!}
                 </div>
             </div>

resources/views/themes/base/admin/delete_user.blade.php

@@ -26,7 +26,7 @@
                 <div class="form-actions">
                     {!! Form::open(['route' => ['users.destroy', $user->id], 'method' => 'DELETE']) !!}
                     <a href="{{ route('users.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.delete_action'), ['class' => 'btn btn-danger']) !!}
+                    <button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-trash"></i> @lang('forms.delete_action')</button>
                     {!! Form::close() !!}
                 </div>
             </div>

resources/views/themes/base/admin/edit_album.blade.php

@@ -43,7 +43,7 @@
 
                 <div class="form-actions">
                     <a href="{{ route('albums.show', ['id' => $album->id]) }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.save_action'), ['class' => 'btn btn-success']) !!}
+                    <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
                 </div>
                 {!! Form::close() !!}
             </div>

resources/views/themes/base/admin/edit_group.blade.php

@@ -23,6 +23,17 @@
                 <hr/>
 
                 {!! Form::model($group, ['route' => ['groups.update', $group->id], 'method' => 'PUT']) !!}
+                <div>
+                    {{-- Nav tabs --}}
+                    <ul class="nav nav-tabs" role="tablist">
+                        <li role="presentation" class="active"><a href="#details-tab" aria-controls="details-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-info-circle"></i> @lang('admin.group_details_tab')</a></li>
+                        <li role="presentation"><a href="#users-tab" aria-controls="groups-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-users"></i> @lang('admin.group_users_tab')</a></li>
+                    </ul>
+
+                    {{-- Tab panes --}}
+                    <div class="tab-content">
+                        {{-- Details --}}
+                        <div role="tabpanel" class="tab-pane active" id="details-tab">
                             <div class="row">
                                 <div class="col-md-6 col-md-offset-3">
                                     <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
@@ -38,7 +49,25 @@
 
                                     <div class="form-actions">
                                         <a href="{{ route('groups.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                            {!! Form::submit(trans('forms.save_action'), ['class' => 'btn btn-success']) !!}
+                                        <button class="btn btn-success" type="submit"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        {{-- Users --}}
+                        <div role="tabpanel" class="tab-pane" id="users-tab">
+                            @if ($group->users()->count() > 0)
+                                <p>@lang('admin.group_users_message', ['group_name' => $group->name])</p>
+                                <ul class="nav nav-pills">
+                                    @foreach ($group->users as $user)
+                                        <li><a href="{{ route('users.edit', [$user->id]) }}">{{ $user->name }}</a></li>
+                                    @endforeach
+                                </ul>
+                            @else
+                                <p class="text-danger">@lang('admin.group_no_users_message')</p>
+                                <p><a class="btn btn-default" href="{{ route('users.index') }}">@lang('admin.users_title')</a></p>
+                            @endif
                         </div>
                     </div>
                 </div>

resources/views/themes/base/admin/edit_storage.blade.php

@@ -65,7 +65,7 @@
 
                 <div class="form-actions">
                     <a href="{{ route('storage.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                    {!! Form::submit(trans('forms.save_action'), ['class' => 'btn btn-success']) !!}
+                    <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
                 </div>
                 {!! Form::close() !!}
             </div>

resources/views/themes/base/admin/edit_user.blade.php

@@ -127,7 +127,7 @@
 
                     <div class="form-actions" style="margin-top: 20px;">
                         <a href="{{ route('users.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                        {!! Form::submit(trans('forms.save_action'), ['class' => 'btn btn-success']) !!}
+                        <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
                     </div>
                 </div>
                 {!! Form::close() !!}

resources/views/themes/base/admin/list_albums.blade.php

@@ -27,7 +27,7 @@
                         <h4 class="text-danger"><b>@lang('admin.no_albums_title')</b></h4>
                         <p>@lang('admin.no_albums_text')</p>
                         <p style="margin-top: 40px;">
-                            <a href="{{ route('albums.create') }}" class="btn btn-lg btn-success">@lang('admin.create_album')</a>
+                            <a href="{{ route('albums.create') }}" class="btn btn-lg btn-success"><i class="fa fa-fw fa-plus"></i> @lang('admin.create_album')</a>
                         </p>
                     </div>
                 @else

resources/views/themes/base/admin/list_groups.blade.php

@@ -36,7 +36,8 @@
                         @foreach ($groups as $group)
                             <tr>
                                 <td>
-                                    <span style="font-size: 1.3em;">{{ $group->name }}</span>
+                                    <span style="font-size: 1.3em;">{{ $group->name }}</span><br/>
+                                    <span class="{{ $group->users()->count() == 0 ? "text-danger" : "text-success" }}">{{ trans_choice('admin.group_number_users', $group->users()->count()) }}</span>
                                 </td>
                                 <td class="text-right">
                                     <a href="{{ route('groups.edit', ['id' => $group->id]) }}" class="btn btn-default">@lang('forms.edit_action')</a>
@@ -52,6 +53,7 @@
                     </div>
 
                     <div class="pull-right" style="margin-top: 10px;">
+                        <a href="{{ route('users.index') }}" class="btn btn-default">@lang('admin.list_users_title')</a>
                         <a href="{{ route('groups.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> @lang('admin.create_group')</a>
                     </div>
                 @endif

resources/views/themes/base/admin/list_users.blade.php

@@ -49,6 +49,7 @@
                 </div>
 
                 <div class="pull-right" style="margin-top: 10px;">
+                    <a href="{{ route('groups.index') }}" class="btn btn-default">@lang('admin.list_groups_title')</a>
                     <a href="{{ route('users.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> @lang('admin.create_user')</a>
                 </div>
             </div>

resources/views/themes/base/admin/settings.blade.php

@@ -203,7 +203,7 @@
 
                     <div class="pull-right" style="margin-top: 15px;">
                         <a href="{{ route('admin') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
-                        {!! Form::submit(trans('admin.settings_save_action'), ['class' => 'btn btn-success']) !!}
+                        <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('admin.settings_save_action')</button>
                     </div>
                 </div>
 

resources/views/themes/base/admin/show_album.blade.php

@@ -38,7 +38,7 @@
                                 <div class="text-center" style="margin-top: 30px;">
                                     <h4 class="text-danger"><b>@lang('admin.album_no_photos_p1')</b></h4>
                                     <p>@lang('admin.album_no_photos_p2')</p>
-                                    <p style="margin-top: 30px;"><button id="upload-button" class="btn btn-lg btn-success">@lang('admin.album_no_photos_button')</button></p>
+                                    <p style="margin-top: 30px;"><button id="upload-button" class="btn btn-lg btn-success"><i class="fa fa-fw fa-upload"></i> @lang('admin.album_no_photos_button')</button></p>
                                 </div>
                             @else
                                 {!! Form::open(['route' => ['photos.updateBulk', $album->id], 'method' => 'PUT', 'id' => 'bulk-modify-form']) !!}
@@ -106,7 +106,7 @@
                                         </div>
 
                                         <div>
-                                            <button type="submit" class="btn btn-success" data-bind="disable: (isUploadInProgress() || isBulkUploadInProgress()), text: isUploadInProgress() ? '@lang('admin.is_uploading')' : '@lang('forms.upload_action')'">@lang('forms.upload_action')</button>
+                                            <button type="submit" class="btn btn-success" data-bind="disable: (isUploadInProgress() || isBulkUploadInProgress()), text: isUploadInProgress() ? '@lang('admin.is_uploading')' : '@lang('forms.upload_action')'"><i class="fa fa-fw fa-upload"></i> @lang('forms.upload_action')</button>
                                         </div>
                                         {!! Form::close() !!}
                                     </div>
@@ -159,7 +159,7 @@
                                 </div>
 
                                 <div>
-                                    <button type="submit" class="btn btn-success" data-bind="disable: (isUploadInProgress() || isBulkUploadInProgress()), text: isBulkUploadInProgress() ? '@lang('admin.is_uploading')' : '@lang('forms.upload_action')'">@lang('forms.upload_action')</button>
+                                    <button type="submit" class="btn btn-success" data-bind="disable: (isUploadInProgress() || isBulkUploadInProgress()), text: isBulkUploadInProgress() ? '@lang('admin.is_uploading')' : '@lang('forms.upload_action')'"><i class="fa fa-fw fa-upload"></i> @lang('forms.upload_action')</button>
                                 </div>
                                 {!! Form::close() !!}
                             @endif
@@ -218,7 +218,7 @@
                                         <div class="panel-body">
                                             <p>@lang('admin.save_changes_intro')</p>
                                             <p class="text-right">
-                                                <button type="submit" class="btn btn-success">@lang('forms.save_action')</button>
+                                                <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-floppy-o"></i> @lang('forms.save_action')</button>
                                             </p>
                                         </div>
                                     </div>

resources/views/themes/base/partials/admin_stats_widget.blade.php

@@ -4,7 +4,7 @@
         <p>
             <b>{{ $album_count }}</b> {{ trans_choice('admin.stats_widget.albums', $album_count) }}<br/>
             <b>{{ $photo_count }}</b> {{ trans_choice('admin.stats_widget.photos', $photo_count) }}<br/>
-            <b>{{ $user_count }}</b> {{ trans_choice('admin.stats_widget.users', $user_count) }}
+            <b>{{ $user_count }}</b> {{ trans_choice('admin.stats_widget.users', $user_count) }} / <b>{{ $group_count }}</b> {{ trans_choice('admin.stats_widget.groups', $group_count) }}
         </p>
     </div>
 </div>