Skip to content

Commit b318529

Browse files
KodeStarKodeStar
authored
Merge pull request #100 from linuxserver/v1.4
fixes to RP
2 parents a7563ab + 249f437 commit b318529

12 files changed

+29
-29
lines changed

‎config/app.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
'name' => env('APP_NAME', 'Heimdall'),
17-
'version' => '1.4.0',
17+
'version' => '1.4.1',
1818

1919
/*
2020
|--------------------------------------------------------------------------

‎resources/views/app.blade.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<?php
3838
$active = ((bool)$app->pinned === true) ? 'active' : '';
3939
?>
40-
<li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', $app->id) }}"><i class="fas fa-thumbtack"></i></a></li>
40+
<li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', [$app->id], false) }}"><i class="fas fa-thumbtack"></i></a></li>
4141

4242
@endforeach
4343
</ul>
@@ -46,8 +46,8 @@
4646
<div class="content">
4747
<header class="appheader">
4848
<ul>
49-
<li><a href="{{ route('dash') }}">Dash</a></li><li>
50-
<a href="{{ route('items.index') }}">Items</a></li>
49+
<li><a href="{{ route('dash', [], false) }}">Dash</a></li><li>
50+
<a href="{{ route('items.index', [], false) }}">Items</a></li>
5151
</ul>
5252
</header>
5353
<main>
@@ -76,10 +76,10 @@
7676
<a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a>
7777
@endif
7878

79-
<a id="dash" class="config" href="{{ route('dash') }}"><i class="fas fa-th"></i></a>
80-
<a id="items" class="config" href="{{ route('items.index') }}"><i class="fas fa-list"></i></a>
81-
<a id="folder" class="config" href="{{ route('tags.index') }}"><i class="fas fa-tag"></i></a>
82-
<a id="settings" class="config" href="{{ route('settings.index') }}"><i class="fas fa-cogs"></i></a>
79+
<a id="dash" class="config" href="{{ route('dash', [], false) }}"><i class="fas fa-th"></i></a>
80+
<a id="items" class="config" href="{{ route('items.index', [], false) }}"><i class="fas fa-list"></i></a>
81+
<a id="folder" class="config" href="{{ route('tags.index', [], false) }}"><i class="fas fa-tag"></i></a>
82+
<a id="settings" class="config" href="{{ route('settings.index', [], false) }}"><i class="fas fa-cogs"></i></a>
8383
</div>
8484
</main>
8585

‎resources/views/item.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</div>
1414
<a class="link"{{ $app->target }} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
1515
</div>
16-
<a class="item-edit" href="{{ route($app->link_type.'.edit', $app->id) }}"><i class="fas fa-pencil"></i></a>
16+
<a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a>
1717

1818
</section>

‎resources/views/items/form.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="section-title">{{ __('app.apps.add_application') }}</div>
44
<div class="module-actions">
55
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
6-
<a href="{{ route('items.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
6+
<a href="{{ route('items.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
77
</div>
88
</header>
99
<div id="create" class="create">
@@ -73,7 +73,7 @@
7373
<div class="section-title">&nbsp;</div>
7474
<div class="module-actions">
7575
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
76-
<a href="{{ route('items.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
76+
<a href="{{ route('items.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
7777
</div>
7878
</footer>
7979

‎resources/views/items/list.blade.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<div class="section-title">
77
{{ __('app.apps.app_list') }}
88
@if( isset($trash) && $trash->count() > 0 )
9-
<a class="trashed" href="{{ route('items.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
9+
<a class="trashed" href="{{ route('items.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
1010
@endif
1111

1212
</div>
1313
<div class="module-actions">
14-
<a href="{{ route('items.create') }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
15-
<a href="{{ route('dash') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
14+
<a href="{{ route('items.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
15+
<a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
1616
</div>
1717
</header>
1818

@@ -31,7 +31,7 @@
3131
<tr>
3232
<td>{{ $app->title }}</td>
3333
<td><a href="{{ $app->url }}">{{ $app->link }}</a></td>
34-
<td class="text-center"><a{{ $app->target }} href="{!! route('items.edit', $app->id) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
34+
<td class="text-center"><a{{ $app->target }} href="{!! route('items.edit', [$app->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
3535
<td class="text-center">
3636
{!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
3737
<button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>

‎resources/views/items/trash.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Showing Deleted Applications
88
</div>
99
<div class="module-actions">
10-
<a href="{{ route('items.index') }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
10+
<a href="{{ route('items.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
1111
</div>
1212
</header>
1313

@@ -26,7 +26,7 @@
2626
<tr>
2727
<td>{{ $app->title }}</td>
2828
<td>{{ __('app.url') }}</td>
29-
<td class="text-center"><a href="{!! route('items.restore', $app->id) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
29+
<td class="text-center"><a href="{!! route('items.restore', [$app->id], false) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
3030
<td class="text-center">
3131
{!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
3232
<input type="hidden" name="force" value="1" />

‎resources/views/settings/form.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="section-title">{{ __($setting->label) }}</div>
44
<div class="module-actions">
55
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
6-
<a href="{{ route('settings.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
6+
<a href="{{ route('settings.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
77
</div>
88
</header>
99
<div class="create">
@@ -23,7 +23,7 @@
2323
<div class="section-title">&nbsp;</div>
2424
<div class="module-actions">
2525
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
26-
<a href="{{ route('settings.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
26+
<a href="{{ route('settings.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
2727
</div>
2828
</footer>
2929

‎resources/views/settings/list.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</td>
3030
<td class="text-center">
3131
@if((bool)$setting->system !== true)
32-
<a href="{!! route('settings.edit', ['id' => $setting->id]) !!}" title="{{ __('app.settings.edit') }} {!! $setting->label !!}" class="secondary"><i class="fa fa-pencil"></i></a>
32+
<a href="{!! route('settings.edit', ['id' => $setting->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $setting->label !!}" class="secondary"><i class="fa fa-pencil"></i></a>
3333
@endif
3434
</td>
3535
</tr>

‎resources/views/tags/form.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="section-title">{{ __('app.apps.add_tag') }}</div>
44
<div class="module-actions">
55
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
6-
<a href="{{ route('tags.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
6+
<a href="{{ route('tags.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
77
</div>
88
</header>
99
<div id="create" class="create">
@@ -67,7 +67,7 @@
6767
<div class="section-title">&nbsp;</div>
6868
<div class="module-actions">
6969
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
70-
<a href="{{ route('tags.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
70+
<a href="{{ route('tags.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
7171
</div>
7272
</footer>
7373

‎resources/views/tags/list.blade.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<div class="section-title">
77
{{ __('app.apps.tag_list') }}
88
@if( isset($trash) && $trash->count() > 0 )
9-
<a class="trashed" href="{{ route('tags.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
9+
<a class="trashed" href="{{ route('tags.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
1010
@endif
1111

1212
</div>
1313
<div class="module-actions">
14-
<a href="{{ route('tags.create') }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
15-
<a href="{{ route('dash') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
14+
<a href="{{ route('tags.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
15+
<a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
1616
</div>
1717
</header>
1818

@@ -31,7 +31,7 @@
3131
<tr>
3232
<td>{{ $app->title }}</td>
3333
<td><a{{ $app->target }} href="{{ $app->url }}">{{ $app->link }}</a></td>
34-
<td class="text-center"><a href="{!! route('tags.edit', $app->id) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
34+
<td class="text-center"><a href="{!! route('tags.edit', [$app->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
3535
<td class="text-center">
3636
{!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}
3737
<button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>

‎resources/views/tags/trash.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Showing Deleted Applications
88
</div>
99
<div class="module-actions">
10-
<a href="{{ route('tags.index') }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
10+
<a href="{{ route('tags.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
1111
</div>
1212
</header>
1313

@@ -26,7 +26,7 @@
2626
<tr>
2727
<td>{{ $app->title }}</td>
2828
<td>{{ __('app.url') }}</td>
29-
<td class="text-center"><a href="{!! route('tags.restore', $app->id) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
29+
<td class="text-center"><a href="{!! route('tags.restore', [ $app->id ], false) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
3030
<td class="text-center">
3131
{!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}
3232
<input type="hidden" name="force" value="1" />

‎resources/views/welcome.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="alert alert-danger">
1111
<p>{!! __('app.dash.no_apps',
1212
[
13-
'link1' => '<a href="'.route('items.create').'">'.__('app.dash.link1').'</a>',
13+
'link1' => '<a href="'.route('items.create', [], false).'">'.__('app.dash.link1').'</a>',
1414
'link2' => '<a id="pin-item" href="">'.__('app.dash.link2').'</a>'
1515
]) !!}</p>
1616
</div>

0 commit comments

Comments
 (0)