#86: Updated more references from Github to Gitea (Admin > About page)

app/Helpers/ConfigHelper.php

@@ -87,6 +87,8 @@ class ConfigHelper
         $currentAppName = $this->get('app_name', false);
 
         return array(
+            'albums_menu_parents_only' => false,
+            'albums_menu_number_items' => 10,
             'allow_self_registration' => true,
             'analytics_code' => '',
             'app_name' => trans('global.app_name'),

app/Helpers/DbHelper.php

@@ -70,17 +70,20 @@ class DbHelper
                 ->leftJoin('permissions AS group_permissions', 'group_permissions.id', '=', 'album_group_permissions.permission_id')
                 ->leftJoin('permissions AS user_permissions', 'user_permissions.id', '=', 'album_user_permissions.permission_id')
                 ->leftJoin('user_groups', 'user_groups.group_id', '=', 'album_group_permissions.group_id')
-                ->where('albums.user_id', $user->id)
-                ->orWhere([
-                    ['group_permissions.section', 'album'],
-                    ['group_permissions.description', $permission],
-                    ['user_groups.user_id', $user->id]
-                ])
-                ->orWhere([
-                    ['user_permissions.section', 'album'],
-                    ['user_permissions.description', $permission],
-                    ['album_user_permissions.user_id', $user->id]
-                ]);
+                ->where(function($query) use ($user, $permission)
+                {
+                    $query->where('albums.user_id', $user->id)
+                    ->orWhere([
+                        ['group_permissions.section', 'album'],
+                        ['group_permissions.description', $permission],
+                        ['user_groups.user_id', $user->id]
+                    ])
+                    ->orWhere([
+                        ['user_permissions.section', 'album'],
+                        ['user_permissions.description', $permission],
+                        ['album_user_permissions.user_id', $user->id]
+                    ]);
+                });
         }
 
         $parentAlbumID = intval($parentAlbumID);

app/Helpers/FileHelper.php

@@ -46,7 +46,7 @@ class FileHelper
 
         if (!file_exists($path))
         {
-            mkdir($path, 0755, true);
+            @mkdir($path, 0755, true);
         }
 
         return $path;

app/Helpers/ValidationHelper.php

@@ -2,8 +2,37 @@
 
 namespace App\Helpers;
 
+use Illuminate\Support\Facades\DB;
+
 class ValidationHelper
 {
+    public function albumPathUnique($attribute, $value, $parameters, $validator)
+    {
+        $data = $validator->getData();
+        $parentID = intval($data['parent_album_id']);
+        $name = $data['name'];
+
+        if ($parentID === 0)
+        {
+            $parentID = null;
+        }
+
+        $queryParams = [
+            ['name', $name],
+            ['parent_album_id', $parentID]
+        ];
+
+        if (count($parameters) > 0)
+        {
+            $existingAlbumID = intval($parameters[0]);
+            $queryParams[] = ['id', '<>', $existingAlbumID];
+        }
+
+        $count = DB::table('albums')->where($queryParams)->count();
+
+        return ($count == 0);
+    }
+
     public function directoryExists($attribute, $value, $parameters, $validator)
     {
         return file_exists($value) && is_dir($value);

app/Http/Controllers/Admin/AlbumController.php

@@ -122,6 +122,12 @@ class AlbumController extends Controller
 
         $album = $this->loadAlbum($id, 'delete');
 
+        if ($album->children()->count() > 0)
+        {
+            $request->session()->flash('error', trans('admin.delete_album_failed_children', ['album' => $album->name]));
+            return redirect(route('albums.index'));
+        }
+
         // Delete all the photo files
         /** @var Photo $photo */
         foreach ($album->photos as $photo)

app/Http/Controllers/Admin/DefaultController.php

@@ -15,6 +15,7 @@ use App\Http\Requests\SaveSettingsRequest;
 use App\Label;
 use App\Mail\TestMailConfig;
 use App\Photo;
+use App\Services\GiteaService;
 use App\Services\GithubService;
 use App\Services\PhotoService;
 use App\Storage;
@@ -46,18 +47,18 @@ class DefaultController extends Controller
     {
         try
         {
-            $githubService = new GithubService();
-            $releaseInfo = $githubService->checkForLatestRelease();
+            $giteaService = new GiteaService();
+            $releaseInfo = $giteaService->checkForLatestRelease();
 
             // Convert the publish date so we can re-format it with the user's settings
-            $publishDate = \DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $releaseInfo->published_at);
+            $publishDate = \DateTime::createFromFormat('Y-m-d\TH:i:sP', $releaseInfo->published_at);
 
             // HTML-ify the body text
             $body = nl2br($releaseInfo->body);
             $body = preg_replace('/\*\*(.+)\*\*/', '<b>$1</b>', $body);
 
             // Remove the "v" from the release name
-            $version = substr($releaseInfo->name, 1);
+            $version = substr($releaseInfo->tag_name, 1);
 
             // Determine if we can upgrade
             $canUpgrade = version_compare($version, config('app.version')) > 0;
@@ -78,7 +79,6 @@ class DefaultController extends Controller
 
     public function metadataUpgrade()
     {
-        $albums = DbHelper::getAlbumsForCurrentUser();
         $albumIDs = DbHelper::getAlbumIDsForCurrentUser();
 
         $photoMetadata = DB::table('photos')
@@ -90,14 +90,28 @@ class DefaultController extends Controller
             ->groupBy('album_id')
             ->get();
 
+        $resultingAlbumIDs = [];
         foreach ($photoMetadata as $metadata)
         {
-            /** @var Album $album */
+            if (isset($metadata->min_metadata_version) && $metadata->min_metadata_version > 0)
+            {
+                $resultingAlbumIDs[$metadata->album_id] = $metadata->min_metadata_version;
+            }
+        }
+
+        // Now load the full album definitions
+        $albumsQuery = DbHelper::getAlbumsForCurrentUser_NonPaged();
+        $albumsQuery->whereIn('id', array_keys($resultingAlbumIDs));
+        $albums = $albumsQuery->paginate(UserConfig::get('items_per_page'));
+
+        /** @var Album $album */
+        foreach ($resultingAlbumIDs as $albumID => $metadataMinVersion)
+        {
             foreach ($albums as $album)
             {
-                if ($album->id == $metadata->album_id)
+                if ($album->id == $albumID)
                 {
-                    $album->min_metadata_version = $metadata->min_metadata_version;
+                    $album->min_metadata_version = $metadataMinVersion;
                 }
             }
         }
@@ -112,13 +126,14 @@ class DefaultController extends Controller
     {
         $this->authorizeAccessToAdminPanel();
 
-        $albumCount = DbHelper::getAlbumsForCurrentUser()->count();
+        $albumCount = count(DbHelper::getAlbumIDsForCurrentUser());
         $photoCount = Photo::all()->count();
         $groupCount = Group::all()->count();
         $labelCount = Label::all()->count();
         $userCount = User::where('is_activated', true)->count();
 
-        $metadataUpgradeNeeded = Photo::min('metadata_version') < PhotoService::METADATA_VERSION;
+        $minMetadataVersion = Photo::min('metadata_version');
+        $metadataUpgradeNeeded = $minMetadataVersion > 0 && $minMetadataVersion < PhotoService::METADATA_VERSION;
 
         // Default to a supported function call to get the OS version
         $osVersion = sprintf('%s %s', php_uname('s'), php_uname('r'));
@@ -200,6 +215,7 @@ class DefaultController extends Controller
             'smtp_password'
         ];
         $checkboxKeys = [
+            'albums_menu_parents_only',
             'allow_self_registration',
             'enable_visitor_hits',
             'hotlink_protection',
@@ -210,6 +226,7 @@ class DefaultController extends Controller
             'smtp_encryption',
         ];
         $updateKeys = [
+            'albums_menu_number_items',
             'app_name',
             'date_format',
             'sender_address',

app/Http/Controllers/Admin/PhotoController.php

@@ -296,6 +296,12 @@ class PhotoController extends Controller
         // Load the linked album
         $album = $this->loadAlbum($request->get('album_id'));
 
+        if (is_null($request->files->get('archive')))
+        {
+            $request->session()->flash('error', trans('admin.upload_bulk_no_file'));
+            return redirect(route('albums.show', ['id' => $album->id]));
+        }
+
         $archiveFile = UploadedFile::createFromBase($request->files->get('archive'));
         if ($archiveFile->getError() != UPLOAD_ERR_OK)
         {

app/Http/Controllers/Gallery/AlbumController.php

@@ -71,14 +71,14 @@ class AlbumController extends Controller
         else if ($requestedView != 'slideshow')
         {
             $photos = $album->photos()
-                ->orderBy(DB::raw('COALESCE(taken_at, created_at)'))
+                ->orderBy(DB::raw('COALESCE(taken_at, created_at), name, id'))
                 ->paginate(UserConfig::get('items_per_page'));
         }
         else
         {
             // The slideshow view needs access to all photos, not paged
             $photos = $album->photos()
-                ->orderBy(DB::raw('COALESCE(taken_at, created_at)'))
+                ->orderBy(DB::raw('COALESCE(taken_at, created_at), name, id'))
                 ->get();
         }
 

app/Http/Controllers/Gallery/PhotoController.php

@@ -105,14 +105,40 @@ class PhotoController extends Controller
         // Load the Next/Previous buttons
         $thisPhotoDate = is_null($photo->taken_at) ? $photo->created_at : $photo->taken_at;
 
-        $previousPhoto = $album->photos()
-            ->where(DB::raw('COALESCE(taken_at, created_at)'), '<', $thisPhotoDate)
-            ->orderBy(DB::raw('COALESCE(taken_at, created_at)'), 'desc')
-            ->first();
-        $nextPhoto = $album->photos()
-            ->where(DB::raw('COALESCE(taken_at, created_at)'), '>', $thisPhotoDate)
-            ->orderBy(DB::raw('COALESCE(taken_at, created_at)'))
-            ->first();
+        // I don't like the idea of using a totally raw SQL query, but it's the only sure-fire way to number the rows
+        // so we can get the previous/next photos accurately - and we don't have to load all data for the photo objects
+        $previousPhoto = null;
+        $nextPhoto = null;
+
+        $allAlbumPhotos = DB::select(
+            DB::raw(
+                'SELECT p.id, (@row_number:=@row_number + 1) AS row_number
+                FROM photos p, (SELECT @row_number:=0) AS t
+                WHERE p.album_id = :album_id
+              ORDER BY COALESCE(p.taken_at, p.created_at), p.name, p.id;'
+            ),
+            [
+                'album_id' => $album->id
+            ]
+        );
+
+        for ($i = 0; $i < count($allAlbumPhotos); $i++)
+        {
+            if ($allAlbumPhotos[$i]->id === $photo->id)
+            {
+                if ($i > 0)
+                {
+                    $previousPhoto = Photo::where('id', $allAlbumPhotos[$i - 1]->id)->first();
+                }
+
+                if ($i + 1 < count($allAlbumPhotos))
+                {
+                    $nextPhoto = Photo::where('id', $allAlbumPhotos[$i + 1]->id)->first();
+                }
+
+                break;
+            }
+        }
 
         // Record the visit to the photo
         if (UserConfig::get('enable_visitor_hits'))

app/Http/Middleware/GlobalConfiguration.php

@@ -63,7 +63,25 @@ class GlobalConfiguration
     private function addAlbumsToView()
     {
         $albums = DbHelper::getAlbumsForCurrentUser_NonPaged()->get();
-        View::share('albums', $albums);
+        View::share('g_albums', $albums);
+
+        if (UserConfig::get('albums_menu_parents_only'))
+        {
+            // Only show top-level albums in the nav bar
+            $navbarAlbums = $albums->filter(function($value, $key)
+            {
+                return is_null($value->parent_album_id);
+            });
+        }
+        else
+        {
+            // If not just showing top-level albums, we can show all
+            $navbarAlbums = $albums;
+        }
+
+        $navbarAlbumsToDisplay = UserConfig::get('albums_menu_number_items');
+        View::share('g_albums_menu', $navbarAlbums->take($navbarAlbumsToDisplay));
+        View::share('g_more_albums', $navbarAlbums->count() - $navbarAlbumsToDisplay);
 
         $albumsToUpload = DbHelper::getAlbumsForCurrentUser_NonPaged('upload-photos')->get();
         View::share('g_albums_upload', $albumsToUpload);

app/Http/Requests/SaveSettingsRequest.php

@@ -24,10 +24,11 @@ class SaveSettingsRequest extends FormRequest
     public function rules()
     {
         return [
+            'albums_menu_number_items' => 'required|integer|min:1',
             'app_name' => 'required|max:255',
             'date_format' => 'required',
             'smtp_server' => 'required',
-            'smtp_port' => 'required:integer'
+            'smtp_port' => 'required|integer'
         ];
     }
 }

app/Http/Requests/StoreAlbumRequest.php

@@ -28,7 +28,7 @@ class StoreAlbumRequest extends FormRequest
             case 'POST':
                 return [
                     'description' => '',
-                    'name' => 'required|unique:albums|max:255',
+                    'name' => 'required|album_path_unique|max:255',
                     'storage_id' => 'required|sometimes'
                 ];
 
@@ -38,7 +38,7 @@ class StoreAlbumRequest extends FormRequest
 
                 return [
                     'description' => 'sometimes',
-                    'name' => 'required|sometimes|max:255|unique:albums,name,' . $albumId,
+                    'name' => 'required|sometimes|max:255|album_path_unique:' . $albumId,
                     'storage_id' => 'required|sometimes'
                 ];
         }

app/Providers/AppServiceProvider.php

@@ -50,6 +50,7 @@ class AppServiceProvider extends ServiceProvider
         Validator::extend('is_dir', (ValidationHelper::class . '@directoryExists'));
         Validator::extend('dir_empty', (ValidationHelper::class . '@isDirectoryEmpty'));
         Validator::extend('is_writeable', (ValidationHelper::class . '@isPathWriteable'));
+        Validator::extend('album_path_unique', (ValidationHelper::class . '@albumPathUnique'));
 
         // Model observers
         Album::observe(AlbumObserver::class);

app/Services/GiteaService.php

@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Services;
+
+class GiteaService
+{
+    private $cacheFile = null;
+    private $config = [];
+
+    public function __construct()
+    {
+        $this->config = config('services.gitea');
+        $this->cacheFile = storage_path('app/gitea_cache.txt');
+    }
+
+    public function checkForLatestRelease()
+    {
+        $cacheData = null;
+
+        if ($this->doesCacheExist())
+        {
+            // Get the etag from the cache
+            $cacheData = $this->getCacheData();
+        }
+        else
+        {
+            // Lookup and store the version information
+            $statusCode = -1;
+            $result = $this->getLatestReleaseFromGitea($statusCode);
+
+            if ($statusCode == 200)
+            {
+                $releases = json_decode($result[1]);
+
+                $latestRelease = null;
+                foreach ($releases as $release)
+                {
+                    if (is_null($latestRelease) || version_compare($release->tag_name, $latestRelease->tag_name) > 0)
+                    {
+                        $latestRelease = $release;
+                    }
+                }
+
+                $cacheData = $this->setCacheData($latestRelease);
+            }
+        }
+
+        // GitHub compatibility
+        $cacheData->html_url = sprintf($this->config['releases_url'], $this->config['repo_owner'], $this->config['repo_name']);
+
+        return $cacheData;
+    }
+
+    private function doesCacheExist()
+    {
+        $exists = file_exists($this->cacheFile);
+
+        if ($exists)
+        {
+            // Check modified time on the file
+            $stat = stat($this->cacheFile);
+
+            $diff = time() - $stat['mtime'];
+            if ($diff > $this->config['cache_time_seconds'])
+            {
+                $exists = false;
+            }
+        }
+
+        return $exists;
+    }
+
+    private function getCacheData()
+    {
+        return json_decode(file_get_contents($this->cacheFile));
+    }
+
+    private function getLatestReleaseFromGitea(&$statusCode)
+    {
+        $httpHeaders = [
+            sprintf('User-Agent: aheathershaw/blue-twilight (v%s)', config('app.version'))
+        ];
+
+        if (isset($this->config['api_key']) && !empty($this->config['api_key']))
+        {
+            $httpHeaders[] = sprintf('Authorization: %s', $this->config['api_key']);
+        }
+
+        $apiUrl = sprintf('%s/repos/%s/%s/releases', $this->config['api_url'], $this->config['repo_owner'], $this->config['repo_name']);
+
+        $ch = curl_init($apiUrl);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeaders);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $result = curl_exec($ch);
+
+        if ($result === false)
+        {
+            throw new \Exception(sprintf('Error from Gitea: %s', curl_error($ch)));
+        }
+
+        $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+        return explode("\r\n\r\n", $result, 2);
+    }
+
+    private function setCacheData($data)
+    {
+        file_put_contents($this->cacheFile, json_encode(get_object_vars($data)));
+        return $data;
+    }
+}

config/app.php

@@ -2,7 +2,7 @@
 
 return [
     // Version number of Blue Twilight
-    'version' => '2.1.0',
+    'version' => '2.1.2',
 
     /*
     |--------------------------------------------------------------------------

config/services.php

@@ -14,33 +14,15 @@ return [
     |
     */
 
-    'github' => [
-        'latest_release_url' => 'https://api.github.com/repos/pandy06269/blue-twilight/releases/latest'
+    'gitea' => [
+        'api_url' => 'https://apps.andysh.uk/api/v1',
+        'cache_time_seconds' => 3600,
+        'releases_url' => 'https://apps.andysh.uk/%s/%s/releases',
+        'repo_name' => 'blue-twilight',
+        'repo_owner' => 'aheathershaw'
     ],
 
     'recaptcha' => [
         'verify_url' => 'https://www.google.com/recaptcha/api/siteverify'
     ]
-
-    /*'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
-    ],
-
-    'ses' => [
-        'key' => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
-        'region' => 'us-east-1',
-    ],
-
-    'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
-    ],
-
-    'stripe' => [
-        'model' => App\User::class,
-        'key' => env('STRIPE_KEY'),
-        'secret' => env('STRIPE_SECRET'),
-    ],*/
-
 ];

public/update.php

@@ -48,6 +48,9 @@ class BlueTwilightUpdater
 cd <?php echo $this->baseDirectory; ?>
 
 php artisan clear-compiled
+php artisan cache:clear
+php artisan config:clear
+php artisan view:clear
 /path/to/composer.phar install
         </pre>
         </body>
@@ -65,6 +68,8 @@ php artisan clear-compiled
             <?php
             $steps = [
                 ['Removing compiled cache', 'removeCompiledCached'],
+                ['Fetching Composer signature', 'fetchComposerSignature'],
+                ['Installing Composer', 'installComposer'],
                 ['Updating dependencies using Composer', 'runComposer']
             ];
 
@@ -92,6 +97,31 @@ php artisan clear-compiled
         <?php
     }
 
+    private function fetchComposerSignature()
+    {
+        if (!boolval(ini_get('allow_url_fopen')))
+        {
+            $this->echoError('allow_url_fopen is disabled so we cannot use Composer');
+            echo '<br/>';
+            $this->echoError('You will need to install the vendor libraries manually - <a href="https://github.com/pandy06269/blue-twilight/wiki/Install-Vendor-libraries-manually" target="_blank">see this page for more details</a>');
+            return false;
+        }
+
+        $signatureUrl = 'https://composer.github.io/installer.sig';
+        $this->composerSignature = trim(file_get_contents($signatureUrl));
+        if (strlen($this->composerSignature) == 0)
+        {
+            $this->echoError(sprintf("Failed downloading the Composer signature from %s", $signatureUrl));
+            return false;
+        }
+        else
+        {
+            $this->echoOK($this->composerSignature);
+        }
+
+        return true;
+    }
+
     private function removeCompiledCached()
     {
         ob_start();
@@ -155,6 +185,55 @@ php artisan clear-compiled
         echo '</span>' . PHP_EOL;
     }
 
+    private function installComposer()
+    {
+        $rc = -1;
+
+        ob_start();
+        system('php -r "copy(\'https://getcomposer.org/installer\', \'composer-setup.php\');"', $rc);
+        $result = ob_get_clean();
+        echo nl2br($result);
+
+        if ($rc != 0)
+        {
+            $this->echoError('Failed to fetch Composer');
+            return false;
+        }
+
+        ob_start();
+        system(sprintf('php -r "if (hash_file(\'SHA384\', \'composer-setup.php\') === \'%s\') { echo \'Installer verified\'; } else { echo \'Installer corrupt\'; unlink(\'composer-setup.php\'); } echo PHP_EOL;"', $this->composerSignature), $rc);
+        $result = ob_get_clean();
+        echo nl2br($result);
+        if ($rc != 0)
+        {
+            $this->echoError('Composer verification failed');
+            return false;
+        }
+
+        ob_start();
+        system('php composer-setup.php', $rc);
+        $result = ob_get_clean();
+        echo nl2br($result);
+        if ($rc != 0)
+        {
+            $this->echoError('Failed to install Composer');
+            return false;
+        }
+
+        ob_start();
+        system('php -r "unlink(\'composer-setup.php\');"', $rc);
+        $result = ob_get_clean();
+        echo nl2br($result);
+        if ($rc != 0)
+        {
+            $this->echoError('Failed to remove Composer setup file');
+            return false;
+        }
+
+        $this->echoOK();
+        return true;
+    }
+
     private function runComposer()
     {
         ob_start();

readme.md

@@ -35,4 +35,18 @@ The link to the demo system is: http://demo.showmy.photos. Login with:
 
 I'd love to get you up and running. If you need assistance installing the Blue Twilight PHP photo gallery, or would like to me to do it for you, please get in touch using the contact form located at:
 
-[www.andyheathershaw.uk/contact](http://www.andyheathershaw.uk/contact)
+[www.andyheathershaw.uk/contact](https://www.andyheathershaw.uk/contact)
+
+## More Apps by Andy
+
+Be sure to check out more apps written by Andy:
+
+[Simply Remind Me - email & SMS service](https://simplyremind.me)
+
+A free email & SMS reminder service so you don't forget the important things in life. Supports recurring reminders and repeated events.
+
+Create a public countdown page to share your holiday or birthday with the world.
+
+[Solid Tools for Developers - online debugging tools](https://soliddevtools.com)
+
+A suite of online debugging and diagnostics tools aimed at software developers. Includes a dig tool for DNS lookups, a ping tool to check server availability, a strong password generator and many more.

resources/assets/bootstrap/css/bootstrap-reboot.css

@@ -1,39 +1,46 @@
-html {
+/*!
+ * Bootstrap Reboot v4.1.2 (https://getbootstrap.com/)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */
+*,
+*::before,
+*::after {
   box-sizing: border-box;
+}
+
+html {
   font-family: sans-serif;
   line-height: 1.15;
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
   -ms-overflow-style: scrollbar;
-  -webkit-tap-highlight-color: transparent;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: inherit;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
 @-ms-viewport {
   width: device-width;
 }
 
-article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
+article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
   display: block;
 }
 
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
-  font-weight: normal;
+  font-weight: 400;
   line-height: 1.5;
   color: #212529;
+  text-align: left;
   background-color: #fff;
 }
 
 [tabindex="-1"]:focus {
-  outline: none !important;
+  outline: 0 !important;
 }
 
 hr {
@@ -44,7 +51,7 @@ hr {
 
 h1, h2, h3, h4, h5, h6 {
   margin-top: 0;
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
 }
 
 p {
@@ -56,7 +63,7 @@ abbr[title],
 abbr[data-original-title] {
   text-decoration: underline;
   -webkit-text-decoration: underline dotted;
-          text-decoration: underline dotted;
+  text-decoration: underline dotted;
   cursor: help;
   border-bottom: 0;
 }
@@ -82,7 +89,7 @@ ul ol {
 }
 
 dt {
-  font-weight: bold;
+  font-weight: 700;
 }
 
 dd {
@@ -140,7 +147,7 @@ a:not([href]):not([tabindex]) {
   text-decoration: none;
 }
 
-a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
+a:not([href]):not([tabindex]):hover, a:not([href]):not([tabindex]):focus {
   color: inherit;
   text-decoration: none;
 }
@@ -153,7 +160,7 @@ pre,
 code,
 kbd,
 samp {
-  font-family: monospace, monospace;
+  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   font-size: 1em;
 }
 
@@ -161,6 +168,7 @@ pre {
   margin-top: 0;
   margin-bottom: 1rem;
   overflow: auto;
+  -ms-overflow-style: scrollbar;
 }
 
 figure {
@@ -174,19 +182,7 @@ img {
 
 svg:not(:root) {
   overflow: hidden;
-}
-
-a,
-area,
-button,
-[role="button"],
-input,
-label,
-select,
-summary,
-textarea {
-  -ms-touch-action: manipulation;
-      touch-action: manipulation;
+  vertical-align: middle;
 }
 
 table {
@@ -196,18 +192,22 @@ table {
 caption {
   padding-top: 0.75rem;
   padding-bottom: 0.75rem;
-  color: #868e96;
+  color: #6c757d;
   text-align: left;
   caption-side: bottom;
 }
 
 th {
-  text-align: left;
+  text-align: inherit;
 }
 
 label {
   display: inline-block;
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
+}
+
+button {
+  border-radius: 0;
 }
 
 button:focus {
@@ -318,6 +318,7 @@ output {
 
 summary {
   display: list-item;
+  cursor: pointer;
 }
 
 template {

resources/assets/bootstrap/css/bootstrap-reboot.min.css

@@ -1,2 +1,8 @@
-html{box-sizing:border-box;font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}*,::after,::before{box-sizing:inherit}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input,label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#868e96;text-align:left;caption-side:bottom}th{text-align:left}label{display:inline-block;margin-bottom:.5rem}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}
+/*!
+ * Bootstrap Reboot v4.1.2 (https://getbootstrap.com/)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
 /*# sourceMappingURL=bootstrap-reboot.min.css.map */

resources/assets/js/albums.js

@@ -676,6 +676,13 @@ function UploadPhotosViewModel(album_id, queue_token, language, urls) {
             // Get the selected files
             var files = fileSelect[0].files;
 
+            if (files.length === 0)
+            {
+                alert(language.no_file_selected);
+                event.preventDefault();
+                return false;
+            }
+
             // Reset statistics
             this.currentStatus = '';
             this.statusMessages = [];

resources/lang/en/admin.php

@@ -7,12 +7,12 @@ return [
     'about' => [
         'current_version' => 'You are running version',
         'date_published_label' => 'Release date:',
-        'github_link' => 'Github Project Website',
-        'intro' => 'Blue Twilight is an <a href="https://www.andyheathershaw.uk/software/" target="_blank">App by Andy</a>.',
-        'intro_2' => 'It is made with <i class="fa fa-heart text-red"></i> in the UK by software developer <a href="https://www.andyheathershaw.uk" target="_blank">Andy Heathershaw</a>.',
-        'latest_version_loading' => 'Checking for the latest release on Github...',
+        'intro' => 'Blue Twilight is an <a href="https://andysh.uk/software/" target="_blank">App by Andy</a>.',
+        'intro_2' => 'It is made with <i class="fa fa-heart text-red"></i> in the UK by software developer <a href="https://andysh.uk" target="_blank">Andy Heathershaw</a>.',
+        'latest_version_loading' => 'Checking for the latest release...',
         'licence_header' => 'Licence',
         'links_header' => 'Useful Links',
+        'project_website_link' => 'Project Website',
         'title' => 'About Blue Twilight',
         'up_to_date' => 'Good job - your installation of Blue Twilight is up-to-date!',
         'update_available' => 'An update is available to Blue Twilight.',
@@ -51,6 +51,7 @@ return [
         'others' => ' others'
     ],
     'analyse_photos_failed' => 'The following items could not be analysed and were removed:',
+    'analyse_photos_failed_metadata' => 'The following items could not be analysed:',
     'anonymous_users' => 'Anonymous (not logged in)',
     'bulk_photos_changed' => ':number photo was updated successfully.|:number photos were updated successfully.',
     'cannot_delete_own_user_account' => 'It is not possible to delete your own user account. Please ask another administrator to delete it for you.',
@@ -78,6 +79,7 @@ return [
     'default_storage_legend' => 'Default storage location for new albums.',
     'delete_album' => 'Delete album :name',
     'delete_album_confirm' => 'Are you sure you want to permanently delete this album and all its contents?',
+    'delete_album_failed_children' => 'The album ":album" contains child albums and cannot be deleted. Please delete or move the child albums first.',
     'delete_album_success_message' => 'The album ":album" was deleted successfully.',
     'delete_album_warning' => 'This is a permanent action that cannot be undone!',
     'delete_bulk_photos_message' => 'Are you sure you want to delete the selected photos? This action cannot be undone!',
@@ -127,6 +129,7 @@ return [
     'is_uploading' => 'Uploading in progress...',
     'labels_intro' => 'Your labels are displayed below. The number in brackets indicates the number of photos linked to that label. Click a label to delete it.',
     'legend' => 'Legend/Key',
+    'list_albums' => 'Go to your albums',
     '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_groups_intro' => 'Organise your users into categories or types by using groups. You can assign permissions on albums to groups of users to make administration and management easier.',
@@ -140,8 +143,10 @@ return [
     'manage_widget' => [
         'panel_header' => 'Manage'
     ],
+    'metadata_no_albums_text' => 'You have no photo albums yet or all your albums are empty. Click the button below to list your albums or create a new album.',
+    'metadata_no_albums_title' => 'No Albums or Photos',
     'metadata_upgrade' => [
-        'can_be_upgraded' => 'Metadata can be updated (version :version_from --&gt; :version_to)',
+        'can_be_upgraded' => 'Metadata can be updated (version :version_from &raquo; :version_to)',
         'confirm' => 'Are you sure you want to update the metadata of the :name album?',
         'intro' => 'Blue Twilight analyses your photos to capture metadata such as the camera and location used to capture the photo. Sometimes we capture more metadata than we have done previously, which requires your original photos to be re-analysed.',
         'intro_2' => 'This page shows you which of your albums contain photos that need to be re-analysed to get the latest metadata information.',
@@ -194,6 +199,9 @@ return [
     'security_text' => 'You can assign permissions on this album to either groups (recommended) or directly to users.',
     'security_users_heading' => 'User Permissions',
     'settings' => [
+        'albums_menu_heading' => 'Albums Navigation Menu',
+        'albums_menu_number_items' => 'Number of albums to display:',
+        'albums_menu_parents_only' => 'Only show top-level albums',
         'analytics_cookie_link_1' => 'Information about the EU Cookie Law directive',
         'analytics_cookie_link_2' => 'Cookie Consent by Insites',
         'analytics_cookie_warning_1' => 'If you are based in Europe and you enable visitor tracking, you will need to comply with the EU Cookie Law. The easiest way to do so is using a script like Cookie Consent by Insites.',
@@ -251,6 +259,7 @@ return [
     ],
     'title' => 'Gallery Admin',
     'upload_bulk_heading' => 'Upload a zip archive',
+    'upload_bulk_no_file' => 'No archive was uploaded. Please select a file to upload.',
     'upload_bulk_text' => 'You can use the form below to upload a zip archive that contains your photographs. Any valid image files in the zip archive will be imported. Common hidden folders used by operating systems will be ignored.',
     'upload_bulk_text2' => 'Your web server is configured to allow files up to :max_upload_size to be uploaded.',
     'upload_disabled_heading' => 'Uploading is not supported on this system.',
@@ -261,6 +270,7 @@ return [
     'upload_file_status_failed' => ':file_name failed to upload',
     'upload_file_status_progress' => ':current of :total files completed',
     'upload_file_status_success' => ':file_name uploaded successfully',
+    'upload_no_file' => 'Please select a photo file to upload.',
     'upload_single_file_heading' => 'Upload photos individually',
     'upload_single_file_text' => 'You can use the form below to upload individual files. To upload multiple files at once, hold down CTRL in the file browser.',
     'upload_single_file_text2' => 'Your web server is configured to allow files up to :file_size. If you browser does not support HTML 5 (most modern browsers do), the combined size of all selected files must be less than :max_upload_size.',

resources/lang/en/gallery.php

@@ -34,6 +34,7 @@ return [
     'other_albums_heading' => 'More Albums in :album_name',
     'photos' => 'photo|photos',
     'previous_button' => '« Previous Photo',
+    'show_more_albums' => '... and :count other|... and :count others',
     'show_more_labels' => '... and :count other|... and :count others',
     'show_raw_exif_data' => 'Show all EXIF data',
     'shutter_speed' => 'Shutter speed:',

resources/lang/en/validation.php

@@ -113,6 +113,7 @@ return [
     'attributes' => [],
 
     // Added by Andy H. for custom validators
+    'album_path_unique' => 'An album with the same name already exists.',
     'dir_empty' => 'The path must be an empty folder.',
     'is_dir' => 'The folder must be a valid directory.',
     'is_writeable' => 'Unable to write to this folder - please check permissions.',

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

@@ -27,9 +27,9 @@
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">@lang('admin.about.links_header')</a>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item" href="https://showmy.photos" target="_blank">@lang('admin.about.website_link')</a>
-                            <a class="dropdown-item" href="https://www.andyheathershaw.uk/software/blue-twilight-php-photo-gallery/manual/" target="_blank">@lang('admin.about.user_guide_link')</a>
-                            <a class="dropdown-item" href="https://github.com/pandy06269/blue-twilight" target="_blank">@lang('admin.about.github_link')</a>
+                            <a class="dropdown-item" href="https://andysh.uk/software/blue-twilight-php-photo-gallery/" target="_blank">@lang('admin.about.website_link')</a>
+                            <a class="dropdown-item" href="https://andysh.uk/software/blue-twilight-php-photo-gallery/manual/" target="_blank">@lang('admin.about.user_guide_link')</a>
+                            <a class="dropdown-item" href="https://apps.andysh.uk/aheathershaw/blue-twilight" target="_blank">@lang('admin.about.project_website_link')</a>
                         </div>
                     </li>
                 </ul>

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

@@ -65,7 +65,7 @@
                         <p>Your analysis has completed.</p>
 
                         <div v-if="numberFailed > 0">
-                            <p class="text-danger">@lang('admin.analyse_photos_failed')</p>
+                            <p class="text-danger">@lang('admin.analyse_photos_failed_metadata')</p>
                             <ul class="text-danger" v-for="image in imagesFailed">
                                 <li><span v-text="image.name"></span>: <span v-text="image.reason"></span></li>
                             </ul>

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

@@ -63,11 +63,10 @@
                         @include(Theme::viewName('partials.admin_storages_rackspace_options'))
                     </div>
 
-                    <label class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" name="is_default"@if (old('is_default')) checked="checked"@endif>
-                        <span class="custom-control-indicator"></span>
-                        <span class="custom-control-description">@lang('forms.default_storage_label')</span>
-                    </label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="is-default" name="is_default"@if (old('is_default')) checked="checked"@endif>
+                        <label class="form-check-label" for="is-default">@lang('forms.default_storage_label')</label>
+                    </div>
 
                     <div class="text-right">
                         <a href="{{ route('storage.index') }}" class="btn btn-link">@lang('forms.cancel_action')</a>

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

@@ -75,12 +75,9 @@
                         </div>
                     </div>
 
-                    <div>
-                        <label class="custom-control custom-checkbox">
-                            <input type="checkbox" class="custom-control-input" name="is_admin" @if (old('is_admin'))checked="checked"@endif>
-                            <span class="custom-control-indicator"></span>
-                            <span class="custom-control-description">@lang('forms.admin_user_label')</span>
-                        </label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="is_admin" name="is_admin" @if (old('is_admin'))checked="checked"@endif>
+                        <label class="form-check-label" for="is_admin">@lang('forms.admin_user_label')</label>
                     </div>
 
                     <div class="text-right">

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

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
     <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
     <li class="breadcrumb-item"><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
-    <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>
+    @include(Theme::viewName('partials.admin_album_breadcrumb'), ['show_current_link' => true])
     <li  class="breadcrumb-item active">@lang('navigation.breadcrumb.delete_album')</li>
 @endsection
 

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

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
     <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
     <li class="breadcrumb-item"><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
-    <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>
+    @include(Theme::viewName('partials.admin_album_breadcrumb'), ['show_current_link' => true])
     <li class="breadcrumb-item active">@lang('navigation.breadcrumb.edit_album')</li>
 @endsection
 

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

@@ -31,20 +31,14 @@
                         @endif
                     </div>
 
-                    <div>
-                        <label class="custom-control custom-checkbox">
-                            <input type="checkbox" class="custom-control-input" name="is_default"@if (old('is_default', $storage->is_default)) checked="checked"@endif>
-                            <span class="custom-control-indicator"></span>
-                            <span class="custom-control-description">@lang('forms.default_storage_label')</span>
-                        </label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="is-default" name="is_default"@if (old('is_default', $storage->is_default)) checked="checked"@endif>
+                        <label class="form-check-label" for="is-default">@lang('forms.default_storage_label')</label>
                     </div>
 
-                    <div>
-                        <label class="custom-control custom-checkbox">
-                            <input type="checkbox" class="custom-control-input" name="is_active"@if (old('is_active', $storage->is_active)) checked="checked"@endif>
-                            <span class="custom-control-indicator"></span>
-                            <span class="custom-control-description">@lang('forms.storage_active_label')</span>
-                        </label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="is-active" name="is_active"@if (old('is_active', $storage->is_active)) checked="checked"@endif>
+                        <label class="form-check-label" for="is-active">@lang('forms.storage_active_label')</label>
                     </div>
 
                     @if ($storage->source == 'LocalFilesystemSource')

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

@@ -87,21 +87,15 @@
                                     </div>
                                 </div>
 
-                                <div>
-                                    <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" name="is_admin"@if (old('is_admin', $user->is_admin)) checked="checked"@endif>
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description">@lang('forms.admin_user_label')</span>
-                                    </label>
+                                <div class="form-check">
+                                    <input type="checkbox" class="form-check-input" id="is-admin" name="is_admin"@if (old('is_admin', $user->is_admin)) checked="checked"@endif>
+                                    <label class="form-check-label" for="is-admin">@lang('forms.admin_user_label')</label>
                                 </div>
 
                                 @if (!$user->is_activated)
-                                    <div>
-                                        <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" name="is_activated"@if (old('is_activated', $user->is_activated)) checked="checked"@endif>
-                                            <span class="custom-control-indicator"></span>
-                                            <span class="custom-control-description">@lang('forms.activate_user_label')</span>
-                                        </label>
+                                    <div class="form-check">
+                                        <input type="checkbox" class="form-check-input" id="is-activated" name="is_activated"@if (old('is_activated', $user->is_activated)) checked="checked"@endif>
+                                        <label class="form-check-label" for="is-activated">@lang('forms.activate_user_label')</label>
                                     </div>
                                 @endif
                             </div>
@@ -112,12 +106,9 @@
                                     <p style="margin-bottom: 20px;">@lang('admin.user_groups_list_select', ['name' => $user->name])</p>
 
                                     @foreach ($groups as $group)
-                                        <div>
-                                            <label class="custom-control custom-checkbox">
-                                                <input type="checkbox" class="custom-control-input" name="user_group_id[]" value="{{ $group->id }}" @if (in_array($group->id, $users_groups)) checked="checked"@endif>
-                                                <span class="custom-control-indicator"></span>
-                                                <span class="custom-control-description">{{ $group->name }}</span>
-                                            </label>
+                                        <div class="form-check">
+                                            <input type="checkbox" class="form-check-input" id="user-group-{{ $group->id }}" name="user_group_id[]" value="{{ $group->id }}" @if (in_array($group->id, $users_groups)) checked="checked"@endif>
+                                            <label class="form-check-label" for="user-group-{{ $group->id }}">{{ $group->name }}</label>
                                         </div>
                                     @endforeach
                                 @else

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

@@ -16,18 +16,18 @@
                     <i class="fa fa-fw fa-info"></i> @lang('admin.metadata_upgrade.intro')
                 </div>
 
-                <p>@lang('admin.metadata_upgrade.intro_2')</p>
-                <p class="mb-4">@lang('admin.metadata_upgrade.intro_3')</p>
-
                 @if (count($albums) == 0)
-                    <div class="text-center">
-                        <h4 class="text-danger"><b>@lang('admin.no_albums_title')</b></h4>
-                        <p>@lang('admin.no_albums_text')</p>
+                    <div class="text-center mt-5">
+                        <h4 class="text-danger"><b>@lang('admin.metadata_no_albums_title')</b></h4>
+                        <p>@lang('admin.metadata_no_albums_text')</p>
                         <p style="margin-top: 40px;">
-                            <a href="{{ route('albums.create') }}" class="btn btn-lg btn-success"><i class="fa fa-fw fa-plus"></i> @lang('admin.create_album')</a>
+                            <a href="{{ route('albums.index') }}" class="btn btn-lg btn-success"><i class="fa fa-fw fa-plus"></i> @lang('admin.list_albums')</a>
                         </p>
                     </div>
                 @else
+                    <p>@lang('admin.metadata_upgrade.intro_2')</p>
+                    <p class="mb-4">@lang('admin.metadata_upgrade.intro_3')</p>
+
                     <table class="table table-hover table-striped">
                         <tbody>
                             @foreach ($albums as $album)

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

@@ -77,6 +77,29 @@
                                         </div>
                                     </div>
                                 </div>
+                                <hr/>
+
+                                <fieldset>
+                                    <legend>@lang('admin.settings.albums_menu_heading')</legend>
+
+                                    <div class="form-check mb-3">
+                                        <input type="checkbox" class="form-check-input" id="albums-menu-parents-only" name="albums_menu_parents_only" @if (old('albums_menu_parents_only', UserConfig::get('albums_menu_parents_only')))checked="checked"@endif>
+                                        <label class="form-check-label" for="albums-menu-parents-only">
+                                            <strong>@lang('admin.settings.albums_menu_parents_only')</strong>
+                                        </label>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="form-control-label" for="albums-menu-number-items">@lang('admin.settings.albums_menu_number_items')</label>
+                                        <input type="number" class="form-control{{ $errors->has('albums_menu_number_items') ? ' is-invalid' : '' }}" id="albums-menu-number-items" name="albums_menu_number_items" value="{{ old('albums_menu_number_items', $config['albums_menu_number_items']) }}" style="max-width: 100px;">
+
+                                        @if ($errors->has('albums_menu_number_items'))
+                                            <div class="invalid-feedback">
+                                                <strong>{{ $errors->first('albums_menu_number_items') }}</strong>
+                                            </div>
+                                        @endif
+                                    </div>
+                                </fieldset>
 
                                 <hr/>
                                 <fieldset>
@@ -84,11 +107,10 @@
                                     <p>To help spread the word about Blue Twilight, I'd really appreciate it if you left the &quot;Powered by&quot; notice in your gallery's footer.</p>
                                     <p>If you do want to remove it, however, I understand - just check the box below.</p>
 
-                                    <div class="form-check" style="margin-top: 20px;">
-                                        <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" name="remove_copyright" @if (old('remove_copyright', UserConfig::get('remove_copyright')))checked="checked"@endif>
-                                            <span class="custom-control-indicator"></span>
-                                            <span class="custom-control-description"><strong>Remove &quot;Powered by&quot; notice from the public gallery</strong></span>
+                                    <div class="form-check mt-2">
+                                        <input type="checkbox" class="form-check-input" id="remove-copyright" name="remove_copyright" @if (old('remove_copyright', UserConfig::get('remove_copyright')))checked="checked"@endif>
+                                        <label class="form-check-label" for="remove-copyright">
+                                            <strong>Remove &quot;Powered by&quot; notice from the public gallery</strong>
                                         </label>
                                     </div>
                                 </fieldset>
@@ -166,11 +188,10 @@
                                         @endif
                                     </div>
 
-                                    <div>
-                                        <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif>
-                                            <span class="custom-control-indicator"></span>
-                                            <span class="custom-control-description"><strong>Requires encrypted connection</strong></span>
+                                    <div class="form-check">
+                                        <input type="checkbox" class="form-check-input" id="smtp-encryption" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif>
+                                        <label class="form-check-label" for="smtp-encryption">
+                                            <strong>Requires encrypted connection</strong>
                                         </label>
                                     </div>
 
@@ -193,30 +214,27 @@
 
                             {{-- Security --}}
                             <div role="tabpanel" class="tab-pane" id="security-tab">
-                                <div>
-                                    <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" name="allow_self_registration" @if (old('allow_self_registration', UserConfig::get('allow_self_registration')))checked="checked"@endif>
-                                        <span class="custom-control-indicator"></span>
+                                <div class="form-check">
+                                    <input type="checkbox" class="form-check-input" id="allow-self-registration" name="allow_self_registration" @if (old('allow_self_registration', UserConfig::get('allow_self_registration')))checked="checked"@endif>
+                                    <label class="form-check-label" for="allow-self-registration">
                                         <span class="custom-control-description"><strong>@lang('admin.settings.security_allow_self_registration')</strong><br/>
                                             @lang('admin.settings.security_allow_self_registration_description')</span>
                                     </label>
                                 </div>
 
-                                <div style="margin-top: 20px;">
-                                    <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" name="require_email_verification" @if (old('require_email_verification', UserConfig::get('require_email_verification')))checked="checked"@endif>
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description"><strong>Require e-mail verification for self-registered accounts</strong><br/>
-                                        <span class="text-danger">It is strongly recommended to enable this option.</span></span>
+                                <div class="form-check mt-3">
+                                    <input type="checkbox" class="form-check-input" id="require-email-verification" name="require_email_verification" @if (old('require_email_verification', UserConfig::get('require_email_verification')))checked="checked"@endif>
+                                    <label class="form-check-label" for="require-email-verification">
+                                        <strong>Require e-mail verification for self-registered accounts</strong><br/>
+                                        <span class="text-danger">It is strongly recommended to enable this option.</span>
                                     </label>
                                 </div>
 
-                                <div style="margin-top: 20px;">
-                                    <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" name="recaptcha_enabled_registration" @if (old('recaptcha_enabled_registration', UserConfig::get('recaptcha_enabled_registration')))checked="checked"@endif>
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description"><strong>Enable <a href="https://www.google.com/recaptcha" target="_blank">reCAPTCHA</a> for self-registrations</strong><br/>
-                                        <span class="text-danger">It is strongly recommended to enable this option.</span></span>
+                                <div class="form-check mt-3">
+                                    <input type="checkbox" class="form-check-input" id="recaptcha-enabled-registration" name="recaptcha_enabled_registration" @if (old('recaptcha_enabled_registration', UserConfig::get('recaptcha_enabled_registration')))checked="checked"@endif>
+                                    <label class="form-check-label" for="recaptcha-enabled-registration">
+                                        <strong>Enable <a href="https://www.google.com/recaptcha" target="_blank">reCAPTCHA</a> for self-registrations</strong><br/>
+                                        <span class="text-danger">It is strongly recommended to enable this option.</span>
                                     </label>
                                 </div>
 
@@ -249,19 +267,17 @@
                                 <fieldset style="margin-top: 20px;">
                                     <legend>@lang('admin.settings_image_protection')</legend>
 
-                                    <div>
-                                        <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" name="restrict_original_download" @if (old('restrict_original_download', UserConfig::get('restrict_original_download')))checked="checked"@endif>
-                                            <span class="custom-control-indicator"></span>
-                                            <span class="custom-control-description"><strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
-                                                @lang('forms.settings_restrict_originals_download_help')</span>
+                                    <div class="form-check">
+                                        <input type="checkbox" class="form-check-input" id="restrict-original-download" name="restrict_original_download" @if (old('restrict_original_download', UserConfig::get('restrict_original_download')))checked="checked"@endif>
+                                        <label class="form-check-label" for="restrict-original-download">
+                                            <strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
+                                                @lang('forms.settings_restrict_originals_download_help')
                                         </label>
                                     </div>
 
-                                    <div style="margin-top: 20px;">
-                                        <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" name="hotlink_protection" @if (old('hotlink_protection', UserConfig::get('hotlink_protection')))checked="checked"@endif>
-                                            <span class="custom-control-indicator"></span>
+                                    <div class="form-check mt-3">
+                                        <input type="checkbox" class="form-check-input" id="hotlink-protection" name="hotlink_protection" @if (old('hotlink_protection', UserConfig::get('hotlink_protection')))checked="checked"@endif>
+                                        <label class="form-check-label" for="hotlink-protection">
                                             <span class="custom-control-description"><strong>@lang('forms.settings_hotlink_protection')</strong><br/>
                                                 @lang('forms.settings_hotlink_protection_help')</span>
                                         </label>
@@ -280,12 +296,11 @@
                                     </p>
                                 </div>
 
-                                <div class="mt-4">
-                                    <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" name="enable_visitor_hits" @if (old('enable_visitor_hits', UserConfig::get('enable_visitor_hits')))checked="checked"@endif>
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description"><strong>@lang('admin.settings.analytics_enable_visitor_hits')</strong><br/>
-                                            @lang('admin.settings.analytics_enable_visitor_hits_description')</span>
+                                <div class="form-check mt-4">
+                                    <input type="checkbox" class="form-check-input" id="enable-visitor-hits" name="enable_visitor_hits" @if (old('enable_visitor_hits', UserConfig::get('enable_visitor_hits')))checked="checked"@endif>
+                                    <label class="form-check-label" for="enable-visitor-hits">
+                                        <strong>@lang('admin.settings.analytics_enable_visitor_hits')</strong><br/>
+                                            @lang('admin.settings.analytics_enable_visitor_hits_description')
                                     </label>
                                 </div>
 

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

@@ -5,7 +5,13 @@
     <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
     <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
     <li class="breadcrumb-item"><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
-    <li class="breadcrumb-item active">{{ $album->name }}</li>
+    @foreach ($album->albumParentTree() as $parentAlbum)
+        @if ($parentAlbum->id == $album->id)
+            <li class="breadcrumb-item active">{{ $album->name }}</li>
+        @else
+            <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $parentAlbum->id]) }}">{{ $parentAlbum->name }}</a></li>
+        @endif
+    @endforeach
 @endsection
 
 @section('content')
@@ -85,6 +91,7 @@
     language.select_all_choice_visible_action = '{!! addslashes(trans('admin.select_all_choice.visible_action')) !!}';
     language.image_failed = '{!! addslashes(trans('admin.upload_file_status_failed')) !!}';
     language.image_uploaded = '{!! addslashes(trans('admin.upload_file_status_success')) !!}';
+    language.no_file_selected = '{!! addslashes(trans('admin.upload_no_file')) !!}';
     language.replace_image_message = '{!! addslashes(trans('admin.replace_image_message')) !!}';
     language.replace_image_title = '{!! addslashes(trans('admin.replace_image_title')) !!}';
     language.upload_status = '{!! addslashes(trans('admin.upload_file_status_progress')) !!}';
@@ -105,7 +112,7 @@
     @endforeach
 
     // Populate the list of albums in the view model
-    @foreach ($albums as $album)
+    @foreach ($g_albums as $album)
         @if(Gate::check('edit', $album) && Gate::check('upload-photos', $album))
             editViewModel.data.albums.push({
                 'id': '{{ $album->id }}',
@@ -214,6 +221,9 @@
                 $('#upload-progress-modal').modal('hide');
             }
         });
+        appUpload.$watch('statusMessages', function($value) {
+            $('#upload-progress-modal').modal('handleUpdate');
+        })
     });
 </script>
 @endpush

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

@@ -21,11 +21,10 @@
                             <p>@lang('admin.statistics_enable_public_intro')</p>
                             <form method="post" action="{{ route('admin.statistics.save') }}">
                                 {{ csrf_field() }}
-                                <label class="custom-control custom-checkbox">
-                                    <input type="checkbox" class="custom-control-input" name="enable_public_statistics" @if (UserConfig::get('public_statistics')) checked="checked"@endif/>
-                                    <span class="custom-control-indicator"></span>
-                                    <span class="custom-control-description">@lang('admin.statistics_enable_public_checkbox')</span>
-                                </label><br/>
+                                <div class="form-check">
+                                    <input type="checkbox" class="form-check-input" id="enable-public-statistics" name="enable_public_statistics" @if (UserConfig::get('public_statistics')) checked="checked"@endif/>
+                                    <label class="form-check-label" for="enable-public-statistics">@lang('admin.statistics_enable_public_checkbox')</label>
+                                </div><br/>
                                 <button class="btn btn-success"><i class="fa fa-floppy-o"></i> @lang('forms.save_action')</button>
                             </form>
                         </div>

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

@@ -0,0 +1,11 @@
+@foreach ($album->albumParentTree() as $parentAlbum)
+    @if ($parentAlbum->id == $album->id)
+        @if (!empty($show_current_link) && $show_current_link)
+            <li class="breadcrumb-item active"><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>
+        @else
+            <li class="breadcrumb-item active">{{ $album->name }}</li>
+        @endif
+    @else
+        <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $parentAlbum->id]) }}">{{ $parentAlbum->name }}</a></li>
+    @endif
+@endforeach

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

@@ -7,25 +7,27 @@
     @else
         <h4>@lang('admin.album_cameras_heading')</h4>
         <p>@lang('admin.album_cameras_text')</p>
-        <table class="table table-striped table-responsive">
-            <thead>
-                <tr>
-                    <th>@lang('admin.album_camera_make')</th>
-                    <th>@lang('admin.album_camera_model')</th>
-                    <th>@lang('admin.album_camera_software')</th>
-                    <th>@lang('admin.album_camera_photo_count')</th>
-                </tr>
-            </thead>
-            <tbody>
-            @foreach ($cameras as $camera)
-                <tr>
-                    <td>{{ $camera->camera_make }}</td>
-                    <td>{{ $camera->camera_model }}</td>
-                    <td>{{ $camera->camera_software }}</td>
-                    <td>{{ $camera->photo_count }}</td>
-                </tr>
-            @endforeach
-            </tbody>
-        </table>
+        <div class="table-responsive">
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th>@lang('admin.album_camera_make')</th>
+                        <th>@lang('admin.album_camera_model')</th>
+                        <th>@lang('admin.album_camera_software')</th>
+                        <th>@lang('admin.album_camera_photo_count')</th>
+                    </tr>
+                </thead>
+                <tbody>
+                @foreach ($cameras as $camera)
+                    <tr>
+                        <td>{{ $camera->camera_make }}</td>
+                        <td>{{ $camera->camera_model }}</td>
+                        <td>{{ $camera->camera_software }}</td>
+                        <td>{{ $camera->photo_count }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
     @endif
 </div>

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

@@ -82,20 +82,23 @@
                         <p v-text="currentStatus"></p>
                     </div>
 
-                    <div v-if="statusMessages.length > 0">
+                    <div v-if="statusMessages.length > 0"style="max-height: 300px; overflow: scroll;">
                         <p v-if="!isUploadInProgress" class="text-danger" style="font-weight: bold">
                             <span v-text="imagesFailed"></span> @lang('admin.upload_file_number_failed')
                         </p>
-                        <p v-if="imagesUploaded > 0">
+                        <p v-if="imagesUploaded > 0" class="text-right">
                             @lang('admin.upload_file_failed_continue')<br /><br/>
-                            <a href="{{ route('albums.analyse', ['id' => $album->id, 'queue_token' => $queue_token]) }}" class="btn btn-primary">@lang('forms.continue_action')</a>
                         </p>
 
                         <ul v-for="message in statusMessages">
-                            <li v-bind:class="{ message: message.message_class }" v-text="message.message_text"></li>
+                            <li v-bind:class="message.message_class" v-text="message.message_text"></li>
                         </ul>
                     </div>
                 </div>
+                <div class="modal-footer" v-if="!isUploadInProgress">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" v-if="imagesUploaded === 0">@lang('forms.close_action')</button>
+                    <a href="{{ route('albums.analyse', ['id' => $album->id, 'queue_token' => $queue_token]) }}" class="btn btn-primary" v-if="imagesUploaded > 0">@lang('forms.continue_action')</a>
+                </div>
             </div>
         </div>
     </div>

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

@@ -5,12 +5,12 @@
             <p style="font-size: smaller;">
                 <b>
                     @lang('global.powered_by', [
-                        'link_start' => '<a href="https://www.andyheathershaw.uk/software/blue-twilight" target="_blank">',
+                        'link_start' => '<a href="https://andysh.uk/software/blue-twilight-php-photo-gallery/" target="_blank">',
                         'link_end' => '</a>',
                     ])
                 </b><br/>
                 @lang('global.copyright', [
-                    'link_start' => '<a href="https://www.andyheathershaw.uk/" target="_blank">',
+                    'link_start' => '<a href="https://andysh.uk/" target="_blank">',
                     'link_end' => '</a>',
                     'years' => (date('Y') == 2016 ? '2016' : '2016-' . date('Y'))
                 ])

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

@@ -5,12 +5,12 @@
             <p style="font-size: smaller;">
                 <b>
                     @lang('global.powered_by', [
-                        'link_start' => '<a href="https://www.andyheathershaw.uk/software/blue-twilight" target="_blank">',
+                        'link_start' => '<a href="https://andysh.uk/software/blue-twilight-php-photo-gallery/" target="_blank">',
                         'link_end' => '</a>',
                     ])
                 </b><br/>
                 @lang('global.copyright', [
-                    'link_start' => '<a href="https://www.andyheathershaw.uk/" target="_blank">',
+                    'link_start' => '<a href="https://andysh.uk/" target="_blank">',
                     'link_end' => '</a>',
                     'years' => (date('Y') == 2016 ? '2016' : '2016-' . date('Y'))
                 ])

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

@@ -5,10 +5,10 @@
         <label for="email" class="col-md-4 col-form-label text-md-right">@lang('forms.email_label')</label>
 
         <div class="col-md-6">
-            <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" autofocus>
+            <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" autofocus>
 
             @if ($errors->has('email'))
-                <div class="form-control-feedback">
+                <div class="invalid-feedback">
                     <strong>{{ $errors->first('email') }}</strong>
                 </div>
             @endif
@@ -19,10 +19,10 @@
         <label for="password" class="col-md-4 col-form-label text-md-right">@lang('forms.password_label')</label>
 
         <div class="col-md-6">
-            <input id="password" type="password" class="form-control" name="password">
+            <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password">
 
             @if ($errors->has('password'))
-                <div class="form-control-feedback">
+                <div class="invalid-feedback">
                     <strong>{{ $errors->first('password') }}</strong>
                 </div>
             @endif
@@ -33,8 +33,8 @@
         <div class="col-md-4"><!-- --></div>
         <div class="col-md-6">
             <div class="form-check">
-                <label class="form-check-label">
-                    <input class="form-check-input" type="checkbox" name="remember"> @lang('forms.remember_me_label')
+                <input class="form-check-input" type="checkbox" id="remember-me" name="remember">
+                <label class="form-check-label" for="remember-me">@lang('forms.remember_me_label')
                 </label>
             </div>
         </div>

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

@@ -13,7 +13,11 @@
         <p>{{ $album->description }}</p>
         <p style="margin-bottom: 0;">
             <b>{{ $album->photos_count }}</b> {{ trans_choice('admin.stats_widget.photos', $album->photos_count) }} &middot;
-            @if ($album->min_metadata_version < $current_metadata_version)
+            @if (
+                isset($album->min_metadata_version) &&
+                intval($album->min_metadata_version) > 0 &&
+                intval($album->min_metadata_version) < $current_metadata_version
+            )
                 <span class="text-danger">@lang('admin.metadata_upgrade.can_be_upgraded', ['version_from' => $album->min_metadata_version, 'version_to' => $current_metadata_version])</span>
             @else
                 <span class="text-success">@lang('admin.metadata_upgrade.is_up_to_date')</span>

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

@@ -14,15 +14,19 @@
                 </li>
             @endcan
 
-            @if (count($albums) > 0)
+            @if (count($g_albums) > 0)
                 <li class="nav-item dropdown ml-2">
                     <a class="nav-link dropdown-toggle" href="{{ url('/') }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fa fa-book"></i> @lang('navigation.navbar.albums')
                     </a>
                     <div class="dropdown-menu">
-                        @foreach ($albums as $album)
+                        @foreach ($g_albums_menu as $album)
                             <a class="dropdown-item" href="{{ $album->url() }}">{{ $album->name }}</a>
                         @endforeach
+
+                        @if ($g_more_albums > 0)
+                            <a class="dropdown-item" href="{{ route('home') }}">{{ trans_choice('gallery.show_more_albums', $g_more_albums) }}</a>
+                        @endif
                     </div>
                 </li>
             @endif
@@ -44,7 +48,7 @@
                 </li>
             @endif
 
-            @if (count($albums) > 0 && \App\User::currentOrAnonymous()->can('statistics.public-access'))
+            @if (count($g_albums) > 0 && \App\User::currentOrAnonymous()->can('statistics.public-access'))
                 <li class="nav-item ml-2">
                     <a class="nav-link" href="{{ route('statistics.index') }}"><i class="fa fa-bar-chart"></i> @lang('navigation.navbar.statistics')</a>
                 </li>
@@ -82,4 +86,4 @@
             </ul>
         @endif
     </div>
-</nav>
+</nav>

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

@@ -1,7 +1,6 @@
-<div>
-    <label class="custom-control custom-checkbox" for="permission|{{ $key_id }}|{{ $permission->id }}">
-        <input type="checkbox" class="custom-control-input" id="permission|{{ $key_id }}|{{ $permission->id }}" name="permissions[{{ $object_id }}][]" value="{{ $permission->id }}"{{ call_user_func($callback, $callback_object, $permission) ? ' checked="checked"' : '' }}>
-        <span class="custom-control-indicator"></span>
-        <span class="custom-control-description">{{ trans(sprintf('permissions.%s.%s', $permission->section, $permission->description)) }}</span>
+<div class="form-check">
+    <input type="checkbox" class="form-check-input" id="permission|{{ $key_id }}|{{ $permission->id }}" name="permissions[{{ $object_id }}][]" value="{{ $permission->id }}"{{ call_user_func($callback, $callback_object, $permission) ? ' checked="checked"' : '' }}>
+    <label class="form-check-label" for="permission|{{ $key_id }}|{{ $permission->id }}">
+        {{ trans(sprintf('permissions.%s.%s', $permission->section, $permission->description)) }}
     </label>
 </div>