#79: Upgraded Bootstrap to 4.1.2. Number of HTML mark-up changes following the BS upgrade.

This commit is contained in:
Andy Heathershaw 2018-07-12 23:46:59 +01:00
parent ab690b1e25
commit 4b7b99431f
26 changed files with 21804 additions and 12895 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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; box-sizing: border-box;
}
html {
font-family: sans-serif; font-family: sans-serif;
line-height: 1.15; line-height: 1.15;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
-ms-overflow-style: scrollbar; -ms-overflow-style: scrollbar;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
*,
*::before,
*::after {
box-sizing: inherit;
} }
@-ms-viewport { @-ms-viewport {
width: device-width; 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; display: block;
} }
body { body {
margin: 0; 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-size: 1rem;
font-weight: normal; font-weight: 400;
line-height: 1.5; line-height: 1.5;
color: #212529; color: #212529;
text-align: left;
background-color: #fff; background-color: #fff;
} }
[tabindex="-1"]:focus { [tabindex="-1"]:focus {
outline: none !important; outline: 0 !important;
} }
hr { hr {
@ -44,7 +51,7 @@ hr {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin-top: 0; margin-top: 0;
margin-bottom: .5rem; margin-bottom: 0.5rem;
} }
p { p {
@ -56,7 +63,7 @@ abbr[title],
abbr[data-original-title] { abbr[data-original-title] {
text-decoration: underline; text-decoration: underline;
-webkit-text-decoration: underline dotted; -webkit-text-decoration: underline dotted;
text-decoration: underline dotted; text-decoration: underline dotted;
cursor: help; cursor: help;
border-bottom: 0; border-bottom: 0;
} }
@ -82,7 +89,7 @@ ul ol {
} }
dt { dt {
font-weight: bold; font-weight: 700;
} }
dd { dd {
@ -140,7 +147,7 @@ a:not([href]):not([tabindex]) {
text-decoration: none; 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; color: inherit;
text-decoration: none; text-decoration: none;
} }
@ -153,7 +160,7 @@ pre,
code, code,
kbd, kbd,
samp { samp {
font-family: monospace, monospace; font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 1em; font-size: 1em;
} }
@ -161,6 +168,7 @@ pre {
margin-top: 0; margin-top: 0;
margin-bottom: 1rem; margin-bottom: 1rem;
overflow: auto; overflow: auto;
-ms-overflow-style: scrollbar;
} }
figure { figure {
@ -174,19 +182,7 @@ img {
svg:not(:root) { svg:not(:root) {
overflow: hidden; overflow: hidden;
} vertical-align: middle;
a,
area,
button,
[role="button"],
input,
label,
select,
summary,
textarea {
-ms-touch-action: manipulation;
touch-action: manipulation;
} }
table { table {
@ -196,18 +192,22 @@ table {
caption { caption {
padding-top: 0.75rem; padding-top: 0.75rem;
padding-bottom: 0.75rem; padding-bottom: 0.75rem;
color: #868e96; color: #6c757d;
text-align: left; text-align: left;
caption-side: bottom; caption-side: bottom;
} }
th { th {
text-align: left; text-align: inherit;
} }
label { label {
display: inline-block; display: inline-block;
margin-bottom: .5rem; margin-bottom: 0.5rem;
}
button {
border-radius: 0;
} }
button:focus { button:focus {
@ -318,6 +318,7 @@ output {
summary { summary {
display: list-item; display: list-item;
cursor: pointer;
} }
template { template {

File diff suppressed because one or more lines are too long

View File

@ -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 */ /*# sourceMappingURL=bootstrap-reboot.min.css.map */

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -63,11 +63,10 @@
@include(Theme::viewName('partials.admin_storages_rackspace_options')) @include(Theme::viewName('partials.admin_storages_rackspace_options'))
</div> </div>
<label class="custom-control custom-checkbox"> <div class="form-check">
<input type="checkbox" class="custom-control-input" name="is_default"@if (old('is_default')) checked="checked"@endif> <input type="checkbox" class="form-check-input" id="is-default" name="is_default"@if (old('is_default')) checked="checked"@endif>
<span class="custom-control-indicator"></span> <label class="form-check-label" for="is-default">@lang('forms.default_storage_label')</label>
<span class="custom-control-description">@lang('forms.default_storage_label')</span> </div>
</label>
<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>

View File

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

View File

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

View File

@ -87,21 +87,15 @@
</div> </div>
</div> </div>
<div> <div class="form-check">
<label class="custom-control custom-checkbox"> <input type="checkbox" class="form-check-input" id="is-admin" name="is_admin"@if (old('is_admin', $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> <label class="form-check-label" for="is-admin">@lang('forms.admin_user_label')</label>
<span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.admin_user_label')</span>
</label>
</div> </div>
@if (!$user->is_activated) @if (!$user->is_activated)
<div> <div class="form-check">
<label class="custom-control custom-checkbox"> <input type="checkbox" class="form-check-input" id="is-activated" name="is_activated"@if (old('is_activated', $user->is_activated)) checked="checked"@endif>
<input type="checkbox" class="custom-control-input" 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>
<span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('forms.activate_user_label')</span>
</label>
</div> </div>
@endif @endif
</div> </div>
@ -112,12 +106,9 @@
<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> <div class="form-check">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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>
<span class="custom-control-indicator"></span>
<span class="custom-control-description">{{ $group->name }}</span>
</label>
</div> </div>
@endforeach @endforeach
@else @else

View File

@ -82,11 +82,10 @@
<fieldset> <fieldset>
<legend>@lang('admin.settings.albums_menu_heading')</legend> <legend>@lang('admin.settings.albums_menu_heading')</legend>
<div class="form-check"> <div class="form-check mb-3">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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">
<span class="custom-control-indicator"></span> <strong>@lang('admin.settings.albums_menu_parents_only')</strong>
<span class="custom-control-description"><strong>@lang('admin.settings.albums_menu_parents_only')</strong></span>
</label> </label>
</div> </div>
@ -108,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>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> <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 mt-2">
<label class="custom-control custom-checkbox"> <input type="checkbox" class="form-check-input" id="remove-copyright" 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> <label class="form-check-label" for="remove-copyright">
<span class="custom-control-indicator"></span> <strong>Remove &quot;Powered by&quot; notice from the public gallery</strong>
<span class="custom-control-description"><strong>Remove &quot;Powered by&quot; notice from the public gallery</strong></span>
</label> </label>
</div> </div>
</fieldset> </fieldset>
@ -190,11 +188,10 @@
@endif @endif
</div> </div>
<div> <div class="form-check">
<label class="custom-control custom-checkbox"> <input type="checkbox" class="form-check-input" id="smtp-encryption" 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> <label class="form-check-label" for="smtp-encryption">
<span class="custom-control-indicator"></span> <strong>Requires encrypted connection</strong>
<span class="custom-control-description"><strong>Requires encrypted connection</strong></span>
</label> </label>
</div> </div>
@ -217,30 +214,27 @@
{{-- Security --}} {{-- Security --}}
<div role="tabpanel" class="tab-pane" id="security-tab"> <div role="tabpanel" class="tab-pane" id="security-tab">
<div> <div class="form-check">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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-indicator"></span>
<span class="custom-control-description"><strong>@lang('admin.settings.security_allow_self_registration')</strong><br/> <span class="custom-control-description"><strong>@lang('admin.settings.security_allow_self_registration')</strong><br/>
@lang('admin.settings.security_allow_self_registration_description')</span> @lang('admin.settings.security_allow_self_registration_description')</span>
</label> </label>
</div> </div>
<div style="margin-top: 20px;"> <div class="form-check mt-3">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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">
<span class="custom-control-indicator"></span> <strong>Require e-mail verification for self-registered accounts</strong><br/>
<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 class="text-danger">It is strongly recommended to enable this option.</span></span>
</label> </label>
</div> </div>
<div style="margin-top: 20px;"> <div class="form-check mt-3">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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">
<span class="custom-control-indicator"></span> <strong>Enable <a href="https://www.google.com/recaptcha" target="_blank">reCAPTCHA</a> for self-registrations</strong><br/>
<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 class="text-danger">It is strongly recommended to enable this option.</span></span>
</label> </label>
</div> </div>
@ -273,19 +267,17 @@
<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> <div class="form-check">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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">
<span class="custom-control-indicator"></span> <strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
<span class="custom-control-description"><strong>@lang('forms.settings_restrict_originals_download')</strong><br/> @lang('forms.settings_restrict_originals_download_help')
@lang('forms.settings_restrict_originals_download_help')</span>
</label> </label>
</div> </div>
<div style="margin-top: 20px;"> <div class="form-check mt-3">
<label class="custom-control custom-checkbox"> <input type="checkbox" class="form-check-input" id="hotlink-protection" 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> <label class="form-check-label" for="hotlink-protection">
<span class="custom-control-indicator"></span>
<span class="custom-control-description"><strong>@lang('forms.settings_hotlink_protection')</strong><br/> <span class="custom-control-description"><strong>@lang('forms.settings_hotlink_protection')</strong><br/>
@lang('forms.settings_hotlink_protection_help')</span> @lang('forms.settings_hotlink_protection_help')</span>
</label> </label>
@ -304,12 +296,11 @@
</p> </p>
</div> </div>
<div class="mt-4"> <div class="form-check mt-4">
<label class="custom-control custom-checkbox"> <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>
<input type="checkbox" class="custom-control-input" 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">
<span class="custom-control-indicator"></span> <strong>@lang('admin.settings.analytics_enable_visitor_hits')</strong><br/>
<span class="custom-control-description"><strong>@lang('admin.settings.analytics_enable_visitor_hits')</strong><br/> @lang('admin.settings.analytics_enable_visitor_hits_description')
@lang('admin.settings.analytics_enable_visitor_hits_description')</span>
</label> </label>
</div> </div>

View File

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

View File

@ -1,7 +1,6 @@
<div> <div class="form-check">
<label class="custom-control custom-checkbox" for="permission|{{ $key_id }}|{{ $permission->id }}"> <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"' : '' }}>
<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"' : '' }}> <label class="form-check-label" for="permission|{{ $key_id }}|{{ $permission->id }}">
<span class="custom-control-indicator"></span> {{ trans(sprintf('permissions.%s.%s', $permission->section, $permission->description)) }}
<span class="custom-control-description">{{ trans(sprintf('permissions.%s.%s', $permission->section, $permission->description)) }}</span>
</label> </label>
</div> </div>