mirror_php/LinkAce
1
0
Fork 0
mirror of https://github.com/Kovah/LinkAce.git synced 2025-04-20 23:11:56 +02:00
Code Issues Releases Wiki Activity

Adjust all views for logged in users (#345)

Browse Source
This commit is contained in:
Kovah 2022-01-09 23:45:54 +01:00
parent 48216c61ac
commit a1b1371050
No known key found for this signature in database
GPG Key ID: AAAA031BA9830D7B
54 changed files with 251 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helper/Sharing.php
View File

@ -6,7 +6,7 @@ use App\Models\Link;
class Sharing
{
public static $linkClasses = 'share-link btn btn-xs btn-outline-secondary';
public static $linkClasses = 'share-link btn btn-xs btn-light';
public static $placeholders = [
'#URL#',

6
resources/assets/js/components/LoadingButton.js vendored
View File

@ -8,13 +8,9 @@ export default class LoadingButton {
}
onClick () {
if (this.formIsValid()) {
if (this.$form.checkValidity()) {
this.$btn.disabled = true;
this.$form.submit();
}
}
formIsValid () {
return this.$form.checkValidity();
}
}

3
resources/assets/sass/_variables.scss vendored
View File

@ -87,6 +87,8 @@ $body-color-muted: $gray;
// Links
$link-color: $primary;
$link-shade-percentage: 40%;
$link-hover-color: shift-color($link-color, $link-shade-percentage);
$link-hover-decoration: none;
@ -126,6 +128,7 @@ $btn-padding-x-xs: $input-btn-padding-x-xs;
$btn-font-size-xs: $input-btn-font-size-xs;
$btn-line-height-xs: $input-btn-line-height-xs;
$btn-hover-bg-tint-amount: 20%;
$btn-border-radius-xs: $border-radius-xs;

4
resources/assets/sass/custom/_app.scss vendored
View File

@ -99,6 +99,10 @@ body:not(.bookmarklet) {
font-size: 90%;
}
.text-xs {
font-size: $font-size-xs;
}
.btn-xs {
@include button-size($btn-padding-y-xs, $btn-padding-x-xs, $btn-font-size-xs, $btn-border-radius-xs);
}

2
resources/assets/sass/custom/_fixes.scss vendored
View File

@ -1,5 +1,5 @@
// Bootstrap 5 Fixes
.custom-control-label {
.form-check-label {
cursor: pointer;
}

10
resources/views/app/bookmarklet/login.blade.php
View File

@ -10,7 +10,7 @@
<form method="POST" action="{{ route('login') }}" aria-label="@lang('linkace.login')">
@csrf
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">
@ -30,7 +30,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">
@ -50,12 +50,12 @@
<div class="row mt-4">
<div class="col-8">
<div class="custom-control custom-checkbox pt-1">
<div class="form-check pt-1">
<input type="hidden" name="remember_me" value="0">
<input type="checkbox" class="custom-control-input" id="remember_me"
<input type="checkbox" class="form-check-input" id="remember_me"
@if(old('remember_me')) checked @endif>
<label class="custom-control-label" for="remember_me">
<label class="form-check-label" for="remember_me">
@lang('linkace.remember_me')
</label>
</div>

2
resources/views/app/import/import.blade.php
View File

@ -12,7 +12,7 @@
<p>@lang('import.import_help')</p>
<div class="form-group mt-4 mb-4">
<div class="mt-4 mb-4">
<label for="username">
@lang('import.import_file')
</label>

6
resources/views/app/search/partials/table.blade.php
View File

@ -11,14 +11,14 @@
@foreach($results as $link)
<tr>
<td>
<a href="{{ route('links.show', [$link->id]) }}">
<a href="{{ route('links.show', [$link->id]) }}" class="text-decoration-none">
{{ $link->title }}
</a>
@if($link->tags->count() > 0)
<div class="mt-1">
<label class="small mb-0">@lang('tag.tags'):</label>
@foreach($link->tags as $tag)
<a href="{{ route('tags.show', [$tag->id]) }}" class="badge badge-light">
<a href="{{ route('tags.show', [$tag->id]) }}" class="btn btn-xs btn-light">
{{ $tag->name }}
</a>
@endforeach
@ -26,7 +26,7 @@
@endif
</td>
<td>
<a href="{{ $link->url }}" {!! linkTarget() !!}>
<a href="{{ $link->url }}" {!! linkTarget() !!} class="text-decoration-none">
{{ $link->shortUrl() }}
</a>
</td>

50
resources/views/app/search/search.blade.php
View File

@ -11,49 +11,47 @@
<form action="{{ route('do-search') }}" method="POST">
@csrf
<div class="form-group">
<div class="mb-3">
<div class="input-group">
<input type="text" name="query" id="query" autofocus
class="form-control form-control-lg{{ $errors->has('query') ? ' is-invalid' : '' }}"
placeholder="@lang('search.query')"
value="{{ old('query') ?: $query_settings['old_query'] }}">
<div class="input-group-append">
<button class="btn btn-primary" type="submit">
<x-icon.search class="me-2"/>
@lang('search.search')
</button>
</div>
<button class="btn btn-primary" type="submit">
<x-icon.search class="me-2"/>
@lang('search.search')
</button>
</div>
</div>
<div class="row">
<div class="col-md d-flex align-items-center">
<div class="custom-control custom-checkbox">
<input type="checkbox" id="search_title" name="search_title" class="custom-control-input"
<div class="form-check">
<input type="checkbox" id="search_title" name="search_title" class="form-check-input"
@if($query_settings['search_title']) checked @endif>
<label class="custom-control-label" for="search_title">
<label class="form-check-label" for="search_title">
@lang('search.search_title')
</label>
</div>
</div>
<div class="col-md d-flex align-items-center">
<div class="custom-control custom-checkbox">
<div class="form-check">
<input type="checkbox" id="search_description" name="search_description"
class="custom-control-input"
class="form-check-input"
@if($query_settings['search_description']) checked @endif>
<label class="custom-control-label" for="search_description">
<label class="form-check-label" for="search_description">
@lang('search.search_description')
</label>
</div>
</div>
<div class="col-md d-flex align-items-center">
<div class="custom-control custom-checkbox">
<input type="checkbox" id="empty_tags" name="empty_tags" class="custom-control-input"
<div class="form-check">
<input type="checkbox" id="empty_tags" name="empty_tags" class="form-check-input"
@if($query_settings['empty_tags']) checked @endif>
<label class="custom-control-label" for="empty_tags">
<label class="form-check-label" for="empty_tags">
@lang('search.empty_tags')
</label>
</div>
@ -63,30 +61,30 @@
<div class="row">
<div class="col-md d-flex align-items-center">
<div class="custom-control custom-checkbox">
<input type="checkbox" id="broken_only" name="broken_only" class="custom-control-input"
<div class="form-check">
<input type="checkbox" id="broken_only" name="broken_only" class="form-check-input"
@if($query_settings['broken_only']) checked @endif>
<label class="custom-control-label" for="broken_only">
<label class="form-check-label" for="broken_only">
@lang('search.broken_links')
</label>
</div>
</div>
<div class="col-md d-flex align-items-center">
<div class="custom-control custom-checkbox">
<input type="checkbox" id="private_only" name="private_only" class="custom-control-input"
<div class="form-check">
<input type="checkbox" id="private_only" name="private_only" class="form-check-input"
@if($query_settings['private_only']) checked @endif>
<label class="custom-control-label" for="private_only">
<label class="form-check-label" for="private_only">
@lang('search.private_only')
</label>
</div>
</div>
<div class="col-md d-flex align-items-center">
<div class="custom-control custom-checkbox">
<input type="checkbox" id="empty_lists" name="empty_lists" class="custom-control-input"
<div class="form-check">
<input type="checkbox" id="empty_lists" name="empty_lists" class="form-check-input"
@if($query_settings['empty_lists']) checked @endif>
<label class="custom-control-label" for="empty_lists">
<label class="form-check-label" for="empty_lists">
@lang('search.empty_lists')
</label>
</div>
@ -115,7 +113,7 @@
<label for="order_by" class="d-none" aria-hidden="true">
@lang('search.order_by')
</label>
<select id="order_by" name="order_by" class="custom-select">
<select id="order_by" name="order_by" class="form-select">
<option value="0">@lang('search.order_by')</option>
@foreach($order_by_options as $order_by)
<option value="{{ $order_by }}"

8
resources/views/app/settings/partials/system/cron.blade.php
View File

@ -12,11 +12,9 @@
<input type="text" class="cron-token-input form-control" value="{{ systemsettings('cron_token') }}"
readonly aria-readonly="true" aria-label="@lang('settings.cron_token_generate')"
aria-describedby="cron-token-generate">
<div class="input-group-append">
<button class="cron-token-generate btn btn-outline-danger" type="button">
<x-icon.recycle class="me-1"/> @lang('settings.cron_token_generate')
</button>
</div>
<button class="cron-token-generate btn btn-outline-danger" type="button">
<x-icon.recycle class="me-1"/> @lang('settings.cron_token_generate')
</button>
</div>
<p class="cron-token-generate-failure small text-danger" style="display:none">

6
resources/views/app/settings/partials/system/general-settings.blade.php
View File

@ -10,7 +10,7 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="system_page_title">
@lang('settings.sys_page_title')
</label>
@ -26,7 +26,7 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="system_guest_access">
@lang('settings.sys_guest_access')
</label>
@ -54,7 +54,7 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="system_custom_header_content">@lang('settings.sys_custom_header_content')</label>
<textarea name="system_custom_header_content" id="system_custom_header_content" rows="4"

10
resources/views/app/settings/partials/system/guest-settings.blade.php
View File

@ -12,12 +12,12 @@
<div class="row mt-4">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="guest_listitem_count">
@lang('settings.listitem_count')
</label>
<select id="guest_listitem_count" name="guest_listitem_count"
class="custom-select{{ $errors->has('guest_listitem_count') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('guest_listitem_count') ? ' is-invalid' : '' }}">
@foreach(config('linkace.listitem_count_values') as $item_count)
<option value="{{ $item_count }}"
@if(systemsettings('guest_listitem_count') == $item_count) selected @endif>
@ -35,12 +35,12 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="guest_link_display_mode">
@lang('settings.display_mode')
</label>
<select id="guest_link_display_mode" name="guest_link_display_mode"
class="custom-select{{ $errors->has('guest_link_display_mode') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('guest_link_display_mode') ? ' is-invalid' : '' }}">
<option value="{{ Link::DISPLAY_LIST_DETAILED }}"
@if((int)systemsettings()->get('guest_link_display_mode') === Link::DISPLAY_LIST_DETAILED)
selected
@ -73,7 +73,7 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="guest_links_new_tab">
@lang('settings.links_new_tab')
</label>

4
resources/views/app/settings/partials/system/guest/dark-mode.blade.php
View File

@ -1,4 +1,4 @@
<div class="form-group my-5">
<div class="mb-3 my-5">
<h5>
@lang('settings.darkmode')
@ -10,7 +10,7 @@
<div class="col-12 col-sm-8 col-md-6">
<select id="guest_darkmode_setting" name="guest_darkmode_setting"
class="custom-select{{ $errors->has('guest_darkmode_setting') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('guest_darkmode_setting') ? ' is-invalid' : '' }}">
<option value="0"
@if(systemsettings('guest_darkmode_setting') === '0') selected @endif>
@lang('settings.darkmode_disabled')

2
resources/views/app/settings/partials/system/guest/sharing.blade.php
View File

@ -1,4 +1,4 @@
<div class="form-group my-5">
<div class="mb-3 my-5">
<h5>
@lang('settings.sharing')

4
resources/views/app/settings/partials/user/account-settings.blade.php
View File

@ -7,7 +7,7 @@
<form action="{{ route('save-settings-account') }}" method="POST">
@csrf
<div class="form-group">
<div class="mb-3">
<label for="username">
@lang('user.username')
</label>
@ -21,7 +21,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="email">
@lang('user.email')
</label>

8
resources/views/app/settings/partials/user/api.blade.php
View File

@ -10,11 +10,9 @@
<input type="text" class="api-token-input form-control" value="{{ auth()->user()->api_token ?? '' }}"
readonly aria-readonly="true" aria-label="@lang('settings.api_token_generate')"
aria-describedby="api-token-generate">
<div class="input-group-append">
<button class="api-token-generate btn btn-outline-danger" type="button">
<x-icon.recycle class="me-1"/> @lang('settings.api_token_generate')
</button>
</div>
<button class="api-token-generate btn btn-outline-danger" type="button">
<x-icon.recycle class="me-1"/> @lang('settings.api_token_generate')
</button>
</div>
<p class="api-token-generate-failure small text-danger d-none">

24
resources/views/app/settings/partials/user/app-settings.blade.php
View File

@ -10,7 +10,7 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="locale">
@lang('settings.language')
</label>
@ -33,7 +33,7 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="timezone">
@lang('settings.timezone')
</label>
@ -59,12 +59,12 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="date_format">
@lang('settings.date_format')
</label>
<select id="date_format" name="date_format"
class="custom-select{{ $errors->has('date_format') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('date_format') ? ' is-invalid' : '' }}">
@foreach(config('linkace.formats.date') as $date_format)
<option value="{{ $date_format }}"
@if($user->settings()->get('date_format') === $date_format) selected @endif>
@ -82,12 +82,12 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="time_format">
@lang('settings.time_format')
</label>
<select id="time_format" name="time_format"
class="custom-select{{ $errors->has('time_format') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('time_format') ? ' is-invalid' : '' }}">
@foreach(config('linkace.formats.time') as $time_format)
<option value="{{ $time_format }}"
@if($user->settings()->get('time_format') === $time_format) selected @endif>
@ -108,12 +108,12 @@
<div class="row mt-4">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="listitem_count">
@lang('settings.listitem_count')
</label>
<select id="listitem_count" name="listitem_count"
class="custom-select{{ $errors->has('listitem_count') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('listitem_count') ? ' is-invalid' : '' }}">
@foreach(config('linkace.listitem_count_values') as $item_count)
<option value="{{ $item_count }}"
@if($user->settings()->get('listitem_count') == $item_count) selected @endif>
@ -131,12 +131,12 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="link_display_mode">
@lang('settings.display_mode')
</label>
<select id="link_display_mode" name="link_display_mode"
class="custom-select{{ $errors->has('link_display_mode') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('link_display_mode') ? ' is-invalid' : '' }}">
<option value="{{ Link::DISPLAY_LIST_DETAILED }}"
@if((int)$user->settings()->get('link_display_mode') === Link::DISPLAY_LIST_DETAILED)
selected
@ -169,7 +169,7 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="links_new_tab">
@lang('settings.links_new_tab')
</label>
@ -192,7 +192,7 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="links_new_tab">
@lang('settings.markdown_for_text')
</label>

10
resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php
View File

@ -1,4 +1,4 @@
<div class="form-group my-5">
<div class="mb-3 my-5">
<h5>
@lang('settings.archive_backups')
</h5>
@ -8,12 +8,12 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="archive_backups_enabled">
@lang('settings.archive_backups_enabled')
</label>
<select id="archive_backups_enabled" name="archive_backups_enabled"
class="custom-select{{ $errors->has('archive_backups_enabled') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('archive_backups_enabled') ? ' is-invalid' : '' }}">
<option value="1"
@if($user->settings()->get('archive_backups_enabled') === '1') selected @endif>
@lang('linkace.yes')
@ -34,13 +34,13 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="archive_private_backups_enabled">
@lang('settings.archive_private_backups_enabled')
</label>
<select id="archive_private_backups_enabled"
name="archive_private_backups_enabled"
class="custom-select{{ $errors->has('archive_private_backups_enabled') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('archive_private_backups_enabled') ? ' is-invalid' : '' }}">
<option value="1"
@if($user->settings()->get('archive_private_backups_enabled') === '1') selected @endif>
@lang('linkace.yes')

4
resources/views/app/settings/partials/user/app-settings/dark-mode.blade.php
View File

@ -1,4 +1,4 @@
<div class="form-group my-5">
<div class="mb-3 my-5">
<h5>
@lang('settings.darkmode')
@ -10,7 +10,7 @@
<div class="col-12 col-sm-8 col-md-6">
<select id="darkmode_setting" name="darkmode_setting"
class="custom-select{{ $errors->has('darkmode_setting') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('darkmode_setting') ? ' is-invalid' : '' }}">
<option value="0"
@if($user->settings()->get('darkmode_setting') === '0') selected @endif>
@lang('settings.darkmode_disabled')

18
resources/views/app/settings/partials/user/app-settings/privacy.blade.php
View File

@ -1,4 +1,4 @@
<div class="form-group my-5">
<div class="mb-3 my-5">
<h5>
@lang('settings.privacy')
</h5>
@ -6,12 +6,12 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="links_private_default">
@lang('settings.links_private_default')
</label>
<select id="links_private_default" name="links_private_default"
class="custom-select{{ $errors->has('links_private_default') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('links_private_default') ? ' is-invalid' : '' }}">
<option value="0"
@if($user->settings()->get('links_private_default') === '0') selected @endif>
@lang('linkace.no')
@ -32,12 +32,12 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="notes_private_default">
@lang('settings.notes_private_default')
</label>
<select id="notes_private_default" name="notes_private_default"
class="custom-select{{ $errors->has('notes_private_default') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('notes_private_default') ? ' is-invalid' : '' }}">
<option value="0"
@if($user->settings()->get('notes_private_default') === '0') selected @endif>
@lang('linkace.no')
@ -61,12 +61,12 @@
<div class="row">
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="lists_private_default">
@lang('settings.lists_private_default')
</label>
<select id="lists_private_default" name="lists_private_default"
class="custom-select{{ $errors->has('lists_private_default') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('lists_private_default') ? ' is-invalid' : '' }}">
<option value="0"
@if($user->settings()->get('lists_private_default') === '0') selected @endif>
@lang('linkace.no')
@ -87,12 +87,12 @@
</div>
<div class="col-12 col-sm-8 col-md-6">
<div class="form-group">
<div class="mb-3">
<label for="tags_private_default">
@lang('settings.tags_private_default')
</label>
<select id="tags_private_default" name="tags_private_default"
class="custom-select{{ $errors->has('tags_private_default') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('tags_private_default') ? ' is-invalid' : '' }}">
<option value="0"
@if($user->settings()->get('tags_private_default') === '0') selected @endif>
@lang('linkace.no')

2
resources/views/app/settings/partials/user/app-settings/sharing.blade.php
View File

@ -1,4 +1,4 @@
<div class="form-group my-5">
<div class="mb-3 my-5">
<h5>
@lang('settings.sharing')

6
resources/views/app/settings/partials/user/change-pw.blade.php
View File

@ -8,7 +8,7 @@
<form action="{{ route('change-user-password') }}" method="POST">
@csrf
<div class="form-group">
<div class="mb-3">
<label for="old_password">
@lang('settings.old_password')
</label>
@ -16,7 +16,7 @@
class="form-control{{ $errors->has('current_password') ? ' is-invalid' : '' }}">
</div>
<div class="form-group">
<div class="mb-3">
<label for="new_password">
@lang('settings.new_password')
</label>
@ -24,7 +24,7 @@
class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}">
</div>
<div class="form-group">
<div class="mb-3">
<label for="new_password_confirmation">
@lang('settings.new_password2')
</label>

2
resources/views/auth/confirm-password.blade.php
View File

@ -17,7 +17,7 @@
aria-label="@lang('auth.confirm_title')">
@csrf
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">

10
resources/views/auth/login.blade.php
View File

@ -17,7 +17,7 @@
<form method="POST" action="{{ route('login') }}" aria-label="@lang('linkace.login')">
@csrf
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">
@ -37,7 +37,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">
@ -58,12 +58,12 @@
<div class="row mt-4">
<div class="col-8">
<div class="custom-control custom-checkbox pt-1">
<div class="form-check pt-1">
<input type="hidden" name="remember_me" value="0">
<input type="checkbox" class="custom-control-input" id="remember_me"
<input type="checkbox" class="form-check-input" id="remember_me"
@if(old('remember_me')) checked @endif>
<label class="custom-control-label" for="remember_me">
<label class="form-check-label" for="remember_me">
@lang('linkace.remember_me')
</label>
</div>

2
resources/views/auth/passwords/email.blade.php
View File

@ -21,7 +21,7 @@
aria-label="@lang('linkace.reset_password')">
@csrf
<div class="form-group">
<div class="mb-3">
<label for="email">@lang('linkace.email')</label>
<div class="control">
<input name="email" id="email"

6
resources/views/auth/passwords/reset.blade.php
View File

@ -17,7 +17,7 @@
<input type="hidden" name="token" value="{{ request()->route('token') }}">
<div class="form-group">
<div class="mb-3">
<label for="email">@lang('linkace.email')</label>
<div class="control">
<input name="email" id="email"
@ -33,7 +33,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="password">@lang('linkace.password')</label>
<div class="control">
<input name="password" id="password"
@ -48,7 +48,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="password-confirm">@lang('linkace.password_confirm')</label>
<div class="control">
<input name="password_confirmation" id="password-confirm"

6
resources/views/auth/two-factor-challenge.blade.php
View File

@ -16,7 +16,7 @@
<form method="POST" action="{{ url('/two-factor-challenge') }}">
@csrf
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">
@ -43,13 +43,13 @@
</div>
<button type="button" class="btn btn-sm btn-outline-primary"
data-bs-toggle="collapse" data-target="#recovery-code"
data-bs-toggle="collapse" data-bs-target="#recovery-code"
aria-expanded="false" aria-controls="recovery-code">
@lang('auth.two_factor_with_recovery')
</button>
<div class="collapse mt-3" id="recovery-code">
<div class="form-group">
<div class="mb-3">
<div class="input-group mb-3">
<div class="input-group-prepend">
<div class="input-group-text">

26
resources/views/dashboard.blade.php
View File

@ -27,11 +27,9 @@
class="form-control{{ $errors->has('url') ? ' is-invalid' : '' }}"
placeholder="@lang('link.url')" value="{{ old('url') }}"
aria-label="@lang('link.url')">
<div class="input-group-append">
<button class="btn btn-primary" type="submit">
<x-icon.plus class="me-2"/> @lang('linkace.add')
</button>
</div>
<button class="btn btn-primary" type="submit">
<x-icon.plus class="me-2"/> @lang('linkace.add')
</button>
</div>
@if ($errors->has('url'))
@ -61,14 +59,12 @@
<label for="query" class="visually-hidden">@lang('search.query')</label>
<div class="input-group">
<input type="text" name="query" id="query" autofocus required minlength="1"
<input type="text" name="query" id="query" required minlength="1"
class="form-control" placeholder="@lang('search.query')">
<div class="input-group-append">
<button class="btn btn-primary" type="submit">
<x-icon.search class="me-2"/>
@lang('search.search')
</button>
</div>
<button class="btn btn-primary" type="submit">
<x-icon.search class="me-2"/>
@lang('search.search')
</button>
</div>
</form>
@ -153,8 +149,7 @@
<div class="card-body">
@forelse($recent_lists as $list)
<a href="{{ route('lists.show', [$list->id]) }}"
class="badge bg-light text-dark badge-lg badge-wrap text-decoration-none">
<a href="{{ route('lists.show', [$list->id]) }}" class="btn btn-light btn-sm">
{{ $list->name }}
</a>
@empty
@ -175,8 +170,7 @@
<div class="card-body">
@forelse($recent_tags as $tag)
<a href="{{ route('tags.show', [$tag->id]) }}"
class="badge bg-light text-dark badge-lg badge-wrap text-decoration-none">
<a href="{{ route('tags.show', [$tag->id]) }}" class="btn btn-light btn-sm">
{{ $tag->name }}
</a>
@empty

2
resources/views/guest/links/partials/single-detailed.blade.php
View File

@ -10,7 +10,7 @@
</div>
<div class="ms-auto text-right">
<button type="button" class="btn btn-xs btn-outline-secondary" title="@lang('sharing.share_link')"
data-bs-toggle="collapse" data-target="#sharing-{{ $link->id }}"
data-bs-toggle="collapse" data-bs-target="#sharing-{{ $link->id }}"
aria-expanded="false" aria-controls="sharing-{{ $link->id }}">
<x-icon.share class="fw"/>
</button>

2
resources/views/guest/links/partials/single.blade.php
View File

@ -9,7 +9,7 @@
</div>
<div class="ms-auto text-right">
<button type="button" class="btn btn-xs btn-outline-primary" title="@lang('sharing.share_link')"
data-bs-toggle="collapse" data-target="#sharing-{{ $link->id }}"
data-bs-toggle="collapse" data-bs-target="#sharing-{{ $link->id }}"
aria-expanded="false" aria-controls="sharing-{{ $link->id }}">
<x-icon.share class="fw"/>
</button>

14
resources/views/models/links/edit.blade.php
View File

@ -14,7 +14,7 @@
<input type="hidden" name="link_id" value="{{ $link->id }}">
<div class="form-group">
<div class="mb-3">
<label class="label" for="url">@lang('link.url')</label>
<input name="url" id="url" type="url" data-ignore-id="{{ $link->id }}"
class="form-control form-control-lg{{ $errors->has('url') ? ' is-invalid' : '' }}"
@ -34,7 +34,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
<div class="form-group">
<div class="mb-3">
<label class="label" for="title">@lang('link.title')</label>
<input name="title" id="title"
class="form-control{{ $errors->has('title') ? ' is-invalid' : '' }}"
@ -47,7 +47,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="description">@lang('link.description')</label>
<textarea name="description" id="description" rows="4" class="form-control"
>{{ old('description') ?: $link->description }}</textarea>
@ -62,7 +62,7 @@
</div>
<div class="col-12 col-sm-6 col-md-5">
<div class="form-group">
<div class="mb-3">
<label for="lists">@lang('list.lists')</label>
<input name="lists" id="lists" type="text" placeholder="@lang('placeholder.list_select')"
class="tags-select" value="{{ old('lists', $link->listsForInput()) }}"
@ -75,7 +75,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="tags">@lang('tag.tags')</label>
<input name="tags" id="tags" type="text" placeholder="@lang('placeholder.tags_select')"
class="tags-select" value="{{ old('tags', $link->tagsForInput()) }}"
@ -88,10 +88,10 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="is_private">@lang('linkace.is_private')</label>
<select id="is_private" name="is_private"
class="custom-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
<option value="0" @if($link->is_private === false) selected @endif>
@lang('linkace.no')
</option>

2
resources/views/models/links/index.blade.php
View File

@ -40,7 +40,7 @@
</section>
@if($links->isNotEmpty())
{!! $links->onEachSide(1)->appends(['orderBy' => $orderBy, 'orderDir' => $orderDir])->links() !!}
{!! $links->onEachSide(1)->withQueryString()->links() !!}
@endif
@endsection

20
resources/views/models/links/partials/create-form.blade.php
View File

@ -7,7 +7,7 @@
<form action="{{ route('links.store') }}" method="POST">
@csrf
<div class="form-group">
<div class="mb-3">
<label class="label" for="url">@lang('link.url')</label>
<input name="url" id="url" type="url"
class="form-control form-control-lg{{ $errors->has('url') || $existing_link ? ' is-invalid' : '' }}"
@ -29,7 +29,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
<div class="form-group">
<div class="mb-3">
<label class="label" for="title">@lang('link.title')</label>
<input name="title" id="title"
class="form-control{{ $errors->has('title') ? ' is-invalid' : '' }}"
@ -42,7 +42,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="description">@lang('link.description')</label>
<textarea name="description" id="description" rows="4" class="form-control"
>{{ old('description') ?: $bookmark_description ?? '' }}</textarea>
@ -57,7 +57,7 @@
</div>
<div class="col-12 col-sm-6 col-md-5">
<div class="form-group">
<div class="mb-3">
<label for="lists">@lang('list.lists')</label>
<input name="lists" id="lists" type="text" placeholder="@lang('placeholder.list_select')"
class="tags-select" value="{{ old('lists', $bookmark_lists ?? null) }}" data-tag-type="lists">
@ -69,7 +69,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="tags">@lang('tag.tags')</label>
<input name="tags" id="tags" type="text" placeholder="@lang('placeholder.tags_select')"
class="tags-select" value="{{ old('tags', $bookmark_tags ?? null) }}" data-tag-type="tags">
@ -86,10 +86,10 @@
</div>
</div>
<div class="form-group">
<div class="mb-3">
<label for="is_private">@lang('linkace.is_private')</label>
<select id="is_private" name="is_private"
class="custom-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
<option value="0">
@lang('linkace.no')
</option>
@ -111,10 +111,10 @@
<div class="mt-3 d-sm-flex align-items-center justify-content-end">
@if(!isset($bookmark_url))
<div class="custom-control custom-checkbox mb-3 mb-sm-0 me-sm-4">
<input class="custom-control-input" type="checkbox" id="reload_view" name="reload_view"
<div class="form-check mb-3 mb-sm-0 me-sm-4">
<input class="form-check-input" type="checkbox" id="reload_view" name="reload_view"
@if(session('reload_view')) checked @endif>
<label class="custom-control-label" for="reload_view">
<label class="form-check-label" for="reload_view">
@lang('linkace.continue_adding')
</label>
</div>

2
resources/views/models/links/partials/index-order-dropdown.blade.php
View File

@ -1,5 +1,5 @@
<button type="button" id="link-index-order-dd"
class="btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split"
class="btn btn-sm btn-outline-primary dropdown-toggle dropdown-toggle-split"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@lang('search.order_by') <x-icon.caret-down class="ml-1"/>
</button>

26
resources/views/models/links/partials/single-card.blade.php
View File

@ -3,26 +3,26 @@
<div class="card-body h-100 border-bottom-0">
<div class="d-flex align-items-top">
<div class="me-2">
@if($link->is_private)
<span>
<div>
{!! $link->getIcon('me-1') !!}
<a href="{{ $link->url }}" {!! linkTarget() !!} class="text-decoration-none">{{ $link->title }}</a>
</div>
<div>
@if($link->is_private)
<x-icon.lock class="me-1" title="@lang('link.private')"/>
<span class="visually-hidden">@lang('link.private')</span>
</span>
@endif
{!! $link->getIcon('me-1') !!}
<a href="{{ $link->url }}" {!! linkTarget() !!}>
{{ $link->shortTitle() }}
</a>
<div class="mt-2 small text-muted">{{ $link->shortUrl() }}</div>
@else
<x-icon.unlock class="invisible me-1"/>
@endif
<small class="text-muted">{{ $link->shortUrl() }}</small>
</div>
</div>
</div>
</div>
<div class="card-footer">
<div>
<small class="text-muted">
@lang('linkace.added') {!! $link->addedAt() !!}
</small>
<div class="text-muted text-xs">
@lang('linkace.added') {!! $link->addedAt() !!}
</div>
<div class="btn-group w-100 mt-2 small">

34
resources/views/models/links/partials/single-detailed.blade.php
View File

@ -4,27 +4,31 @@
<div class="d-flex align-items-top flex-wrap flex-md-nowrap">
@if($link->thumbnail)
<div class="d-flex justify-content-center me-2 mb-2 mb-md-0 link-thumbnail-list-holder">
<a href="{{ $link->url }}" {!! linkTarget() !!} class="rounded d-block link-thumbnail link-thumbnail-list"
<a href="{{ $link->url }}"
{!! linkTarget() !!} class="rounded d-block link-thumbnail link-thumbnail-list"
style="background-image: url('{{ $link->thumbnail }}');">
</a>
</div>
@endif
<div class="me-2 mw-100">
@if($link->is_private)
<span>
<div>
{!! $link->getIcon('me-1') !!}
<a href="{{ $link->url }}" {!! linkTarget() !!} class="text-decoration-none">{{ $link->title }}</a>
</div>
<div>
@if($link->is_private)
<x-icon.lock class="me-1" title="@lang('link.private')"/>
<span class="visually-hidden">@lang('link.private')</span>
</span>
@endif
{!! $link->getIcon('me-1') !!}
<a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
<br>
<small class="text-muted">{{ $link->shortUrl() }}</small>
@else
<x-icon.unlock class="invisible me-1"/>
@endif
<small class="text-muted">{{ $link->shortUrl() }}</small>
</div>
</div>
@if(getShareLinks($link) !== '')
<div class="ms-auto text-right">
<button type="button" class="btn btn-xs btn-outline-secondary" title="@lang('sharing.share_link')"
data-bs-toggle="collapse" data-target="#sharing-{{ $link->id }}"
data-bs-toggle="collapse" data-bs-target="#sharing-{{ $link->id }}"
aria-expanded="false" aria-controls="sharing-{{ $link->id }}">
<x-icon.share class="fw"/>
<span class="visually-hidden">@lang('sharing.share_link')</span>
@ -52,7 +56,7 @@
@if($link->tags->count() > 0)
<label class="small mb-0">@lang('tag.tags'):</label>
@foreach($link->tags as $tag)
<a href="{{ route('tags.show', [$tag->id]) }}" class="badge badge-light">
<a href="{{ route('tags.show', [$tag->id]) }}" class="btn btn-light btn-xs">
{{ $tag->name }}
</a>
@endforeach
@ -63,22 +67,22 @@
</div>
<div class="col-12 col-sm-6 d-sm-flex align-items-sm-center justify-content-sm-end flex-wrap">
<div class="small text-muted mt-3 mt-sm-0">
<div class="text-xs text-muted mt-3 mt-sm-0">
@lang('linkace.added') {!! $link->addedAt() !!}
</div>
<div class="btn-group mt-1 ms-md-2">
<a href="{{ route('links.show', [$link->id]) }}" class="btn btn-xs btn-outline-secondary"
<a href="{{ route('links.show', [$link->id]) }}" class="btn btn-xs btn-light"
title="@lang('link.show')">
<x-icon.info class="fw"/> @lang('link.show')
</a>
<a href="{{ route('links.edit', [$link->id]) }}" class="btn btn-xs btn-outline-secondary"
<a href="{{ route('links.edit', [$link->id]) }}" class="btn btn-xs btn-light"
title="@lang('link.edit')">
<x-icon.edit class="fw"/> @lang('link.edit')
</a>
<a href="#" title="@lang('link.delete')" class="btn btn-xs btn-outline-secondary"
<a href="#" title="@lang('link.delete')" class="btn btn-xs btn-light"
onclick="event.preventDefault();document.getElementById('link-delete-{{ $link->id }}').submit();">
<x-icon.trash class="fw"/> @lang('link.delete')
</a>

2
resources/views/models/links/partials/single-simple.blade.php
View File

@ -1,7 +1,7 @@
<li class="list-group-item">
<div class="d-sm-flex align-items-center">
<div class="me-3 one-line-sm">
<a href="{{ $link->url }}" title="{{ $link->url }}" {!! linkTarget() !!}>
<a href="{{ $link->url }}" title="{{ $link->url }}" {!! linkTarget() !!} class="text-decoration-none">
@if($link->is_private)
<span>
<x-icon.lock class="me-1" title="@lang('link.private')"/>

18
resources/views/models/links/partials/single-table.blade.php
View File

@ -1,7 +1,7 @@
<tr>
<td>
<div>
<a href="{{ route('links.show', [$link->id]) }}">
<a href="{{ route('links.show', [$link]) }}" class="text-decoration-none">
{{ $link->title }}
</a>
@if($link->is_private)
@ -15,7 +15,7 @@
<div class="mt-1">
<label class="small mb-0">@lang('tag.tags'):</label>
@foreach($link->tags as $tag)
<a href="{{ route('tags.show', [$tag->id]) }}" class="badge badge-light">
<a href="{{ route('tags.show', [$tag]) }}" class="btn btn-xs btn-light">
{{ $tag->name }}
</a>
@endforeach
@ -23,7 +23,7 @@
@endif
</td>
<td>
<a href="{{ $link->url }}" {!! linkTarget() !!}>
<a href="{{ $link->url }}" {!! linkTarget() !!} class="text-decoration-none">
{{ $link->shortUrl() }}
</a>
</td>
@ -33,18 +33,18 @@
@if(!isset($hide_edit))
<td class="text-right">
<div class="btn-group btn-group-xs">
<a href="{{ route('links.edit', [$link->id]) }}" class="btn btn-outline-secondary">
<a href="{{ route('links.edit', [$link]) }}" class="btn btn-outline-secondary">
<x-icon.edit/>
<span class="visually-hidden">@lang('link.edit')</span>
</a>
<a href="#" title=" @lang('link.delete')" class="btn btn-outline-secondary"
onclick="event.preventDefault();document.getElementById('link-delete-{{ $link->id }}').submit();">
<button type="submit" form="link-delete-{{ $link->id }}" title="@lang('link.delete')"
class="btn btn-outline-secondary">
<x-icon.trash/>
<span class="visually-hidden">@lang('link.delete')</span>
</a>
</button>
</div>
<form id="link-delete-{{ $link->id }}" method="POST" style="display: none;"
action="{{ route('links.destroy', [$link->id]) }}">
<form id="link-delete-{{ $link->id }}" method="POST" class="d-none"
action="{{ route('links.destroy', [$link]) }}">
@method('DELETE')
@csrf
<input type="hidden" name="link_id" value="{{ $link->id }}">

11
resources/views/models/links/show.blade.php
View File

@ -21,7 +21,8 @@
@endif
</div>
<h3 class="d-inline-block mb-0">
<a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
<a href="{{ $link->url }}" {!! linkTarget() !!} class="text-decoration-none"
>{{ $link->title }}</a>
</h3>
</div>
@ -53,7 +54,7 @@
<div class="col-12 col-md-4">
<div class="btn-group btn-block mb-3 mt-4 mt-md-0">
<div class="btn-group w-100 mb-3 mt-4 mt-md-0">
<a href="{{ route('links.edit', [$link->id]) }}" class="btn btn-sm btn-primary"
aria-label="@lang('link.edit')">
<x-icon.edit class="me-2"/>
@ -73,7 +74,7 @@
</form>
<div class="mb-3">
<a href="{{ waybackLink($link) }}" class="btn btn-sm btn-block btn-outline-warning" target="_blank">
<a href="{{ waybackLink($link) }}" class="btn btn-sm w-100 btn-outline-info" target="_blank">
@lang('link.wayback')
</a>
</div>
@ -120,7 +121,7 @@
<div class="card-body py-2">
@if(!$link->lists->isEmpty())
@foreach($link->lists as $list)
<a href="{{ route('lists.show', [$list->id]) }}" class="badge badge-primary badge-pill">
<a href="{{ route('lists.show', [$list->id]) }}" class="btn btn-sm btn-light">
{{ $list->name }}
</a>
@endforeach
@ -138,7 +139,7 @@
<div class="card-body py-2">
@if(!$link->tags->isEmpty())
@foreach($link->tags as $tag)
<a href="{{ route('tags.show', [$tag->id]) }}" class="badge badge-primary badge-pill">
<a href="{{ route('tags.show', [$tag->id]) }}" class="btn btn-sm btn-light">
{{ $tag->name }}
</a>
@endforeach

14
resources/views/models/lists/create.blade.php
View File

@ -11,7 +11,7 @@
<form action="{{ route('lists.store') }}" method="POST">
@csrf
<div class="form-group">
<div class="mb-3">
<label for="name">@lang('list.name')</label>
<input name="name" id="name"
@ -28,7 +28,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
<div class="form-group">
<div class="mb-3">
<label for="description">@lang('list.description')</label>
<textarea name="description" id="description" rows="4"
@ -43,11 +43,11 @@
</div>
</div>
<div class="col-12 col-sm-6 col-md-5">
<div class="form-group">
<div class="mb-3">
<label for="is_private">@lang('linkace.is_private')</label>
<select id="is_private" name="is_private"
class="custom-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
<option value="0">@lang('linkace.no')</option>
<option value="1" @if(usersettings('lists_private_default') === '1') selected @endif>
@lang('linkace.yes')
@ -65,10 +65,10 @@
<div class="mt-3 d-sm-flex align-items-center justify-content-end">
<div class="custom-control custom-checkbox mb-3 mb-sm-0 me-sm-4">
<input class="custom-control-input" type="checkbox" id="reload_view" name="reload_view"
<div class="form-check mb-3 mb-sm-0 me-sm-4">
<input class="form-check-input" type="checkbox" id="reload_view" name="reload_view"
@if(session('reload_view')) checked @endif>
<label class="custom-control-label" for="reload_view">
<label class="form-check-label" for="reload_view">
@lang('linkace.continue_adding')
</label>
</div>

8
resources/views/models/lists/edit.blade.php
View File

@ -14,7 +14,7 @@
<input type="hidden" name="list_id" value="{{ $list->id }}">
<div class="form-group">
<div class="mb-3">
<label for="name">@lang('list.name')</label>
<input name="name" id="name"
@ -31,7 +31,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
<div class="form-group">
<div class="mb-3">
<label for="description">@lang('list.description')</label>
<textarea name="description" id="description" rows="4"
@ -46,11 +46,11 @@
</div>
</div>
<div class="col-12 col-sm-6 col-md-5">
<div class="form-group">
<div class="mb-3">
<label for="is_private">@lang('linkace.is_private')</label>
<select id="is_private" name="is_private"
class="custom-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
<option value="0" @if($list->is_private === 0) selected @endif>
@lang('linkace.no')
</option>

18
resources/views/models/lists/index.blade.php
View File

@ -7,21 +7,19 @@
@lang('list.lists')
</h3>
<div class="form-group mb-0 ms-auto">
<div class="mb-0 ms-auto">
<form action="{{ route('lists.index') }}" method="GET" class="d-flex flex-column flex-sm-row">
<div class="input-group input-group-sm mb-1 mb-sm-0">
<label for="filter" class="visually-hidden">@lang('list.filter_lists')</label>
<label for="filter" class="visually-hidden">@lang('list.filter_lists')</label>
<div class="input-group input-group-sm mb-1 mb-sm-0 me-sm-2">
<input type="text" name="filter" id="filter" minlength="1"
class="form-control" placeholder="@lang('list.filter_lists')"
value="{{ request()->input('filter') }}"/>
<a href="{{ route('lists.index') }}" class="btn btn-sm bg-secondary">
<a href="{{ route('lists.index') }}" class="btn btn-sm btn-outline-warning">
<x-icon.ban/>
</a>
<div class="input-group-append me-sm-2">
<button class="btn btn-primary" type="submit" title="@lang('list.filter_lists')">
<x-icon.search/>
</button>
</div>
<button class="btn btn-primary" type="submit" title="@lang('list.filter_lists')">
<x-icon.search/>
</button>
</div>
<div class="btn-group ms-auto ms-sm-0 flex-sm-shrink-0">
<a href="{{ route('lists.create') }}" class="btn btn-sm btn-primary" aria-label="@lang('list.add')">
@ -52,7 +50,7 @@
@endif
@if($lists->isNotEmpty())
{!! $lists->onEachSide(1)->appends(['orderBy' => $orderBy, 'orderDir' => $orderDir])->links() !!}
{!! $lists->onEachSide(1)->withQueryString()->links() !!}
@endif
@endsection

2
resources/views/models/lists/partials/index-order-dropdown.blade.php
View File

@ -1,5 +1,5 @@
<button type="button" id="list-index-order-dd"
class="btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split"
class="btn btn-sm btn-outline-primary dropdown-toggle dropdown-toggle-split"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@lang('search.order_by') <x-icon.caret-down class="ml-1"/>
</button>

7
resources/views/models/lists/partials/single.blade.php
View File

@ -9,7 +9,7 @@
<span class="visually-hidden">@lang('list.private')</span>
</span>
@endif
<a href="{{ route('lists.show', [$list->id]) }}">{{ $list->name }}</a>
<a href="{{ route('lists.show', [$list->id]) }}" class="text-decoration-none">{{ $list->name }}</a>
</div>
</div>
</div>
@ -33,9 +33,8 @@
<x-icon.edit/>
<span class="visually-hidden">@lang('list.edit')</span>
</a>
<a href="#"
onclick="event.preventDefault();document.getElementById('list-delete-{{ $list->id }}').submit();"
title=" @lang('list.delete')" class="card-link cursor-pointer">
<a href="#" title="@lang('list.delete')" class="card-link cursor-pointer"
onclick="event.preventDefault();document.getElementById('list-delete-{{ $list->id }}').submit();">
<x-icon.trash/>
<span class="visually-hidden">@lang('list.delete')</span>
</a>

8
resources/views/models/notes/edit.blade.php
View File

@ -12,7 +12,7 @@
@method('PATCH')
@csrf
<div class="form-group">
<div class="mb-3">
<label class="label" for="note">@lang('note.note_content')</label>
<textarea name="note" id="note"
class="form-control{{ $errors->has('note') ? ' is-invalid' : '' }}"
@ -27,10 +27,10 @@
<div class="d-flex align-items-center">
<div class="custom-control custom-checkbox ms-auto me-3">
<input class="custom-control-input" type="checkbox" id="is_private" name="is_private" value="1"
<div class="form-check ms-auto me-3">
<input class="form-check-input" type="checkbox" id="is_private" name="is_private" value="1"
@if($note->is_private) checked @endif>
<label class="custom-control-label" for="is_private">
<label class="form-check-label" for="is_private">
<small>@lang('note.private')</small>
</label>
</div>

8
resources/views/models/notes/partials/create.blade.php
View File

@ -9,7 +9,7 @@
<input type="hidden" name="link_id" value="{{ $link->id }}">
<div class="form-group mb-2">
<div class="mb-2">
<textarea name="note" id="note"
class="form-control{{ $errors->has('note') ? ' is-invalid' : '' }}"
title="@lang('note.note_content')" required>{{ old('note') ?: '' }}</textarea>
@ -23,10 +23,10 @@
<div class="d-flex align-items-center">
<div class="custom-control custom-checkbox ms-auto me-3">
<input class="custom-control-input" type="checkbox" id="is_private" name="is_private" value="1"
<div class="form-check ms-auto me-3">
<input class="form-check-input" type="checkbox" id="is_private" name="is_private" value="1"
@if($link->is_private || usersettings('notes_private_default')) checked @endif>
<label class="custom-control-label" for="is_private">
<label class="form-check-label" for="is_private">
<small>@lang('note.private')</small>
</label>
</div>

4
resources/views/models/notes/partials/single.blade.php
View File

@ -3,8 +3,8 @@
<div class="note-content small">
{!! $note->formatted_note !!}
</div>
<div class="note-meta mt-2 small d-flex align-items-center">
<div class="ms-auto me-2 text-muted">
<div class="note-meta small d-flex align-items-center">
<div class="ms-auto me-2 text-muted text-xs">
@if($note->is_private)
<span>
<x-icon.lock class="me-1" title="@lang('note.private')"/>

12
resources/views/models/tags/create.blade.php
View File

@ -13,7 +13,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
<div class="form-group">
<div class="mb-3">
<label for="name">@lang('tag.name')</label>
<input name="name" id="name"
@ -29,11 +29,11 @@
</div>
</div>
<div class="col-12 col-sm-6 col-md-5">
<div class="form-group">
<div class="mb-3">
<label for="is_private">@lang('linkace.is_private')</label>
<select id="is_private" name="is_private"
class="custom-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
<option value="0">@lang('linkace.no')</option>
<option value="1" @if(usersettings('tags_private_default') === '1') selected @endif>
@lang('linkace.yes')
@ -51,10 +51,10 @@
<div class="mt-3 d-sm-flex align-items-center justify-content-end">
<div class="custom-control custom-checkbox mb-3 mb-sm-0 me-sm-4">
<input class="custom-control-input" type="checkbox" id="reload_view" name="reload_view"
<div class="form-check mb-3 mb-sm-0 me-sm-4">
<input class="form-check-input" type="checkbox" id="reload_view" name="reload_view"
@if(session('reload_view')) checked @endif>
<label class="custom-control-label" for="reload_view">
<label class="form-check-label" for="reload_view">
@lang('linkace.continue_adding')
</label>
</div>

6
resources/views/models/tags/edit.blade.php
View File

@ -16,7 +16,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
<div class="form-group">
<div class="mb-3">
<label for="name">@lang('tag.name')</label>
<input name="name" id="name"
@ -32,11 +32,11 @@
</div>
</div>
<div class="col-12 col-sm-6 col-md-5">
<div class="form-group">
<div class="mb-3">
<label for="is_private">@lang('linkace.is_private')</label>
<select id="is_private" name="is_private"
class="custom-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
<option value="0" @if($tag->is_private === 0) selected @endif>
@lang('linkace.no')
</option>

22
resources/views/models/tags/index.blade.php
View File

@ -7,21 +7,19 @@
@lang('tag.tags')
</h3>
<div class="form-group mb-0 ms-auto">
<div class="mb-0 ms-auto">
<form action="{{ route('tags.index') }}" method="GET" class="d-flex flex-column flex-sm-row">
<div class="input-group input-group-sm mb-1 mb-sm-0">
<label for="filter" class="visually-hidden">@lang('tag.filter_tags')</label>
<label for="filter" class="visually-hidden">@lang('tag.filter_tags')</label>
<div class="input-group input-group-sm mb-1 mb-sm-0 me-sm-2">
<input type="text" name="filter" id="filter" minlength="1"
class="form-control" placeholder="@lang('tag.filter_tags')"
value="{{ request()->input('filter') }}"/>
<a href="{{ route('tags.index') }}" class="btn btn-sm bg-secondary">
<a href="{{ route('tags.index') }}" class="btn btn-sm btn-outline-warning">
<x-icon.ban/>
</a>
<div class="input-group-append me-sm-2">
<button class="btn btn-primary" type="submit" title="@lang('list.filter_lists')">
<x-icon.search/>
</button>
</div>
<button class="btn btn-primary" type="submit" title="@lang('list.filter_lists')">
<x-icon.search/>
</button>
</div>
<div class="btn-group ms-auto ms-sm-0 flex-sm-shrink-0">
<a href="{{ route('tags.create') }}" class="btn btn-sm btn-primary" aria-label="@lang('tag.add')">
@ -39,22 +37,18 @@
<div class="card-table">
@if($tags->isNotEmpty())
@include('models.tags.partials.table')
@else
<div class="alert alert-info m-3">
@lang('linkace.no_results_found', ['model' => trans('tag.tags')])
</div>
@endif
</div>
</div>
@if($tags->isNotEmpty())
{!! $tags->onEachSide(1)->appends(['orderBy' => $orderBy, 'orderDir' => $orderDir, 'filter' => $filter])->links() !!}
{!! $tags->onEachSide(1)->withQueryString()->links() !!}
@endif
@endsection

2
resources/views/models/tags/partials/index-order-dropdown.blade.php
View File

@ -1,5 +1,5 @@
<button type="button" id="tags-index-order-dd"
class="btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split"
class="btn btn-sm btn-outline-primary dropdown-toggle dropdown-toggle-split"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@lang('search.order_by') <x-icon.caret-down class="ml-1"/>
</button>

2
resources/views/models/tags/partials/single.blade.php
View File

@ -6,7 +6,7 @@
<span class="visually-hidden">@lang('tag.private')</span>
</span>
@endif
<a href="{{ route('tags.show', [$tag->id]) }}">
<a href="{{ route('tags.show', [$tag->id]) }}" class="text-decoration-none">
{{ $tag->name }}
</a>
</td>

8
resources/views/setup/account.blade.php
View File

@ -18,7 +18,7 @@
<form action="{{ route('setup.save-account') }}" method="post">
@csrf
<div class="form-group">
<div class="mb-3">
<label for="name">
@lang('setup.account_setup.name')
</label>
@ -34,7 +34,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="email">
@lang('setup.account_setup.email')
</label>
@ -50,7 +50,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="password">
@lang('setup.account_setup.password')
</label>
@ -68,7 +68,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="password_confirmation">
@lang('setup.account_setup.password_confirmed')
</label>

18
resources/views/setup/database.blade.php
View File

@ -18,7 +18,7 @@
<form action="{{ route('setup.save-database') }}" method="POST">
@csrf
<div class="form-group">
<div class="mb-3">
<label for="db_host">
@lang('setup.database.db_host')
</label>
@ -32,7 +32,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="db_port">
@lang('setup.database.db_port')
</label>
@ -46,7 +46,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="db_name">
@lang('setup.database.db_name')
</label>
@ -60,7 +60,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="db_user">
@lang('setup.database.db_user')
</label>
@ -74,7 +74,7 @@
@endif
</div>
<div class="form-group">
<div class="mb-3">
<label for="db_password">
@lang('setup.database.db_password')
</label>
@ -89,13 +89,13 @@
</div>
@if(session('data_present', false))
<div class="form-group">
<div class="custom-control custom-checkbox">
<div class="mb-3">
<div class="form-check">
<input type="hidden" name="overwrite_data" value="0">
<input type="checkbox" class="custom-control-input" id="overwrite_data"
<input type="checkbox" class="form-check-input" id="overwrite_data"
@if(old('overwrite_data')) checked @endif>
<label class="custom-control-label text-danger" for="overwrite_data">
<label class="form-check-label text-danger" for="overwrite_data">
@lang('setup.database.overwrite_data')
</label>
</div>