Skip to content

Commit

Permalink
More spacing between buttons, Add missing de lang keys
Browse files Browse the repository at this point in the history
  • Loading branch information
@bluecraank
bluecraank committed Feb 22, 2024
1 parent 2b33e76 commit 7d9689d
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 38 deletions.
4 changes: 3 additions & 1 deletion lang/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,5 +179,7 @@
"in use": "in Verwendung",
"Updated": "Aktualisiert",
"Go to presentation": "Gehe zu Präsentation",
"Delete presentation after schedule ends": "Präsentation nach Ablauf des Zeitplans löschen"
"Delete presentation after schedule ends": "Präsentation nach Ablauf des Zeitplans löschen",
"Start date": "Startdatum",
"End date": "Enddatum"
}
21 changes: 9 additions & 12 deletions resources/views/groups/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<span>{{ __('Create group') }}</span>
</a>
@endcan
</h5>
</h5>
<div class="card-body">
<table class="table table-striped">
<thead>
Expand All @@ -39,17 +39,14 @@
onsubmit="return confirm('{{ __('Are you sure to delete this group?') }}')">
@method('DELETE')
@csrf
<div class="btn-group" role="group" aria-label="Basic example">
@can('read groups')
<a class="btn btn-primary btn-sm"
href="{{ route('groups.update', ['id' => $group->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete groups')
<button class="btn btn-primary btn-sm" type="submit"><i
class="bi-trash"></i></button>
@endcan
</div>
@can('read groups')
<a class="btn btn-primary btn-sm"
href="{{ route('groups.update', ['id' => $group->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete groups')
<button class="btn btn-danger btn-sm" type="submit"><i class="bi-trash"></i></button>
@endcan
</form>
</td>
</tr>
Expand Down
28 changes: 14 additions & 14 deletions resources/views/livewire/live-monitor-overview.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

<span style="font-size: 13px;position:absolute;margin-left:10px;margin-top:5px;">
<span class="badge bg-success mb-3">{{ $devices->where('active', true)->count() }} {{ __('active') }}</span>
<span class="badge bg-danger mb-3 ml-2">{{ $devices->where('active', false)->count() }} {{ __('offline') }}</span>
<span class="badge bg-danger mb-3 ml-2">{{ $devices->where('active', false)->count() }}
{{ __('offline') }}</span>
</span>

@can('create devices')
Expand All @@ -17,7 +18,8 @@
<div class="card-body">
<div class="row">
<div class="col">
<select wire:model.live="sort_by" class="form-select form-select-sm w-50" name="sort_by" id="DeviceSortBy">
<select wire:model.live="sort_by" class="form-select form-select-sm w-50" name="sort_by"
id="DeviceSortBy">
<option value="name">Name</option>
<option value="group">{{ __('Group') }}</option>
<option value="presentation">Presentation</option>
Expand Down Expand Up @@ -57,7 +59,8 @@
$preview = config('app.placeholder_image');
}
@endphp
<a href="{{ route('devices.show', $device->id) }}"><img class="img-thumbnail" style="max-height: 100px;" src="{{ $preview }}" alt=""></a>
<a href="{{ route('devices.show', $device->id) }}"><img class="img-thumbnail"
style="max-height: 100px;" src="{{ $preview }}" alt=""></a>
</td>
<td>{{ $device->name }}</td>
<td>{{ $device->description }}</td>
Expand Down Expand Up @@ -87,17 +90,14 @@
onsubmit="return confirm('{{ __('Are you sure to delete this device?') }}')">
@method('DELETE')
@csrf
<div class="btn-group" role="group" aria-label="Basic example">
@can('read devices')
<a class="btn btn-primary btn-sm"
href="{{ route('devices.update', ['id' => $device->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete devices')
<button class="btn btn-primary btn-sm" type="submit"><i
class="bi-trash"></i></button>
@endcan
</div>
@can('read devices')
<a class="btn btn-primary btn-sm"
href="{{ route('devices.update', ['id' => $device->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete devices')
<button class="btn btn-danger btn-sm" type="submit"><i class="bi-trash"></i></button>
@endcan
</form>
</td>
</tr>
Expand Down
4 changes: 1 addition & 3 deletions resources/views/presentations/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,15 @@ class="img-thumbnail" style="max-height: 100px;">
onsubmit="return confirm('{{ __('Are you sure to delete this template?') }}')">
@method('DELETE')
@csrf
<div class="btn-group" role="group" aria-label="Basic example">
@can('read presentations')
<a class="btn btn-sm btn-primary"
href="{{ route('presentations.update', ['id' => $presentation->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete presentations')
<button class="btn btn-sm btn-primary" type="submit"><i
<button class="btn btn-sm btn-danger" type="submit"><i
class="bi-trash"></i></button>
@endcan
</div>
</form>
</td>
</tr>
Expand Down
10 changes: 2 additions & 8 deletions resources/views/schedules/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,14 @@
onsubmit="return confirm('{{ __('Are you sure to delete this schedule?') }}')">
@method('DELETE')
@csrf
<div class="btn-group" role="group">
@can('read schedules')
<a class="btn btn-primary btn-sm"
href="{{ route('schedules.update', ['id' => $schedule->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete schedules')
<button class="btn btn-primary btn-sm" type="submit"><i
class="bi-trash"></i></button>
<button class="btn btn-danger btn-sm" type="submit"><i class="bi-trash"></i></button>
@endcan
</div>
</form>
</td>
</tr>
Expand Down Expand Up @@ -95,17 +92,14 @@ class="bi-trash"></i></button>
onsubmit="return confirm('{{ __('Are you sure to delete this schedule?') }}')">
@method('DELETE')
@csrf
<div class="btn-group" role="group">
@can('read schedules')
<a class="btn btn-primary btn-sm"
href="{{ route('schedules.update', ['id' => $schedule->id]) }}"><i
class="bi-pen"></i></a>
@endcan
@can('delete schedules')
<button class="btn btn-primary btn-sm" type="submit"><i
class="bi-trash"></i></button>
<button class="btn btn-danger btn-sm" type="submit"><i class="bi-trash"></i></button>
@endcan
</div>
</form>
</td>
</tr>
Expand Down

0 comments on commit 7d9689d

Please sign in to comment.