aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Andy Heathershaw 2017-09-03 07:48:30 +01:00
commit 20d6264777
41 changed files with 369 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/themes/default/theme.css vendored
View File

@ -27,3 +27,9 @@ a:focus, a:hover {
.navbar .navbar-nav > li > a:hover { .navbar .navbar-nav > li > a:hover {
color: #fff !important; color: #fff !important;
} }
.navbar-toggler
{
border-color: #b3d1ff !important;
color: #b3d1ff !important;
}

9
resources/assets/css/admin.css vendored
View File

@ -2,20 +2,11 @@
margin-bottom: 15px; margin-bottom: 15px;
} }
.admin-sidebar-card .card-block {
padding: 10px;
}
.album-expand-handle { .album-expand-handle {
cursor: pointer; cursor: pointer;
margin-top: 5px; margin-top: 5px;
} }
.card-header.card-danger {
color: #fff;
font-weight: bold;
}
.photo .loading { .photo .loading {
background-color: #ffffff; background-color: #ffffff;
display: none; display: none;

3
resources/lang/en/gallery.php
View File

@ -10,6 +10,9 @@ return [
'back_to_album' => 'Back to :name', 'back_to_album' => 'Back to :name',
'index_no_results_heading' => 'Start something amazing', 'index_no_results_heading' => 'Start something amazing',
'index_no_results_text' => 'This gallery is currently empty. If you are the owner of this gallery, you can create new albums and upload photos using the :admin_link.', 'index_no_results_text' => 'This gallery is currently empty. If you are the owner of this gallery, you can create new albums and upload photos using the :admin_link.',
'manage_album_link' => 'Manage',
'manage_album_link_2' => 'Manage Album',
'open_album_link' => 'Open Album',
'other_albums_description' => 'You may also be interested in the following albums.', 'other_albums_description' => 'You may also be interested in the following albums.',
'other_albums_heading' => 'More Albums in :album_name' 'other_albums_heading' => 'More Albums in :album_name'
]; ];

6
resources/views/themes/base/admin/create_album.blade.php
View File

@ -19,12 +19,12 @@
<form action="{{ route('albums.store') }}" method="POST"> <form action="{{ route('albums.store') }}" method="POST">
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="album-name">@lang('forms.name_label')</label> <label class="form-control-label" for="album-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="album-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="album-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif

8
resources/views/themes/base/admin/create_group.blade.php
View File

@ -19,13 +19,13 @@
<form action="{{ route('groups.store') }}" method="post"> <form action="{{ route('groups.store') }}" method="post">
{{ csrf_field() }} {{ csrf_field() }}
<div class="row"> <div class="row">
<div class="col-md-6 offset-md-3"> <div class="col-md-6 ml-md-auto mr-md-auto">
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="group-name">@lang('forms.name_label')</label> <label class="form-control-label" for="group-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="group-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="group-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif

23
resources/views/themes/base/admin/create_storage.blade.php
View File

@ -19,28 +19,28 @@
<form action="{{ route('storage.store') }}" method="post" id="storage-options"> <form action="{{ route('storage.store') }}" method="post" id="storage-options">
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="storage-name">@lang('forms.name_label')</label> <label class="form-control-label" for="storage-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="storage-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="storage-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="form-group{{ $errors->has('source') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="storage-source">@lang('forms.storage_driver_label')</label> <label class="form-control-label" for="storage-source">@lang('forms.storage_driver_label')</label>
<select id="storage-source" name="source" class="form-control" v-model="storage_driver"> <select id="storage-source" name="source" class="form-control{{ $errors->has('source') ? ' is-invalid' : '' }}" v-model="storage_driver">
@foreach ($album_sources as $key => $value) @foreach ($album_sources as $key => $value)
<option value="{{ $key }}"{{ old('source') == $key ? ' selected="selected"' : '' }}>{{ $value }}</option> <option value="{{ $key }}"{{ old('source') == $key ? ' selected="selected"' : '' }}>{{ $value }}</option>
@endforeach @endforeach
</select> </select>
@if ($errors->has('source')) @if ($errors->has('source'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('source') }}</strong> <strong>{{ $errors->first('source') }}</strong>
</div> </div>
@endif @endif
@ -63,12 +63,11 @@
@include(Theme::viewName('partials.admin_storages_rackspace_options')) @include(Theme::viewName('partials.admin_storages_rackspace_options'))
</div> </div>
<div class="form-check"> <label class="custom-control custom-checkbox">
<label class="form-check-label"> <input type="checkbox" class="custom-control-input" name="is_default"@if (old('is_default')) checked="checked"@endif>
<input class="form-check-input" type="checkbox" name="is_default"> <span class="custom-control-indicator"></span>
@lang('forms.default_storage_label') <span class="custom-control-description">@lang('forms.default_storage_label')</span>
</label> </label>
</div>
<div class="text-right"> <div class="text-right">
<a href="{{ route('storage.index') }}" class="btn btn-link">@lang('forms.cancel_action')</a> <a href="{{ route('storage.index') }}" class="btn btn-link">@lang('forms.cancel_action')</a>

33
resources/views/themes/base/admin/create_user.blade.php
View File

@ -21,12 +21,12 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-name">@lang('forms.name_label')</label> <label class="form-control-label" for="user-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="user-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="user-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif
@ -34,12 +34,12 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('email') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-email">@lang('forms.email_label')</label> <label class="form-control-label" for="user-email">@lang('forms.email_label')</label>
<input type="text" class="form-control" id="user-email" name="email" value="{{ old('email') }}"> <input type="text" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" id="user-email" name="email" value="{{ old('email') }}">
@if ($errors->has('email')) @if ($errors->has('email'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('email') }}</strong> <strong>{{ $errors->first('email') }}</strong>
</div> </div>
@endif @endif
@ -49,12 +49,12 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-password">@lang('forms.password_label')</label> <label class="form-control-label" for="user-password">@lang('forms.password_label')</label>
<input type="password" class="form-control" id="user-password" name="password" value="{{ old('password') }}"> <input type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" id="user-password" name="password" value="{{ old('password') }}">
@if ($errors->has('password')) @if ($errors->has('password'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('password') }}</strong> <strong>{{ $errors->first('password') }}</strong>
</div> </div>
@endif @endif
@ -62,12 +62,12 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-password-confirm">@lang('forms.password_confirm_label')</label> <label class="form-control-label" for="user-password-confirm">@lang('forms.password_confirm_label')</label>
<input type="password" class="form-control" id="user-password-confirm" name="password_confirmation" value="{{ old('password_confirmation') }}"> <input type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" id="user-password-confirm" name="password_confirmation" value="{{ old('password_confirmation') }}">
@if ($errors->has('password_confirmation')) @if ($errors->has('password_confirmation'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('password_confirmation') }}</strong> <strong>{{ $errors->first('password_confirmation') }}</strong>
</div> </div>
@endif @endif
@ -75,10 +75,11 @@
</div> </div>
</div> </div>
<div class="form-check"> <div>
<label class="form-check-label"> <label class="custom-control custom-checkbox">
<input class="form-check-input" type="checkbox" name="is_admin"> <input type="checkbox" class="custom-control-input" name="is_admin" @if (old('is_admin'))checked="checked"@endif>
@lang('forms.admin_user_label') <span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.admin_user_label')</span>
</label> </label>
</div> </div>

8
resources/views/themes/base/admin/delete_album.blade.php
View File

@ -12,10 +12,10 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8 offset-md-2"> <div class="col-md-8 ml-md-auto mr-md-auto">
<div class="card card-outline-danger"> <div class="card bg-danger">
<div class="card-header card-danger">@yield('title')</div> <div class="card-header text-white">@yield('title')</div>
<div class="card-block"> <div class="card-body bg-light">
<p>@lang('admin.delete_album_confirm', ['name' => $album->name])</p> <p>@lang('admin.delete_album_confirm', ['name' => $album->name])</p>
<p class="text-danger"><b>@lang('admin.delete_album_warning')</b></p> <p class="text-danger"><b>@lang('admin.delete_album_warning')</b></p>

8
resources/views/themes/base/admin/delete_group.blade.php
View File

@ -11,10 +11,10 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8 offset-md-2"> <div class="col-md-8 ml-md-auto mr-md-auto">
<div class="card card-outline-danger"> <div class="card bg-danger">
<div class="card-header card-danger">@yield('title')</div> <div class="card-header text-white">@yield('title')</div>
<div class="card-block"> <div class="card-body bg-light">
<p>@lang('admin.delete_group_confirm', ['name' => $group->name])</p> <p>@lang('admin.delete_group_confirm', ['name' => $group->name])</p>
<p class="text-danger"><b>@lang('admin.delete_group_warning')</b></p> <p class="text-danger"><b>@lang('admin.delete_group_warning')</b></p>

2
resources/views/themes/base/admin/delete_storage.blade.php
View File

@ -14,7 +14,7 @@
<div class="col-md-8 offset-md-2"> <div class="col-md-8 offset-md-2">
<div class="card card-outline-danger"> <div class="card card-outline-danger">
<div class="card-header card-danger">@yield('title')</div> <div class="card-header card-danger">@yield('title')</div>
<div class="card-block"> <div class="card-body">
<p>@lang('admin.delete_storage_confirm', ['name' => $storage->name])</p> <p>@lang('admin.delete_storage_confirm', ['name' => $storage->name])</p>
<p class="text-danger"><b>@lang('admin.delete_storage_warning')</b></p> <p class="text-danger"><b>@lang('admin.delete_storage_warning')</b></p>

8
resources/views/themes/base/admin/delete_user.blade.php
View File

@ -11,10 +11,10 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8 offset-md-2"> <div class="col-md-8 ml-md-auto mr-md-auto">
<div class="card card-outline-danger"> <div class="card bg-danger">
<div class="card-header card-danger">@yield('title')</div> <div class="card-header text-white">@yield('title')</div>
<div class="card-block"> <div class="card-body bg-light">
<p>@lang('admin.delete_user_confirm', ['name' => $user->name])</p> <p>@lang('admin.delete_user_confirm', ['name' => $user->name])</p>
<p class="text-danger"><b>@lang('admin.delete_user_warning')</b></p> <p class="text-danger"><b>@lang('admin.delete_user_warning')</b></p>

12
resources/views/themes/base/admin/edit_album.blade.php
View File

@ -22,23 +22,23 @@
{{ csrf_field() }} {{ csrf_field() }}
{{ method_field('PUT') }} {{ method_field('PUT') }}
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label for="album-name" class="control-label">@lang('forms.name_label')</label> <label for="album-name" class="control-label">@lang('forms.name_label')</label>
<input type="text" id="album-name" class="form-control" name="name" value="{{ old('name') }}" /> <input type="text" id="album-name" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" />
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('description') ? ' has-danger' : '' }}"> <div class="form-group">
<label for="album-description" class="control-label" name="name">@lang('forms.description_label')</label> <label for="album-description" class="control-label" name="name">@lang('forms.description_label')</label>
<textarea class="form-control" id="album-description" rows="5" name="description">{{ old('description') }}</textarea> <textarea class="form-control{{ $errors->has('description') ? ' is-invalid' : '' }}" id="album-description" rows="5" name="description">{{ old('description') }}</textarea>
@if ($errors->has('description')) @if ($errors->has('description'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('description') }}</strong> <strong>{{ $errors->first('description') }}</strong>
</div> </div>
@endif @endif

8
resources/views/themes/base/admin/edit_group.blade.php
View File

@ -32,13 +32,13 @@
{{-- Details --}} {{-- Details --}}
<div role="tabpanel" class="tab-pane active" id="details-tab"> <div role="tabpanel" class="tab-pane active" id="details-tab">
<div class="row"> <div class="row">
<div class="col-md-6 offset-md-3"> <div class="col-md-6 ml-md-auto mr-md-auto">
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="group-name">@lang('forms.name_label')</label> <label class="form-control-label" for="group-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="group-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="group-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif

24
resources/views/themes/base/admin/edit_storage.blade.php
View File

@ -20,28 +20,30 @@
{{ method_field('PUT') }} {{ method_field('PUT') }}
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="storage-name">@lang('forms.name_label')</label> <label class="form-control-label" for="storage-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="storage-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="storage-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="checkbox"> <div>
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="is_default"@if ($storage->is_default) checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="is_default"@if (old('is_default', $storage->is_default)) checked="checked"@endif>
@lang('forms.default_storage_label') <span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.default_storage_label')</span>
</label> </label>
</div> </div>
<div class="checkbox"> <div>
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="is_active"@if ($storage->is_active) checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="is_active"@if (old('is_active', $storage->is_active)) checked="checked"@endif>
@lang('forms.storage_active_label') <span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.storage_active_label')</span>
</label> </label>
</div> </div>

51
resources/views/themes/base/admin/edit_user.blade.php
View File

@ -33,12 +33,12 @@
<div role="tabpanel" class="tab-pane active" id="details-tab"> <div role="tabpanel" class="tab-pane active" id="details-tab">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-name">@lang('forms.name_label')</label> <label class="form-control-label" for="user-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="user-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="user-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif
@ -46,12 +46,12 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('email') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-email">@lang('forms.email_label')</label> <label class="form-control-label" for="user-email">@lang('forms.email_label')</label>
<input type="text" class="form-control" id="user-email" name="email" value="{{ old('email') }}"> <input type="text" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" id="user-email" name="email" value="{{ old('email') }}">
@if ($errors->has('email')) @if ($errors->has('email'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('email') }}</strong> <strong>{{ $errors->first('email') }}</strong>
</div> </div>
@endif @endif
@ -61,12 +61,12 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-password">@lang('forms.password_label')</label> <label class="form-control-label" for="user-password">@lang('forms.password_label')</label>
<input type="password" class="form-control" id="user-password" name="password" value="{{ old('password') }}"> <input type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" id="user-password" name="password" value="{{ old('password') }}">
@if ($errors->has('password')) @if ($errors->has('password'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('password') }}</strong> <strong>{{ $errors->first('password') }}</strong>
</div> </div>
@endif @endif
@ -74,12 +74,12 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="user-password-confirm">@lang('forms.password_confirm_label')</label> <label class="form-control-label" for="user-password-confirm">@lang('forms.password_confirm_label')</label>
<input type="password" class="form-control" id="user-password-confirm" name="password_confirmation" value="{{ old('password_confirmation') }}"> <input type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" id="user-password-confirm" name="password_confirmation" value="{{ old('password_confirmation') }}">
@if ($errors->has('password_confirmation')) @if ($errors->has('password_confirmation'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('password_confirmation') }}</strong> <strong>{{ $errors->first('password_confirmation') }}</strong>
</div> </div>
@endif @endif
@ -87,18 +87,20 @@
</div> </div>
</div> </div>
<div class="form-check"> <div>
<label class="form-check-label"> <label class="custom-control custom-checkbox">
<input class="form-check-input" type="checkbox" name="is_admin"@if ($user->is_admin) checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="is_admin"@if (old('is_admin', $user->is_admin)) checked="checked"@endif>
@lang('forms.admin_user_label') <span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.admin_user_label')</span>
</label> </label>
</div> </div>
@if (!$user->is_activated) @if (!$user->is_activated)
<div class="form-check"> <div>
<label class="form-check-label"> <label class="custom-control custom-checkbox">
<input class="form-check-input" type="checkbox" name="is_activated"> <input type="checkbox" class="custom-control-input" name="is_activated"@if (old('is_activated', $user->is_activated)) checked="checked"@endif>
<strong>@lang('forms.activate_user_label')</strong> <span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.activate_user_label')</span>
</label> </label>
</div> </div>
@endif @endif
@ -110,10 +112,11 @@
<p style="margin-bottom: 20px;">@lang('admin.user_groups_list_select', ['name' => $user->name])</p> <p style="margin-bottom: 20px;">@lang('admin.user_groups_list_select', ['name' => $user->name])</p>
@foreach ($groups as $group) @foreach ($groups as $group)
<div class="form-check"> <div>
<label class="form-check-label"> <label class="custom-control custom-checkbox">
<input class="form-check-input" type="checkbox" name="user_group_id[]" value="{{ $group->id }}"@if (in_array($group->id, $users_groups)) checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="user_group_id[]" value="{{ $group->id }}" @if (in_array($group->id, $users_groups)) checked="checked"@endif>
{{ $group->name }} <span class="custom-control-indicator"></span>
<span class="custom-control-description">{{ $group->name }}</span>
</label> </label>
</div> </div>
@endforeach @endforeach

2
resources/views/themes/base/admin/list_storage.blade.php
View File

@ -66,7 +66,7 @@
<div class="row" style="margin-top: 15px;"> <div class="row" style="margin-top: 15px;">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="card card-outline-info"> <div class="card card-outline-info">
<div class="card-block"> <div class="card-body">
<h4 class="card-title">@lang('admin.legend')</h4> <h4 class="card-title">@lang('admin.legend')</h4>
<p class="card-text"> <p class="card-text">
<i class="fa fa-fw fa-check text-success" style="font-size: 1.3em;"></i> @lang('admin.default_storage_legend')<br/> <i class="fa fa-fw fa-check text-success" style="font-size: 1.3em;"></i> @lang('admin.default_storage_legend')<br/>

144
resources/views/themes/base/admin/settings.blade.php
View File

@ -29,12 +29,12 @@
<div class="tab-content"> <div class="tab-content">
{{-- General --}} {{-- General --}}
<div role="tabpanel" class="tab-pane active" id="general-tab"> <div role="tabpanel" class="tab-pane active" id="general-tab">
<div class="form-group{{ $errors->has('app_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="gallery-name">Gallery name:</label> <label class="form-control-label" for="gallery-name">Gallery name:</label>
<input type="text" class="form-control" id="gallery-name" name="app_name" value="{{ old('app_name', $config['app_name']) }}"> <input type="text" class="form-control{{ $errors->has('app_name') ? ' is-invalid' : '' }}" id="gallery-name" name="app_name" value="{{ old('app_name', $config['app_name']) }}">
@if ($errors->has('app_name')) @if ($errors->has('app_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('app_name') }}</strong> <strong>{{ $errors->first('app_name') }}</strong>
</div> </div>
@endif @endif
@ -51,7 +51,7 @@
</select> </select>
@if ($errors->has('date_format')) @if ($errors->has('date_format'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('date_format') }}</strong> <strong>{{ $errors->first('date_format') }}</strong>
</div> </div>
@endif @endif
@ -70,7 +70,7 @@
</select> </select>
@if ($errors->has('theme')) @if ($errors->has('theme'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('theme') }}</strong> <strong>{{ $errors->first('theme') }}</strong>
</div> </div>
@endif @endif
@ -82,12 +82,13 @@
<fieldset> <fieldset>
<legend>&quot;Powered by&quot; footer link</legend> <legend>&quot;Powered by&quot; footer link</legend>
<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>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>This is not compulsory, however, and you may remove it by checking the box below.</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;"> <div class="form-check" style="margin-top: 20px;">
<label class="form-check-label"> <label class="custom-control custom-checkbox">
<input class="form-check-input" type="checkbox" name="remove_copyright" @if (old('remove_copyright', UserConfig::get('remove_copyright')))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="remove_copyright" @if (old('remove_copyright', UserConfig::get('remove_copyright')))checked="checked"@endif>
<strong>Remove &quot;Powered by&quot; notice from the public gallery</strong> <span class="custom-control-indicator"></span>
<span class="custom-control-description"><strong>Remove &quot;Powered by&quot; notice from the public gallery</strong></span>
</label> </label>
</div> </div>
</fieldset> </fieldset>
@ -95,23 +96,23 @@
{{-- E-mail --}} {{-- E-mail --}}
<div role="tabpanel" class="tab-pane" id="email-tab"> <div role="tabpanel" class="tab-pane" id="email-tab">
<div class="form-group{{ $errors->has('sender_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="email-sender-name">Sender name:</label> <label class="form-control-label" for="email-sender-name">Sender name:</label>
<input type="text" class="form-control" id="email-sender-name" name="sender_name" value="{{ old('sender_name', $config['sender_name']) }}"> <input type="text" class="form-control{{ $errors->has('sender_name') ? ' is-invalid' : '' }}" id="email-sender-name" name="sender_name" value="{{ old('sender_name', $config['sender_name']) }}">
@if ($errors->has('sender_name')) @if ($errors->has('sender_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('sender_name') }}</strong> <strong>{{ $errors->first('sender_name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('sender_address') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="email-sender-address">Sender address:</label> <label class="form-control-label" for="email-sender-address">Sender address:</label>
<input type="text" class="form-control" id="email-sender-address" name="sender_address" value="{{ old('sender_address', $config['sender_address']) }}"> <input type="text" class="form-control{{ $errors->has('sender_address') ? ' is-invalid' : '' }}" id="email-sender-address" name="sender_address" value="{{ old('sender_address', $config['sender_address']) }}">
@if ($errors->has('sender_address')) @if ($errors->has('sender_address'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('sender_address') }}</strong> <strong>{{ $errors->first('sender_address') }}</strong>
</div> </div>
@endif @endif
@ -121,54 +122,55 @@
<legend>SMTP Server</legend> <legend>SMTP Server</legend>
<p style="margin-bottom: 15px;">Configure your SMTP server using the settings below. If your server does not require authentication, leave the Username and Password fields empty.</p> <p style="margin-bottom: 15px;">Configure your SMTP server using the settings below. If your server does not require authentication, leave the Username and Password fields empty.</p>
<div class="form-group{{ $errors->has('smtp_server') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="email-smtp-server">Hostname:</label> <label class="form-control-label" for="email-smtp-server">Hostname:</label>
<input type="text" class="form-control" id="email-smtp-server" name="smtp_server" value="{{ old('smtp_server', $config['smtp_server']) }}"> <input type="text" class="form-control{{ $errors->has('smtp_server') ? ' is-invalid' : '' }}" id="email-smtp-server" name="smtp_server" value="{{ old('smtp_server', $config['smtp_server']) }}">
@if ($errors->has('smtp_server')) @if ($errors->has('smtp_server'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('smtp_server') }}</strong> <strong>{{ $errors->first('smtp_server') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('smtp_port') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="email-smtp-port">Port:</label> <label class="form-control-label" for="email-smtp-port">Port:</label>
<input type="text" class="form-control" id="email-smtp-port" name="smtp_port" value="{{ old('smtp_port', $config['smtp_port']) }}"> <input type="text" class="form-control{{ $errors->has('smtp_port') ? ' is-invalid' : '' }}" id="email-smtp-port" name="smtp_port" value="{{ old('smtp_port', $config['smtp_port']) }}">
@if ($errors->has('smtp_port')) @if ($errors->has('smtp_port'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('smtp_port') }}</strong> <strong>{{ $errors->first('smtp_port') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('smtp_username') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="email-smtp-username">Username:</label> <label class="form-control-label" for="email-smtp-username">Username:</label>
<input type="text" class="form-control" id="email-smtp-username" name="smtp_username" value="{{ old('smtp_username', $config['smtp_username']) }}"> <input type="text" class="form-control{{ $errors->has('smtp_username') ? ' is-invalid' : '' }}" id="email-smtp-username" name="smtp_username" value="{{ old('smtp_username', $config['smtp_username']) }}">
@if ($errors->has('smtp_username')) @if ($errors->has('smtp_username'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('smtp_username') }}</strong> <strong>{{ $errors->first('smtp_username') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('smtp_password') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="email-smtp-password">Password:</label> <label class="form-control-label" for="email-smtp-password">Password:</label>
<input type="text" class="form-control" id="email-smtp-password" name="smtp_password" value="{{ old('smtp_password', $config['smtp_password']) }}"> <input type="text" class="form-control{{ $errors->has('smtp_password') ? ' is-invalid' : '' }}" id="email-smtp-password" name="smtp_password" value="{{ old('smtp_password', $config['smtp_password']) }}">
@if ($errors->has('smtp_password')) @if ($errors->has('smtp_password'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('smtp_password') }}</strong> <strong>{{ $errors->first('smtp_password') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-check"> <div>
<label class="form-check-label"> <label class="custom-control custom-checkbox">
<input class="form-check-input" type="checkbox" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif>
<strong>Requires encrypted connection</strong> <span class="custom-control-indicator"></span>
<span class="custom-control-description"><strong>Requires encrypted connection</strong></span>
</label> </label>
</div> </div>
@ -191,50 +193,53 @@
{{-- Security --}} {{-- Security --}}
<div role="tabpanel" class="tab-pane" id="security-tab"> <div role="tabpanel" class="tab-pane" id="security-tab">
<div class="checkbox"> <div>
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="allow_self_registration" @if (old('allow_self_registration', UserConfig::get('allow_self_registration')))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="allow_self_registration" @if (old('allow_self_registration', UserConfig::get('allow_self_registration')))checked="checked"@endif>
<strong>@lang('admin.settings.security_allow_self_registration')</strong><br/> <span class="custom-control-indicator"></span>
@lang('admin.settings.security_allow_self_registration_description') <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> </label>
</div> </div>
<div class="checkbox" style="margin-top: 20px;"> <div style="margin-top: 20px;">
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="require_email_verification" @if (old('require_email_verification', UserConfig::get('require_email_verification')))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="require_email_verification" @if (old('require_email_verification', UserConfig::get('require_email_verification')))checked="checked"@endif>
<strong>Require e-mail verification for self-registered accounts</strong><br/> <span class="custom-control-indicator"></span>
<span class="text-danger">It is strongly recommended to enable this option.</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>
</label> </label>
</div> </div>
<div class="checkbox" style="margin-top: 20px;"> <div style="margin-top: 20px;">
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="recaptcha_enabled_registration" @if (old('recaptcha_enabled_registration', UserConfig::get('recaptcha_enabled_registration')))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="recaptcha_enabled_registration" @if (old('recaptcha_enabled_registration', UserConfig::get('recaptcha_enabled_registration')))checked="checked"@endif>
<strong>Enable <a href="https://www.google.com/recaptcha" target="_blank">reCAPTCHA</a> for self-registrations</strong><br/> <span class="custom-control-indicator"></span>
<span class="text-danger">It is strongly recommended to enable this option.</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>
</label> </label>
</div> </div>
<fieldset style="margin-top: 30px;"> <fieldset style="margin-top: 30px;">
<legend>@lang('admin.settings_recaptcha')</legend> <legend>@lang('admin.settings_recaptcha')</legend>
<div class="form-group{{ $errors->has('recaptcha_site_key') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="recaptcha-site-key">Site key:</label> <label class="form-control-label" for="recaptcha-site-key">Site key:</label>
<input type="text" class="form-control" id="recaptcha-site-key" name="recaptcha_site_key" value="{{ old('recaptcha_site_key', $config['recaptcha_site_key']) }}"> <input type="text" class="form-control{{ $errors->has('recaptcha_site_key') ? ' is-invalid' : '' }}" id="recaptcha-site-key" name="recaptcha_site_key" value="{{ old('recaptcha_site_key', $config['recaptcha_site_key']) }}">
@if ($errors->has('recaptcha_site_key')) @if ($errors->has('recaptcha_site_key'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('recaptcha_site_key') }}</strong> <strong>{{ $errors->first('recaptcha_site_key') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('recaptcha_secret_key') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="recaptcha-secret-key">Secret key:</label> <label class="form-control-label" for="recaptcha-secret-key">Secret key:</label>
<input type="text" class="form-control" id="recaptcha-secret-key" name="recaptcha_secret_key" value="{{ old('recaptcha_secret_key', $config['recaptcha_secret_key']) }}"> <input type="text" class="form-control{{ $errors->has('recaptcha_secret_key') ? ' is-invalid' : '' }}" id="recaptcha-secret-key" name="recaptcha_secret_key" value="{{ old('recaptcha_secret_key', $config['recaptcha_secret_key']) }}">
@if ($errors->has('recaptcha_secret_key')) @if ($errors->has('recaptcha_secret_key'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('recaptcha_secret_key') }}</strong> <strong>{{ $errors->first('recaptcha_secret_key') }}</strong>
</div> </div>
@endif @endif
@ -244,19 +249,21 @@
<fieldset style="margin-top: 20px;"> <fieldset style="margin-top: 20px;">
<legend>@lang('admin.settings_image_protection')</legend> <legend>@lang('admin.settings_image_protection')</legend>
<div class="checkbox"> <div>
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="restrict_original_download" @if (old('restrict_original_download', UserConfig::get('restrict_original_download')))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="restrict_original_download" @if (old('restrict_original_download', UserConfig::get('restrict_original_download')))checked="checked"@endif>
<strong>@lang('forms.settings_restrict_originals_download')</strong><br/> <span class="custom-control-indicator"></span>
@lang('forms.settings_restrict_originals_download_help') <span class="custom-control-description"><strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
@lang('forms.settings_restrict_originals_download_help')</span>
</label> </label>
</div> </div>
<div class="checkbox" style="margin-top: 20px;"> <div style="margin-top: 20px;">
<label> <label class="custom-control custom-checkbox">
<input type="checkbox" name="hotlink_protection" @if (old('hotlink_protection', UserConfig::get('hotlink_protection')))checked="checked"@endif> <input type="checkbox" class="custom-control-input" name="hotlink_protection" @if (old('hotlink_protection', UserConfig::get('hotlink_protection')))checked="checked"@endif>
<strong>@lang('forms.settings_hotlink_protection')</strong><br/> <span class="custom-control-indicator"></span>
@lang('forms.settings_hotlink_protection_help') <span class="custom-control-description"><strong>@lang('forms.settings_hotlink_protection')</strong><br/>
@lang('forms.settings_hotlink_protection_help')</span>
</label> </label>
</div> </div>
</fieldset> </fieldset>
@ -272,13 +279,16 @@
<a href="https://cookieconsent.insites.com/" target="_blank">@lang('admin.settings.analytics_cookie_link_2')</a> <a href="https://cookieconsent.insites.com/" target="_blank">@lang('admin.settings.analytics_cookie_link_2')</a>
</p> </p>
</div> </div>
<div class="checkbox mt-4">
<label> <div class="mt-4">
<input type="checkbox" name="enable_visitor_hits" @if (old('enable_visitor_hits', UserConfig::get('enable_visitor_hits')))checked="checked"@endif> <label class="custom-control custom-checkbox">
<strong>@lang('admin.settings.analytics_enable_visitor_hits')</strong><br/> <input type="checkbox" class="custom-control-input" name="enable_visitor_hits" @if (old('enable_visitor_hits', UserConfig::get('enable_visitor_hits')))checked="checked"@endif>
@lang('admin.settings.analytics_enable_visitor_hits_description') <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>
</label> </label>
</div> </div>
<hr/> <hr/>
<fieldset> <fieldset>
<legend>@lang('admin.visitor_analytics_heading')</legend> <legend>@lang('admin.visitor_analytics_heading')</legend>

4
resources/views/themes/base/admin/show_album.blade.php
View File

@ -122,11 +122,11 @@
{{-- Select All/None links on the permissions tab --}} {{-- Select All/None links on the permissions tab --}}
$('a.select-all').click(function() { $('a.select-all').click(function() {
$('input:checkbox', $(this).closest('.card-block')).prop('checked', true); $('input:checkbox', $(this).closest('.card-body')).prop('checked', true);
return false; return false;
}); });
$('a.select-none').click(function() { $('a.select-none').click(function() {
$('input:checkbox', $(this).closest('.card-block')).prop('checked', false); $('input:checkbox', $(this).closest('.card-body')).prop('checked', false);
return false; return false;
}); });

4
resources/views/themes/base/auth/passwords/change_password.blade.php
View File

@ -13,8 +13,8 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="card-block"> <div class="card-body">
<form role="form" method="POST" action="{{ route('auth.processChangePassword') }}" class="mt-4"> <form role="form" method="POST" action="{{ route('auth.processChangePassword') }}">
{{ csrf_field() }} {{ csrf_field() }}
@if ($errors->has('email')) @if ($errors->has('email'))

4
resources/views/themes/base/auth/passwords/email.blade.php
View File

@ -13,8 +13,8 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="card-block"> <div class="card-body">
<form role="form" method="POST" action="{{ url('/password/email') }}" class="mt-4"> <form role="form" method="POST" action="{{ url('/password/email') }}">
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group row{{ $errors->has('email') ? ' has-danger' : '' }}"> <div class="form-group row{{ $errors->has('email') ? ' has-danger' : '' }}">

4
resources/views/themes/base/auth/passwords/reset.blade.php
View File

@ -13,8 +13,8 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="card-block"> <div class="card-body">
<form role="form" method="POST" action="{{ url('/password/reset') }}" class="mt-4"> <form role="form" method="POST" action="{{ url('/password/reset') }}">
{{ csrf_field() }} {{ csrf_field() }}
<input type="hidden" name="token" value="{{ $token }}"> <input type="hidden" name="token" value="{{ $token }}">

2
resources/views/themes/base/auth/v2_unified.blade.php
View File

@ -18,7 +18,7 @@
@endif @endif
</ul> </ul>
</div> </div>
<div class="card-block"> <div class="card-body">
@if ($active_tab == 'login') @if ($active_tab == 'login')
@include(Theme::viewName('partials.login')) @include(Theme::viewName('partials.login'))
@elseif ($active_tab == 'register') @elseif ($active_tab == 'register')

126
resources/views/themes/base/gallery/album_default.blade.php
View File

@ -3,75 +3,73 @@
@php ($hasChildren = $album->children()->count() > 0) @php ($hasChildren = $album->children()->count() > 0)
@section('breadcrumb')
<li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
@include(Theme::viewName('partials.album_breadcrumb'))
@endsection
@section('content') @section('content')
<div class="container-fluid album-container"> <div class="container album-container">
<div class="row"> <div class="row">
<div class="col-xl-8 offset-xl-2"> <div class="col">
<div class="row"> <div class="pull-right">
<div class="col"> @can('edit', $album)
<ol class="breadcrumb"> <div class="mb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li> <a class="btn btn-secondary" href="{{ route('albums.show', ['id' => $album->id]) }}" target="_blank"><i class="fa fa-fw fa-eye"></i> @lang('gallery.manage_album_link_2')</a>
@include(Theme::viewName('partials.album_breadcrumb')) </div>
</ol> @endcan
</div>
@include(\App\Facade\Theme::viewName('partials.album_view_selector'))
</div> </div>
<div class="row"> <h1 class="page-title">{{ $album->name }}</h1>
<div class="col"> <p>{{ $album->description }}</p>
<div class="pull-right"> <div class="clearfix"><!-- --></div>
@include(\App\Facade\Theme::viewName('partials.album_view_selector')) <hr/>
</div>
<h1 class="page-title">{{ $album->name }}</h1>
<p>{{ $album->description }}</p>
<div class="clearfix"><!-- --></div>
<hr/>
</div>
</div>
<div class="row">
@foreach ($photos as $photo)
<div class="col-sm-6 col-md-4 photo mb-3">
<div class="card">
<img src="{{ $photo->thumbnailUrl('preview') }}" alt="" class="card-img-top"/>
<div class="card-block">
<h4 class="card-title"><a href="{{ $photo->url() }}">{{ $photo->name }}</a></h4>
</div>
<div class="card-footer">
<small class="text-muted"><i class="fa fa-fw fa-calendar"></i> {{ date('Y-m-d H:i', strtotime(!is_null($photo->taken_at) ? $photo->taken_at : $photo->created_at)) }}</small>
</div>
</div>
</div>
@endforeach
<div class="row" style="margin-top: 15px;">
<div class="col text-center">
{{ $photos->links() }}
</div>
</div>
</div>
@if ($hasChildren)
<h2 style="margin-top: 60px;"><small class="text-muted">@lang('gallery.other_albums_heading', ['album_name' => $album->name])</small></h2>
<p class="mb-4">@lang('gallery.other_albums_description')</p>
<div class="row">
@foreach ($album->children as $childAlbum)
<div class="col-sm-4 col-md-3" style="max-width: 250px;">
<div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-block">
<h5 class="card-title"><a href="{{ $childAlbum->url() }}">{{ $childAlbum->name }}</a></h5>
</div>
<div class="card-footer">
<small class="text-muted"><i class="fa fa-fw fa-photo"></i> {{ $childAlbum->photos_count }} photos</small>
</div>
</div>
</div>
@endforeach
</div>
@endif
</div> </div>
</div> </div>
<div class="row">
@foreach ($photos as $photo)
<div class="col-sm-6 col-md-4 photo mb-3">
<div class="card">
<img src="{{ $photo->thumbnailUrl('preview') }}" alt="" class="card-img-top"/>
<div class="card-body">
<h4 class="card-title"><a href="{{ $photo->url() }}">{{ $photo->name }}</a></h4>
</div>
<div class="card-footer">
<small class="text-muted"><i class="fa fa-fw fa-calendar"></i> {{ date('Y-m-d H:i', strtotime(!is_null($photo->taken_at) ? $photo->taken_at : $photo->created_at)) }}</small>
</div>
</div>
</div>
@endforeach
<div class="row" style="margin-top: 15px;">
<div class="col text-center">
{{ $photos->links() }}
</div>
</div>
</div>
@if ($hasChildren)
<h2 style="margin-top: 60px;"><small class="text-muted">@lang('gallery.other_albums_heading', ['album_name' => $album->name])</small></h2>
<p class="mb-4">@lang('gallery.other_albums_description')</p>
<div class="row">
@foreach ($album->children as $childAlbum)
<div class="col-sm-4 col-md-3" style="max-width: 250px;">
<div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-body">
<h5 class="card-title"><a href="{{ $childAlbum->url() }}">{{ $childAlbum->name }}</a></h5>
</div>
<div class="card-footer">
<small class="text-muted"><i class="fa fa-fw fa-photo"></i> {{ $childAlbum->photos_count }} photos</small>
</div>
</div>
</div>
@endforeach
</div>
@endif
</div> </div>
@endsection @endsection

42
resources/views/themes/base/gallery/album_empty.blade.php
View File

@ -3,28 +3,30 @@
@php ($hasChildren = $album->children()->count() > 0) @php ($hasChildren = $album->children()->count() > 0)
@section('breadcrumb')
<li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
@include(Theme::viewName('partials.album_breadcrumb'))
@endsection
@section('content') @section('content')
<div class="container-fluid album-container"> <div class="container album-container">
@can('edit', $album)
<div class="row">
<div class="col">
<div class="pull-right">
<a class="btn btn-secondary" href="{{ route('albums.show', ['id' => $album->id]) }}" target="_blank"><i class="fa fa-fw fa-eye"></i> @lang('gallery.manage_album_link_2')</a>
</div>
</div>
</div>
@endcan
<div class="row"> <div class="row">
<div class="col-xl-8 offset-xl-2"> <div class="col text-center">
<div class="row"> <h1>@lang('gallery.album_no_results_heading')</h1>
<div class="col"> <p style="line-height: 1.6em;">@lang('gallery.album_no_results_text', ['admin_link' => sprintf('<a href="%s">%s</a>', route('admin'), trans('admin.title'))])</p>
<ol class="breadcrumb"> <p style="margin-bottom: 30px; line-height: 1.6em;">@lang('gallery.album_no_results_text_2')</p>
<li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
@include(Theme::viewName('partials.album_breadcrumb'))
</ol>
</div>
</div>
<div class="row"> <img src="{{ asset('themes/base/images/smartphone-photo.jpg') }}" class="img-fluid rounded" style="display: inline;" />
<div class="col text-center">
<h1>@lang('gallery.album_no_results_heading')</h1>
<p style="line-height: 1.6em;">@lang('gallery.album_no_results_text', ['admin_link' => sprintf('<a href="%s">%s</a>', route('admin'), trans('admin.title'))])</p>
<p style="margin-bottom: 30px; line-height: 1.6em;">@lang('gallery.album_no_results_text_2')</p>
<img src="{{ asset('themes/base/images/smartphone-photo.jpg') }}" class="img-fluid rounded" style="display: inline;" />
</div>
</div>
@if ($hasChildren) @if ($hasChildren)
<h2 style="margin-top: 60px;"><small class="text-muted">@lang('gallery.other_albums_heading', ['album_name' => $album->name])</small></h2> <h2 style="margin-top: 60px;"><small class="text-muted">@lang('gallery.other_albums_heading', ['album_name' => $album->name])</small></h2>
@ -35,7 +37,7 @@
<div class="col-sm-4 col-md-3" style="max-width: 250px;"> <div class="col-sm-4 col-md-3" style="max-width: 250px;">
<div class="card mb-3"> <div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/> <img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-block"> <div class="card-body">
<h5 class="card-title"><a href="{{ $childAlbum->url() }}">{{ $childAlbum->name }}</a></h5> <h5 class="card-title"><a href="{{ $childAlbum->url() }}">{{ $childAlbum->name }}</a></h5>
</div> </div>
<div class="card-footer"> <div class="card-footer">

8
resources/views/themes/base/gallery/album_slideshow.blade.php
View File

@ -11,6 +11,12 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="pull-right"> <div class="pull-right">
@can('edit', $album)
<div class="mb-3">
<a class="btn btn-secondary" href="{{ route('albums.show', ['id' => $album->id]) }}" target="_blank"><i class="fa fa-fw fa-eye"></i> @lang('gallery.manage_album_link_2')</a>
</div>
@endcan
@include(\App\Facade\Theme::viewName('partials.album_view_selector')) @include(\App\Facade\Theme::viewName('partials.album_view_selector'))
</div> </div>
@ -59,7 +65,7 @@
<div class="col-sm-4 col-md-3" style="max-width: 250px;"> <div class="col-sm-4 col-md-3" style="max-width: 250px;">
<div class="card mb-3"> <div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/> <img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-block"> <div class="card-body">
<h5 class="card-title"><a href="{{ $childAlbum->url() }}">{{ $childAlbum->name }}</a></h5> <h5 class="card-title"><a href="{{ $childAlbum->url() }}">{{ $childAlbum->name }}</a></h5>
</div> </div>
<div class="card-footer"> <div class="card-footer">

8
resources/views/themes/base/gallery/index.blade.php
View File

@ -10,10 +10,14 @@
@foreach ($albums as $album) @foreach ($albums as $album)
<div class="col-sm-6 col-md-4"> <div class="col-sm-6 col-md-4">
<div class="card"> <div class="card">
<img class="card-img-top" src="{{ $album->thumbnailUrl('preview') }}"/> <a href="{{ $album->url() }}"><img class="card-img-top" src="{{ $album->thumbnailUrl('preview') }}"/></a>
<div class="card-block"> <div class="card-body">
<h4 class="card-title"><a href="{{ $album->url() }}">{{ $album->name }}</a></h4> <h4 class="card-title"><a href="{{ $album->url() }}">{{ $album->name }}</a></h4>
<p class="card-text">{{ $album->description }}</p> <p class="card-text">{{ $album->description }}</p>
@can('edit', $album)
<a href="{{ route('albums.show', ['id' => $album->id]) }}" class="card-link">@lang('gallery.manage_album_link')</a>
@endcan
</div> </div>
<div class="card-footer"> <div class="card-footer">
<small class="text-muted"><i class="fa fa-fw fa-photo"></i> {{ $album->photos_count }} photos</small> <small class="text-muted"><i class="fa fa-fw fa-photo"></i> {{ $album->photos_count }} photos</small>

2
resources/views/themes/base/gallery/photo.blade.php
View File

@ -32,7 +32,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="card"> <div class="card">
<div class="card-header">Information about this photo:</div> <div class="card-header">Information about this photo:</div>
<div class="card-block" style="padding: 0;"> <div class="card-body" style="padding: 0;">
<table class="table table-striped photo-metadata mb-0"> <table class="table table-striped photo-metadata mb-0">
<thead> <thead>
<tr> <tr>

2
resources/views/themes/base/partials/admin_actions_widget.blade.php
View File

@ -1,7 +1,7 @@
@can('admin:manage-albums') @can('admin:manage-albums')
<div class="card admin-sidebar-card"> <div class="card admin-sidebar-card">
<div class="card-header">@lang('admin.actions_widget.panel_header')</div> <div class="card-header">@lang('admin.actions_widget.panel_header')</div>
<div class="card-block"> <div class="card-body">
<a class="btn btn-link" href="{{ route('albums.create') }}"><i class="fa fa-fw fa-plus"></i> @lang('admin.actions_widget.create_album_link')</a> <a class="btn btn-link" href="{{ route('albums.create') }}"><i class="fa fa-fw fa-plus"></i> @lang('admin.actions_widget.create_album_link')</a>
</div> </div>
</div> </div>

2
resources/views/themes/base/partials/admin_manage_widget.blade.php
View File

@ -9,7 +9,7 @@
@if ($canConfigure || $canManageAlbums || $canManageGroups || $canManageStorage || $canManageUsers) @if ($canConfigure || $canManageAlbums || $canManageGroups || $canManageStorage || $canManageUsers)
<div class="card admin-sidebar-card"> <div class="card admin-sidebar-card">
<div class="card-header">@lang('admin.manage_widget.panel_header')</div> <div class="card-header">@lang('admin.manage_widget.panel_header')</div>
<div class="card-block"> <div class="card-body">
@if ($canManageAlbums) @if ($canManageAlbums)
<a class="btn btn-link" href="{{ route('albums.index') }}"><i class="fa fa-fw fa-picture-o"></i> @lang('navigation.breadcrumb.albums')</a> <a class="btn btn-link" href="{{ route('albums.index') }}"><i class="fa fa-fw fa-picture-o"></i> @lang('navigation.breadcrumb.albums')</a>
@endif @endif

2
resources/views/themes/base/partials/admin_stats_widget.blade.php
View File

@ -1,6 +1,6 @@
<div class="card admin-sidebar-card"> <div class="card admin-sidebar-card">
<div class="card-header">@lang('admin.stats_widget.panel_header')</div> <div class="card-header">@lang('admin.stats_widget.panel_header')</div>
<div class="card-block"> <div class="card-body">
<b>{{ $album_count }}</b> {{ trans_choice('admin.stats_widget.albums', $album_count) }}<br/> <b>{{ $album_count }}</b> {{ trans_choice('admin.stats_widget.albums', $album_count) }}<br/>
<b>{{ $photo_count }}</b> {{ trans_choice('admin.stats_widget.photos', $photo_count) }} <b>{{ $photo_count }}</b> {{ trans_choice('admin.stats_widget.photos', $photo_count) }}
@can('admin:access') @can('admin:access')

30
resources/views/themes/base/partials/admin_storages_amazon_s3_options.blade.php
View File

@ -1,23 +1,23 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('access_key') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="access-key">@lang('forms.storage_access_key_label')</label> <label class="form-control-label" for="access-key">@lang('forms.storage_access_key_label')</label>
<input type="text" class="form-control" id="access-key" name="access_key" value="{{ old('access_key') }}"> <input type="text" class="form-control{{ $errors->has('access_key') ? ' is-invalid' : '' }}" id="access-key" name="access_key" value="{{ old('access_key') }}">
@if ($errors->has('access_key')) @if ($errors->has('access_key'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('access_key') }}</strong> <strong>{{ $errors->first('access_key') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('secret_key') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="secret-key">@lang('forms.storage_secret_key_label')</label> <label class="form-control-label" for="secret-key">@lang('forms.storage_secret_key_label')</label>
<input type="text" class="form-control" id="secret-key" name="secret_key" value="{{ old('secret_key') }}"> <input type="text" class="form-control{{ $errors->has('secret_key') ? ' is-invalid' : '' }}" id="secret-key" name="secret_key" value="{{ old('secret_key') }}">
@if ($errors->has('secret_key')) @if ($errors->has('secret_key'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('secret_key') }}</strong> <strong>{{ $errors->first('secret_key') }}</strong>
</div> </div>
@endif @endif
@ -27,24 +27,24 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('container_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="container-name">@lang('forms.storage_bucket_name_label')</label> <label class="form-control-label" for="container-name">@lang('forms.storage_bucket_name_label')</label>
<input type="text" class="form-control" id="container-name" name="container_name" value="{{ old('container_name') }}"> <input type="text" class="form-control{{ $errors->has('container_name') ? ' is-invalid' : '' }}" id="container-name" name="container_name" value="{{ old('container_name') }}">
@if ($errors->has('container_name')) @if ($errors->has('container_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('container_name') }}</strong> <strong>{{ $errors->first('container_name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label> <label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label>
<input type="text" class="form-control" id="service-region" name="service_region" value="{{ old('service_region') }}"> <input type="text" class="form-control{{ $errors->has('service_region') ? ' is-invalid' : '' }}" id="service-region" name="service_region" value="{{ old('service_region') }}">
@if ($errors->has('service_region')) @if ($errors->has('service_region'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('service_region') }}</strong> <strong>{{ $errors->first('service_region') }}</strong>
</div> </div>
@endif @endif
@ -52,12 +52,12 @@
</div> </div>
</div> </div>
<div class="form-group{{ $errors->has('auth_url') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="auth-url">@lang('forms.storage_auth_url_label')</label> <label class="form-control-label" for="auth-url">@lang('forms.storage_auth_url_label')</label>
<input type="text" class="form-control" id="auth-url" name="auth_url" value="{{ old('auth_url') }}"> <input type="text" class="form-control{{ $errors->has('auth_url') ? ' is-invalid' : '' }}" id="auth-url" name="auth_url" value="{{ old('auth_url') }}">
@if ($errors->has('auth_url')) @if ($errors->has('auth_url'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('auth_url') }}</strong> <strong>{{ $errors->first('auth_url') }}</strong>
</div> </div>
@endif @endif

6
resources/views/themes/base/partials/admin_storages_filesystem_options.blade.php
View File

@ -1,9 +1,9 @@
<div class="form-group{{ $errors->has('location') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="storage-location">@lang('forms.storage_location_label')</label> <label class="form-control-label" for="storage-location">@lang('forms.storage_location_label')</label>
<input type="text" class="form-control" id="storage-location" name="location" value="{{ old('location', isset($filesystem_default_location) ? $filesystem_default_location : '') }}"> <input type="text" class="form-control{{ $errors->has('location') ? ' is-invalid' : '' }}" id="storage-location" name="location" value="{{ old('location', isset($filesystem_default_location) ? $filesystem_default_location : '') }}">
@if ($errors->has('location')) @if ($errors->has('location'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('location') }}</strong> <strong>{{ $errors->first('location') }}</strong>
</div> </div>
@endif @endif

48
resources/views/themes/base/partials/admin_storages_openstack_options.blade.php
View File

@ -1,23 +1,23 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('auth_url') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="auth-url">@lang('forms.storage_auth_url_label')</label> <label class="form-control-label" for="auth-url">@lang('forms.storage_auth_url_label')</label>
<input type="text" class="form-control" id="auth-url" name="auth_url" value="{{ old('auth_url') }}"> <input type="text" class="form-control{{ $errors->has('auth_url') ? ' is-invalid' : '' }}" id="auth-url" name="auth_url" value="{{ old('auth_url') }}">
@if ($errors->has('auth_url')) @if ($errors->has('auth_url'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('auth_url') }}</strong> <strong>{{ $errors->first('auth_url') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('tenant_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="tenant-name">@lang('forms.storage_tenant_name_label')</label> <label class="form-control-label" for="tenant-name">@lang('forms.storage_tenant_name_label')</label>
<input type="text" class="form-control" id="tenant-name" name="tenant_name" value="{{ old('tenant_name') }}"> <input type="text" class="form-control{{ $errors->has('tenant_name') ? ' is-invalid' : '' }}" id="tenant-name" name="tenant_name" value="{{ old('tenant_name') }}">
@if ($errors->has('tenant_name')) @if ($errors->has('tenant_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('tenant_name') }}</strong> <strong>{{ $errors->first('tenant_name') }}</strong>
</div> </div>
@endif @endif
@ -27,24 +27,24 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('username') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="username">@lang('forms.username_label')</label> <label class="form-control-label" for="username">@lang('forms.username_label')</label>
<input type="text" class="form-control" id="username" name="username" value="{{ old('username') }}"> <input type="text" class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}" id="username" name="username" value="{{ old('username') }}">
@if ($errors->has('username')) @if ($errors->has('username'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('username') }}</strong> <strong>{{ $errors->first('username') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="password">@lang('forms.password_label')</label> <label class="form-control-label" for="password">@lang('forms.password_label')</label>
<input type="text" class="form-control" id="password" name="password" value="{{ old('password') }}"> <input type="text" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" id="password" name="password" value="{{ old('password') }}">
@if ($errors->has('password')) @if ($errors->has('password'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('password') }}</strong> <strong>{{ $errors->first('password') }}</strong>
</div> </div>
@endif @endif
@ -54,24 +54,24 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="service-name">@lang('forms.storage_service_name_label')</label> <label class="form-control-label" for="service-name">@lang('forms.storage_service_name_label')</label>
<input type="text" class="form-control" id="service-name" name="service_name" value="{{ old('service_name') }}"> <input type="text" class="form-control{{ $errors->has('service_name') ? ' is-invalid' : '' }}" id="service-name" name="service_name" value="{{ old('service_name') }}">
@if ($errors->has('service_name')) @if ($errors->has('service_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('service_name') }}</strong> <strong>{{ $errors->first('service_name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label> <label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label>
<input type="text" class="form-control" id="service-region" name="service_region" value="{{ old('service_region') }}"> <input type="text" class="form-control{{ $errors->has('service_region') ? ' is-invalid' : '' }}" id="service-region" name="service_region" value="{{ old('service_region') }}">
@if ($errors->has('service_region')) @if ($errors->has('service_region'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('service_region') }}</strong> <strong>{{ $errors->first('service_region') }}</strong>
</div> </div>
@endif @endif
@ -79,23 +79,23 @@
</div> </div>
</div> </div>
<div class="form-group{{ $errors->has('container_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="container-name">@lang('forms.storage_container_name_label')</label> <label class="form-control-label" for="container-name">@lang('forms.storage_container_name_label')</label>
<input type="text" class="form-control" id="container-name" name="container_name" value="{{ old('container_name') }}"> <input type="text" class="form-control{{ $errors->has('container_name') ? ' is-invalid' : '' }}" id="container-name" name="container_name" value="{{ old('container_name') }}">
@if ($errors->has('container_name')) @if ($errors->has('container_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('container_name') }}</strong> <strong>{{ $errors->first('container_name') }}</strong>
</div> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('cdn_url') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="cdn-url">@lang('forms.storage_cdn_url_label')</label> <label class="form-control-label" for="cdn-url">@lang('forms.storage_cdn_url_label')</label>
<input type="text" class="form-control" id="cdn-url" name="cdn_url" value="{{ old('cdn_url') }}"> <input type="text" class="form-control{{ $errors->has('cdn_url') ? ' is-invalid' : '' }}" id="cdn-url" name="cdn_url" value="{{ old('cdn_url') }}">
@if ($errors->has('cdn_url')) @if ($errors->has('cdn_url'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('cdn_url') }}</strong> <strong>{{ $errors->first('cdn_url') }}</strong>
</div> </div>
@endif @endif

24
resources/views/themes/base/partials/admin_storages_rackspace_options.blade.php
View File

@ -1,23 +1,23 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('username') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="username">@lang('forms.username_label')</label> <label class="form-control-label" for="username">@lang('forms.username_label')</label>
<input type="text" class="form-control" id="username" name="username" value="{{ old('username') }}"> <input type="text" class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}" id="username" name="username" value="{{ old('username') }}">
@if ($errors->has('username')) @if ($errors->has('username'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('username') }}</strong> <strong>{{ $errors->first('username') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="password">@lang('forms.password_label')</label> <label class="form-control-label" for="password">@lang('forms.password_label')</label>
<input type="text" class="form-control" id="password" name="password" value="{{ old('password') }}"> <input type="text" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" id="password" name="password" value="{{ old('password') }}">
@if ($errors->has('password')) @if ($errors->has('password'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('password') }}</strong> <strong>{{ $errors->first('password') }}</strong>
</div> </div>
@endif @endif
@ -27,24 +27,24 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label> <label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label>
<input type="text" class="form-control" id="service-region" name="service_region" value="{{ old('service_region') }}"> <input type="text" class="form-control{{ $errors->has('service_region') ? ' is-invalid' : '' }}" id="service-region" name="service_region" value="{{ old('service_region') }}">
@if ($errors->has('service_region')) @if ($errors->has('service_region'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('service_region') }}</strong> <strong>{{ $errors->first('service_region') }}</strong>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('container_name') ? ' has-danger' : '' }}"> <div class="form-group">
<label class="form-control-label" for="container-name">@lang('forms.storage_container_name_label')</label> <label class="form-control-label" for="container-name">@lang('forms.storage_container_name_label')</label>
<input type="text" class="form-control" id="container-name" name="container_name" value="{{ old('container_name') }}"> <input type="text" class="form-control{{ $errors->has('container_name') ? ' is-invalid' : '' }}" id="container-name" name="container_name" value="{{ old('container_name') }}">
@if ($errors->has('container_name')) @if ($errors->has('container_name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('container_name') }}</strong> <strong>{{ $errors->first('container_name') }}</strong>
</div> </div>
@endif @endif

2
resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
View File

@ -1,6 +1,6 @@
<div class="card"> <div class="card">
<div class="card-header">@lang('admin.sysinfo_panel')</div> <div class="card-header">@lang('admin.sysinfo_panel')</div>
<div class="card-block" style="padding: 0;"> <div class="card-body" style="padding: 0;">
<table id="system-info" class="table my-0 table-striped"> <table id="system-info" class="table my-0 table-striped">
<tbody> <tbody>
<tr> <tr>

2
resources/views/themes/base/partials/album_permissions.blade.php
View File

@ -5,7 +5,7 @@
</h5> </h5>
</div> </div>
<div id="collapse-{{ $key_id }}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-{{ $key_id }}"> <div id="collapse-{{ $key_id }}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-{{ $key_id }}">
<div class="card-block"> <div class="card-body">
<p style="margin-bottom: 20px;"><a class="select-all" href="#">Select All</a> &middot; <a class="select-none" href="">Select None</a></p> <p style="margin-bottom: 20px;"><a class="select-all" href="#">Select All</a> &middot; <a class="select-none" href="">Select None</a></p>
<div class="row"> <div class="row">

14
resources/views/themes/base/partials/album_settings_tab.blade.php
View File

@ -6,12 +6,12 @@
<h4><i class="fa fa-fw fa-info"></i> @lang('admin.album_basic_info_heading')</h4> <h4><i class="fa fa-fw fa-info"></i> @lang('admin.album_basic_info_heading')</h4>
<p>@lang('admin.album_basic_info_intro')</p> <p>@lang('admin.album_basic_info_intro')</p>
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}" style="margin-top: 20px;"> <div class="form-group" style="margin-top: 20px;">
<label class="form-control-label" for="album-name">@lang('forms.name_label')</label> <label class="form-control-label" for="album-name">@lang('forms.name_label')</label>
<input type="text" class="form-control" id="album-name" name="name" value="{{ old('name') }}"> <input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" id="album-name" name="name" value="{{ old('name') }}">
@if ($errors->has('name')) @if ($errors->has('name'))
<div class="form-control-feedback"> <div class="invalid-feedback">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('name') }}</strong>
</div> </div>
@endif @endif
@ -42,7 +42,7 @@
<div class="col-md-6 push-md-6 mb-3"> <div class="col-md-6 push-md-6 mb-3">
<div class="card"> <div class="card">
<div class="card-header">@lang('admin.save_changes_heading')</div> <div class="card-header">@lang('admin.save_changes_heading')</div>
<div class="card-block"> <div class="card-body">
<p>@lang('admin.save_changes_intro')</p> <p>@lang('admin.save_changes_intro')</p>
<div class="text-right"> <div class="text-right">
<button type="submit" class="btn btn-success"><i class="fa fa-fw fa-floppy-o"></i> @lang('forms.save_action')</button> <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-floppy-o"></i> @lang('forms.save_action')</button>
@ -53,9 +53,9 @@
@can('delete', $album) @can('delete', $album)
<div class="col-md-6 pull-md-6 mb-3"> <div class="col-md-6 pull-md-6 mb-3">
<div class="card card-outline-danger"> <div class="card bg-danger">
<div class="card-header card-danger">@lang('admin.danger_zone_heading')</div> <div class="card-header text-white">@lang('admin.danger_zone_heading')</div>
<div class="card-block"> <div class="card-body bg-light">
<p class="text-danger">@lang('admin.danger_zone_intro')</p> <p class="text-danger">@lang('admin.danger_zone_intro')</p>
<div> <div>
<a href="{{ route('albums.delete', ['id' => $album->id]) }}" class="btn btn-danger">@lang('forms.delete_action')</a> <a href="{{ route('albums.delete', ['id' => $album->id]) }}" class="btn btn-danger">@lang('forms.delete_action')</a>

2
resources/views/themes/base/partials/login.blade.php
View File

@ -1,4 +1,4 @@
<form role="form" method="POST" action="{{ url('/login') }}" class="mt-4"> <form role="form" method="POST" action="{{ url('/login') }}">
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group row{{ $errors->has('email') ? ' has-danger' : '' }}"> <div class="form-group row{{ $errors->has('email') ? ' has-danger' : '' }}">

8
resources/views/themes/base/partials/navbar.blade.php
View File

@ -1,8 +1,8 @@
<nav class="navbar navbar-expand-md navbar-inverse bg-primary"> <nav class="navbar navbar-expand-md navbar-dark">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar-content" aria-controls="navbar-content" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="{{ route('home') }}"><i class="fa fa-fw fa-photo"></i> {{ UserConfig::get('app_name') }}</a> <a class="navbar-brand" href="{{ route('home') }}"><i class="fa fa-fw fa-photo"></i> {{ UserConfig::get('app_name') }}</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content" aria-controls="navbar-content" aria-expanded="false" aria-label="Toggle navigation">
<i class="fa fa-fw fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbar-content"> <div class="collapse navbar-collapse" id="navbar-content">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">

8
resources/views/themes/base/partials/permission_checkbox.blade.php
View File

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

2
resources/views/themes/base/partials/register.blade.php
View File

@ -1,4 +1,4 @@
<form role="form" method="POST" action="{{ url('/register') }}" class="mt-4"> <form role="form" method="POST" action="{{ url('/register') }}">
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group row{{ $errors->has('name') ? ' has-danger' : '' }}"> <div class="form-group row{{ $errors->has('name') ? ' has-danger' : '' }}">