#1, #2: Added intro titles/messages to the main settings pages. Updated the look of the "Actions" widget to match the "Manage" widget. Changed the URL of the users pages to plural.

.idea/webServers.xml

@@ -3,7 +3,7 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="b14a34b0-0127-4886-964a-7be75a2281ac" name="Development" url="http://blue-twilight-dev.andys.eu">
-        <fileTransfer host="scar.andys.eu" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" rootFolder="/srv/www/blue-twilight-dev" accessType="SFTP" keyPair="true">
+        <fileTransfer host="scar.andys.eu" port="22" privateKey="C:\Users\aheathershaw\.ssh\id_rsa" rootFolder="/srv/www/blue-twilight-dev" accessType="SFTP" keyPair="true">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />
           </advancedOptions>

app/Http/Controllers/Admin/UserController.php

@@ -34,7 +34,7 @@ class UserController extends Controller
         if ($user->id == Auth::user()->id)
         {
             $request->session()->flash('warning', trans('admin.cannot_delete_own_user_account'));
-            return redirect(route('user.index'));
+            return redirect(route('users.index'));
         }
 
         return Theme::render('admin.delete_user', ['user' => $user]);

resources/lang/en/admin.php

@@ -57,7 +57,7 @@ return [
     'delete_user_warning' => 'This is a permanent action that cannot be reversed!',
     'edit_album' => 'Edit photo album: :album_name',
     'edit_album_action' => 'Edit album details',
-    'edit_album_intro' => 'Photo albums contain individual photographs together in the same way as a physical photo album or memory book.',
+    'edit_album_intro' => 'Photo albums contain individual photographs in the same way as a physical photo album or memory book.',
     'edit_album_intro2' => 'Complete the form below to edit the properties of the album: :album_name.',
     'edit_storage' => 'Edit storage location: :storage_name',
     'edit_storage_intro' => 'Use the form below to update the details of the :storage_name storage location.',
@@ -66,6 +66,12 @@ return [
     'inactive_storage_legend' => 'Inactive storage location that cannot be used for new albums.',
     'is_uploading' => 'Uploading in progress...',
     'legend' => 'Legend/Key',
+    'list_albums_intro' => 'Albums contain collections of individual photographs in the same way as a physical photo album or memory book.',
+    'list_albums_title' => 'Albums',
+    'list_storages_intro' => 'Storage locations specify the physical location where your photograph files are held. This may be on your local server\'s filesystem, or on a cloud storage provider such as Rackspace or Amazon S3.',
+    'list_storages_title' => 'Storage Locations',
+    'list_users_intro' => 'User accounts allow people to login to your gallery to manage your albums. If you have disabled self-registration, you can create user accounts here to allow people to login.',
+    'list_users_title' => 'Users',
     'manage_widget' => [
         'panel_header' => 'Manage'
     ],
@@ -100,6 +106,7 @@ return [
     ],
     'select_none_action' => 'Clear selection',
     'settings_image_protection' => 'Image Protection',
+    'settings_intro' => 'Configure your Blue Twilight system just the way you like it.',
     'settings_recaptcha' => 'reCAPTCHA settings',
     'settings_save_action' => 'Update Settings',
     'settings_saved_message' => 'The settings were updated successfully.',

resources/lang/en/global.php

@@ -12,7 +12,7 @@ return [
     'version_number' => 'Version :version',
     'please_wait' => 'Please wait...',
     'post_max_exceeded' => 'Your upload exceeded the maximum size the web server is configured to allow. Please check the value of the "post_max_size" parameter in php.ini.',
-    'powered_by' => 'Powered by :link_startBlue Twilight:link_end - the self-hosted photo gallery software.',
+    'powered_by' => 'Powered by :link_startBlue Twilight:link_end - the self-hosted PHP photo gallery software.',
     'units' => [
         'megabytes' => 'MB'
     ]

resources/lang/en/navigation.php

@@ -12,6 +12,7 @@ return [
         'edit_album' => 'Edit album',
         'edit_storage' => 'Edit storage location',
         'edit_user' => 'Edit user',
+        'groups' => 'Groups',
         'home' => 'Gallery',
         'settings' => 'Settings',
         'storage' => 'Storage',

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.create_album')</li>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.create_storage')</li>

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

@@ -5,9 +5,9 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
-                <li><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.users')</a></li>
+                <li><a href="{{ route('users.index') }}">@lang('navigation.breadcrumb.users')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.create_user')</li>
             </ol>
         </div>
@@ -22,7 +22,7 @@
                 <p>@lang('admin.create_user_intro')</p>
                 <hr/>
 
-                {!! Form::open(['route' => 'user.store', 'method' => 'POST']) !!}
+                {!! Form::open(['route' => 'users.store', 'method' => 'POST']) !!}
                 <div class="row">
                     <div class="col-sm-6">
                         <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
@@ -87,7 +87,7 @@
                 </div>
 
                 <div class="form-actions">
-                    <a href="{{ route('user.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
+                    <a href="{{ route('users.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
                     {!! Form::submit(trans('forms.create_action'), ['class' => 'btn btn-success']) !!}
                 </div>
                 {!! Form::close() !!}

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
                 <li><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.delete_storage')</li>

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

@@ -5,9 +5,9 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
-                <li><a href="{{ route('user.index') }}">@lang('navigation.breadcrumb.users')</a></li>
+                <li><a href="{{ route('users.index') }}">@lang('navigation.breadcrumb.users')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.delete_user')</li>
             </ol>
         </div>
@@ -24,8 +24,8 @@
                     @lang('admin.delete_user_warning')
                 </div>
                 <div class="form-actions">
-                    {!! Form::open(['route' => ['user.destroy', $user->id], 'method' => 'DELETE']) !!}
+                    {!! Form::open(['route' => ['users.destroy', $user->id], 'method' => 'DELETE']) !!}
-                    <a href="{{ route('user.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
+                    <a href="{{ route('users.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
                     {!! Form::submit(trans('forms.delete_action'), ['class' => 'btn btn-danger']) !!}
                     {!! Form::close() !!}
                 </div>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
                 <li><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.edit_storage')</li>

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

@@ -5,9 +5,9 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
-                <li><a href="{{ route('user.index') }}">@lang('navigation.breadcrumb.users')</a></li>
+                <li><a href="{{ route('users.index') }}">@lang('navigation.breadcrumb.users')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.edit_user')</li>
             </ol>
         </div>
@@ -22,7 +22,7 @@
                 <p>@lang('admin.edit_user_intro')</p>
                 <hr/>
 
-                {!! Form::model($user, ['route' => ['user.update', $user->id], 'method' => 'PUT']) !!}
+                {!! Form::model($user, ['route' => ['users.update', $user->id], 'method' => 'PUT']) !!}
                 <div class="row">
                     <div class="col-sm-6">
                         <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
@@ -96,7 +96,7 @@
                 @endif
 
                 <div class="form-actions">
-                    <a href="{{ route('user.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
+                    <a href="{{ route('users.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
                     {!! Form::submit(trans('forms.save_action'), ['class' => 'btn btn-success']) !!}
                 </div>
                 {!! Form::close() !!}

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li class="active">@lang('navigation.breadcrumb.admin')</li>
             </ol>
         </div>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.albums')</li>
             </ol>
@@ -17,6 +17,11 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12">
+                <h1>@lang('admin.list_albums_title')</h1>
+                <div class="alert alert-info" style="margin-bottom: 30px;">
+                    <p><i class="fa fa-fw fa-info"></i> @lang('admin.list_albums_intro')</p>
+                </div>
+
                 @if (count($albums) == 0)
                     <div class="text-center">
                         <h4 class="text-danger"><b>@lang('admin.no_albums_title')</b></h4>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.storage')</li>
             </ol>
@@ -17,6 +17,11 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12">
+                <h1>@lang('admin.list_storages_title')</h1>
+                <div class="alert alert-info" style="margin-bottom: 30px;">
+                    <p><i class="fa fa-fw fa-info"></i> @lang('admin.list_storages_intro')</p>
+                </div>
+
                 @if (count($storageLocations) == 0)
                     <div class="text-center">
                         <h4 class="text-danger"><b>@lang('admin.no_storages_title')</b></h4>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.users')</li>
             </ol>
@@ -17,6 +17,11 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12">
+                <h1>@lang('admin.list_users_title')</h1>
+                <div class="alert alert-info" style="margin-bottom: 30px;">
+                    <p><i class="fa fa-fw fa-info"></i> @lang('admin.list_users_intro')</p>
+                </div>
+
                 <table class="table table-hover table-striped">
                     <tbody>
                     @foreach ($users as $user)
@@ -31,8 +36,8 @@
                                 @endif
                             </td>
                             <td class="text-right">
-                                <a href="{{ route('user.edit', ['id' => $user->id]) }}" class="btn btn-default">@lang('forms.edit_action')</a>
+                                <a href="{{ route('users.edit', ['id' => $user->id]) }}" class="btn btn-default">@lang('forms.edit_action')</a>
-                                <a href="{{ route('user.delete', ['id' => $user->id]) }}" class="btn btn-danger">@lang('forms.delete_action')</a>
+                                <a href="{{ route('users.delete', ['id' => $user->id]) }}" class="btn btn-danger">@lang('forms.delete_action')</a>
                             </td>
                         </tr>
                     @endforeach
@@ -44,7 +49,7 @@
                 </div>
 
                 <div class="pull-right" style="margin-top: 10px;">
-                    <a href="{{ route('user.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> @lang('admin.create_user')</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>
         </div>

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li class="active">@lang('navigation.breadcrumb.settings')</li>
             </ol>
@@ -18,7 +18,7 @@
         <div class="row">
             <div class="col-xs-12">
                 <h1>@yield('title')</h1>
-                <hr/>
+                <p style="margin-bottom: 30px;">@lang('admin.settings_intro')</p>
 
                 {!! Form::model($config, ['route' => 'admin.saveSettings', 'method' => 'POST']) !!}
 

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

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
                 <li><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
                 <li class="active">{{ $album->name }}</li>

resources/views/themes/base/gallery/album_empty.blade.php

@@ -5,7 +5,7 @@
     <div class="breadcrumb">
         <div class="container">
             <ol class="breadcrumb">
-                <li><a href="{{ route('home') }}">@lang('navigation.breadcrumb.home')</a></li>
+                <li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
                 <li class="active">{{ $album->name }}</li>
             </ol>
         </div>

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

@@ -1,6 +1,8 @@
 <div class="panel panel-default">
     <div class="panel-heading">@lang('admin.actions_widget.panel_header')</div>
     <div class="panel-body">
-        <a href="{{ route('albums.create') }}"><i class="fa fa-fw fa-plus"></i> @lang('admin.actions_widget.create_album_link')</a>
+        <ul class="nav nav-pills">
+            <li role="presentation"><a href="{{ route('albums.create') }}"><i class="fa fa-fw fa-plus"></i> @lang('admin.actions_widget.create_album_link')</a></li>
+        </ul>
     </div>
 </div>

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

@@ -3,7 +3,8 @@
     <div class="panel-body">
         <ul class="nav nav-pills">
             <li role="presentation"><a href="{{ route('albums.index') }}"><i class="fa fa-fw fa-picture-o"></i> @lang('navigation.breadcrumb.albums')</a></li>
-            <li role="presentation"><a href="{{ route('user.index') }}"><i class="fa fa-fw fa-user"></i> @lang('navigation.breadcrumb.users')</a></li>
+            <li role="presentation"><a href="{{ route('users.index') }}"><i class="fa fa-fw fa-user"></i> @lang('navigation.breadcrumb.users')</a></li>
+            <li role="presentation"><a href="{{ route('groups.index') }}"><i class="fa fa-fw fa-users"></i> @lang('navigation.breadcrumb.groups')</a></li>
             <li role="presentation"><a href="{{ route('storage.index') }}"><i class="fa fa-fw fa-folder"></i> @lang('navigation.breadcrumb.storage')</a></li>
             <li role="presentation"><a href="{{ route('admin.settings') }}"><i class="fa fa-fw fa-cog"></i> @lang('navigation.breadcrumb.settings')</a></li>
         </ul>

routes/web.php

@@ -58,8 +58,11 @@ Route::group(['prefix' => 'admin'], function () {
     Route::resource('storage', 'Admin\StorageController');
 
     // User management
-    Route::get('user/{id}/delete', 'Admin\UserController@delete')->name('user.delete');
+    Route::get('users/{id}/delete', 'Admin\UserController@delete')->name('users.delete');
-    Route::resource('user', 'Admin\UserController');
+    Route::resource('users', 'Admin\UserController');
+
+    // Group management
+    Route::resource('groups', 'Admin\GroupController');
 });
 
 // Installation