Skip to content

[pull] 2.x from Kovah:2.x #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 7, 2025
Merged

[pull] 2.x from Kovah:2.x #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11cca14
Hide share button for links if no share services are selected (#991)
Kovah Sep 7, 2025
99964f5
2.2.1
Kovah Sep 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkace",
"version": "2.2.0",
"version": "2.2.1",
"description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
"homepage": "https://github.com/Kovah/LinkAce",
"repository": {
Expand Down
18 changes: 10 additions & 8 deletions resources/views/guest/links/partials/single-card.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@
<div class="text-pale text-xs me-3 ps-3 text-condensed">
@lang('linkace.added') {!! $link->addedAt() !!}
</div>
<div class="btn-group ms-auto me-2">
<button type="button" class="btn btn-xs btn-md-sm btn-link" title="@lang('sharing.share_link')"
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>
</button>
</div>
@if($shareLinks !== '')
<div class="btn-group ms-auto me-2">
<button type="button" class="btn btn-xs btn-md-sm btn-link" title="@lang('sharing.share_link')"
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>
</button>
</div>
@endif
</div>

@if($shareLinks !== '')
Expand Down
14 changes: 8 additions & 6 deletions resources/views/guest/links/partials/single-detailed.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ class="btn btn-xs btn-light text-condensed">
<div class="text-xs text-pale mt-3 mt-sm-0 me-3 text-condensed">
@lang('linkace.added') {!! $link->addedAt() !!}
</div>
<button type="button" class="btn btn-xs btn-md-sm btn-link" title="@lang('sharing.share_link')"
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>
</button>
@if($shareLinks !== '')
<button type="button" class="btn btn-xs btn-md-sm btn-link" title="@lang('sharing.share_link')"
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>
</button>
@endif
</div>
</div>
@if($shareLinks !== '')
Expand Down
14 changes: 8 additions & 6 deletions resources/views/guest/links/partials/single-simple.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
</div>
<div class="mt-2 mt-sm-0 ms-auto flex-shrink-0">
<small class="text-pale me-2 text-condensed">{!! $link->domainOfURL() !!}</small>
<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 }}">
<x-icon.share class="fw"/>
<span class="visually-hidden">@lang('sharing.share_link')</span>
</button>
@if($shareLinks !== '')
<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 }}">
<x-icon.share class="fw"/>
<span class="visually-hidden">@lang('sharing.share_link')</span>
</button>
@endif
</div>
</div>
@if($shareLinks !== '')
Expand Down
16 changes: 9 additions & 7 deletions resources/views/models/links/partials/single-card.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@
</div>

<div class="btn-group ms-auto me-2">
<button type="button" class="btn btn-xs btn-md-sm btn-link"
title="@lang('sharing.share_link')"
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>
</button>
@if($shareLinks !== '')
<button type="button" class="btn btn-xs btn-md-sm btn-link"
title="@lang('sharing.share_link')"
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>
</button>
@endif
<a href="{{ route('links.show', [$link]) }}" class="btn btn-xs btn-link text-condensed"
title="@lang('link.show')">
@lang('linkace.show')
Expand Down
14 changes: 8 additions & 6 deletions resources/views/models/links/partials/single-detailed.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@
</div>

<div class="btn-group ms-2 me-1">
<button type="button" class="btn btn-xs btn-link" title="@lang('sharing.share_link')"
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>
</button>
@if($shareLinks !== '')
<button type="button" class="btn btn-xs btn-link" title="@lang('sharing.share_link')"
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>
</button>
@endif
<a href="{{ route('links.show', [$link]) }}" class="btn btn-xs btn-link text-condensed" title="@lang('link.show')">
@lang('linkace.show')
</a>
Expand Down
14 changes: 8 additions & 6 deletions resources/views/models/links/partials/single-simple.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
<x-icon.info class="fw"/>
<span class="visually-hidden">@lang('link.details')</span>
</a>
<button type="button" class="btn btn-xs btn-link me-1" title="@lang('sharing.share_link')"
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>
</button>
@if($shareLinks !== '')
<button type="button" class="btn btn-xs btn-link me-1" title="@lang('sharing.share_link')"
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>
</button>
@endif
<input type="checkbox" aria-label="@lang('link.bulk_edit_add')" class="bulk-edit-model form-check"
data-id="{{ $link->id }}">
</div>
Expand Down
Loading