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

Further small design corrections (#345)

Browse Source
This commit is contained in:
Kovah 2022-01-14 00:10:39 +01:00
parent 04d16ecbb7
commit ebe2398c72
No known key found for this signature in database
GPG Key ID: AAAA031BA9830D7B
19 changed files with 65 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Traits/SearchesLinks.php
View File

@ -39,7 +39,7 @@ trait SearchesLinks
protected function buildDatabaseQuery(SearchRequest $request): Builder
{
// Start building the search
$search = Link::byUser($request->user()->id);
$search = Link::byUser($request->user()->id)->with(['tags']);
// Search for the URL
if ($this->searchQuery = $request->input('query', false)) {

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

@ -16,7 +16,6 @@
</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="btn btn-xs btn-light">
{{ $tag->name }}
@ -26,13 +25,11 @@
@endif
</td>
<td>
<a href="{{ $link->url }}" {!! linkTarget() !!}>
<a href="{{ $link->url }}" {!! linkTarget() !!} class="small">
{{ $link->shortUrl() }}
</a>
</td>
<td class="text-muted">
<small>{!! $link->addedAt() !!}</small>
</td>
<td class="text-muted small">{!! $link->addedAt() !!}</td>
</tr>
@endforeach
</tbody>

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

@ -53,7 +53,7 @@
</details>
</div>
<div class="col text-right">
<div class="col text-end">
<form action="{{ url('/user/two-factor-recovery-codes') }}" method="POST">
@csrf
<button type="submit" class="btn btn-sm btn-outline-primary">

2
resources/views/app/trash/partials/link-table.blade.php
View File

@ -17,7 +17,7 @@
<td class="text-muted">
<small>{{ formatDateTime($link->created_at) }}</small>
</td>
<td class="text-right">
<td class="text-end">
<form action="{{ route('trash-restore') }}" method="post">
@csrf
<input type="hidden" name="model" value="link">

2
resources/views/app/trash/partials/list-table.blade.php
View File

@ -17,7 +17,7 @@
<td class="text-muted">
<small>{{ formatDateTime($list->created_at) }}</small>
</td>
<td class="text-right">
<td class="text-end">
<form action="{{ route('trash-restore') }}" method="post">
@csrf
<input type="hidden" name="model" value="list">

2
resources/views/app/trash/partials/note-table.blade.php
View File

@ -23,7 +23,7 @@
<td class="text-muted">
<small>{{ formatDateTime($note->created_at) }}</small>
</td>
<td class="text-right">
<td class="text-end">
<form action="{{ route('trash-restore') }}" method="post">
@csrf
<input type="hidden" name="model" value="note">

2
resources/views/app/trash/partials/tag-table.blade.php
View File

@ -17,7 +17,7 @@
<td class="text-muted">
<small>{{ formatDateTime($tag->created_at) }}</small>
</td>
<td class="text-right">
<td class="text-end">
<form action="{{ route('trash-restore') }}" method="post">
@csrf
<input type="hidden" name="model" value="tag">

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

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

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

@ -7,7 +7,7 @@
<a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
<small>({{ $link->url }})</small>
</div>
<div class="ms-auto text-right">
<div class="ms-auto text-end">
<button type="button" class="btn btn-xs btn-outline-primary" title="@lang('sharing.share_link')"
data-bs-toggle="collapse" data-bs-target="#sharing-{{ $link->id }}"
aria-expanded="false" aria-controls="sharing-{{ $link->id }}">

33
resources/views/guest/lists/partials/single.blade.php
View File

@ -1,28 +1,21 @@
<div class="col-12 col-sm-6 col-md-4 mb-4">
<div class="h-100 card">
<div class="card-header">
<div class="d-flex align-items-top">
<div class="me-2">
<a href="{{ route('guest.lists.show', [$list->id]) }}"
>{{ $list->name }}</a>
</div>
</div>
<div class="card-body">
<a href="{{ route('guest.lists.show', [$list]) }}">{{ $list->name }}</a>
@if($list->description)
<div class="small mt-2">{{ $list->description }}</div>
@endif
</div>
<ul class="list-group list-group-flush h-100">
<li class="list-group-item h-100 small">
@if($list->description)
<p>{{ $list->description }}</p>
<div class="py-2 px-3">
<div class="text-xs text-muted">
@if($list->links_count > 0)
{{ trans_choice('list.number_links', $list->links_count, ['number' => $list->links_count]) }}
@else
@lang('link.no_links')
@endif
<div class="text-xs text-muted">
@if($list->links_count > 0)
{{ trans_choice('list.number_links', $list->links_count, ['number' => $list->links_count]) }}
@else
@lang('link.no_links')
@endif
</div>
</li>
</ul>
</div>
</div>
</div>
</div>

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

@ -19,11 +19,11 @@
</div>
<div class="d-flex align-items-center">
<div class="text-muted text-xs mr-2 ps-3">
<div class="text-muted text-xs me-3 ps-3">
@lang('linkace.added') {!! $link->addedAt() !!}
</div>
<div class="btn-group ms-auto">
<div class="btn-group ms-auto me-2">
<a href="{{ route('links.show', [$link->id]) }}" class="btn btn-sm btn-link" title="@lang('link.show')">
<x-icon.info class="fw"/>
<span class="visually-hidden">@lang('link.show')</span>

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

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

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

@ -13,7 +13,6 @@
</div>
@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]) }}" class="btn btn-xs btn-light">
{{ $tag->name }}
@ -31,16 +30,16 @@
<small>{!! $link->addedAt() !!}</small>
</td>
@if(!isset($hide_edit))
<td class="text-right">
<div class="btn-group btn-group-xs">
<td class="py-1 text-end">
<div class="btn-group btn-group-sm">
@auth()
<a href="{{ route('links.edit', [$link]) }}" class="btn btn-outline-secondary">
<a href="{{ route('links.edit', [$link]) }}" class="btn btn-link">
<x-icon.edit/>
<span class="visually-hidden">@lang('link.edit')</span>
</a>
@endauth
<button type="submit" form="link-delete-{{ $link->id }}" title="@lang('link.delete')"
class="btn btn-outline-secondary">
class="btn btn-link">
<x-icon.trash/>
<span class="visually-hidden">@lang('link.delete')</span>
</button>

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

@ -14,7 +14,7 @@
<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 btn-outline-warning">
<a href="{{ route('lists.index') }}" class="btn btn-sm btn-outline-primary">
<x-icon.ban/>
</a>
<button class="btn btn-primary" type="submit" title="@lang('list.filter_lists')">

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

@ -1,45 +1,38 @@
<div class="col-12 col-sm-6 col-md-4 mb-4">
<div class="h-100 card">
<div class="card-header">
<div class="d-flex align-items-top">
<div class="me-2">
@if($list->is_private)
<span>
<x-icon.lock class="me-1" title="@lang('list.private')"/>
<span class="visually-hidden">@lang('list.private')</span>
</span>
@endif
<a href="{{ route('lists.show', [$list->id]) }}">{{ $list->name }}</a>
</div>
<div class="card-body">
<div class="d-flex">
@if($list->is_private)
<span>
<x-icon.lock class="me-2" title="@lang('list.private')"/>
<span class="visually-hidden">@lang('list.private')</span>
</span>
@endif
<a href="{{ route('lists.show', [$list->id]) }}">{{ $list->name }}</a>
</div>
@if($list->description)
<div class="small mt-2">{{ $list->description }}</div>
@endif
</div>
<ul class="list-group list-group-flush h-100">
<li class="list-group-item h-100 small">
@if($list->description)
<p>{{ $list->description }}</p>
<div class="d-flex align-items-center">
<div class="text-xs text-muted me-3 ps-3">
@if($list->links_count > 0)
{{ trans_choice('list.number_links', $list->links_count, ['number' => $list->links_count]) }}
@else
@lang('link.no_links')
@endif
<div class="text-xs text-muted">
@if($list->links_count > 0)
{{ trans_choice('list.number_links', $list->links_count, ['number' => $list->links_count]) }}
@else
@lang('link.no_links')
@endif
</div>
</li>
</ul>
<div class="card-footer">
<div class="btn-group w-100">
<a href="{{ route('lists.edit', [$list->id]) }}" class="card-link">
</div>
<div class="btn-group ms-auto me-2">
<a href="{{ route('lists.edit', [$list->id]) }}" class="btn btn-sm btn-link">
<x-icon.edit/>
<span class="visually-hidden">@lang('list.edit')</span>
</a>
<a href="#" title="@lang('list.delete')" class="card-link cursor-pointer"
onclick="event.preventDefault();document.getElementById('list-delete-{{ $list->id }}').submit();">
<button type="submit" form="list-delete-{{ $list->id }}" title="@lang('list.delete')"
class="btn btn-sm btn-link">
<x-icon.trash/>
<span class="visually-hidden">@lang('list.delete')</span>
</a>
</button>
</div>
<form id="list-delete-{{ $list->id }}" method="POST" style="display: none;"

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

@ -13,7 +13,7 @@
@endif
{!! $note->addedAt() !!}
</div>
<div class="text-right">
<div class="text-end">
<div class="btn-group">
<a href="{{ route('notes.edit', [$note->id]) }}" class="btn btn-xs btn-outline-secondary"

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

@ -14,7 +14,7 @@
<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 btn-outline-warning">
<a href="{{ route('tags.index') }}" class="btn btn-sm btn-outline-primary">
<x-icon.ban/>
</a>
<button class="btn btn-primary" type="submit" title="@lang('list.filter_lists')">

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

@ -6,28 +6,28 @@
<span class="visually-hidden">@lang('tag.private')</span>
</span>
@endif
<a href="{{ route('tags.show', [$tag->id]) }}">
<a href="{{ route('tags.show', [$tag]) }}">
{{ $tag->name }}
</a>
</td>
<td>
{{ $tag->links_count }}
</td>
<td class="text-right">
<div class="btn-group btn-group-xs">
<a href="{{ route('tags.edit', [$tag->id]) }}" class="btn btn-outline-secondary">
<td class="py-1 text-end">
<div class="btn-group btn-group-sm">
<a href="{{ route('tags.edit', [$tag]) }}" class="btn btn-link">
<x-icon.edit class="fw"/>
<span class="visually-hidden">@lang('tag.edit')</span>
</a>
<a href="#" title=" @lang('tag.delete')" class="btn btn-outline-secondary"
onclick="event.preventDefault();document.getElementById('tag-delete-{{ $tag->id }}').submit();">
<button type="submit" form="tag-delete-{{ $tag->id }}" title="@lang('tag.delete')"
class="btn btn-link">
<x-icon.trash class="fw"/>
<span class="visually-hidden">@lang('tag.delete')</span>
</a>
</button>
</div>
<form id="tag-delete-{{ $tag->id }}" method="POST" style="display: none;"
action="{{ route('tags.destroy', [$tag->id]) }}">
action="{{ route('tags.destroy', [$tag]) }}">
@method('DELETE')
@csrf
<input type="hidden" name="tag_id" value="{{ $tag->id }}">

5
resources/views/models/tags/show.blade.php
View File

@ -40,13 +40,8 @@
</div>
<div class="card my-3">
<div class="card-header">
@lang('link.links')
</div>
<div class="card-table">
@include('models.links.partials.table', ['links' => $tagLinks])
</div>
</div>