topaLE
/
Heimdall
1
0
Fork 0
Code Issues 163 Pull Requests 18 Projects Releases 47 Wiki Activity
Browse Source

fixes to RP

pull/100/head
KodeStar 7 years ago
parent
38f8143fd2
commit
249f437ff5
12 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      config/app.php
  2. 14
      resources/views/app.blade.php
  3. 2
      resources/views/item.blade.php
  4. 4
      resources/views/items/form.blade.php
  5. 8
      resources/views/items/list.blade.php
  6. 4
      resources/views/items/trash.blade.php
  7. 4
      resources/views/settings/form.blade.php
  8. 2
      resources/views/settings/list.blade.php
  9. 4
      resources/views/tags/form.blade.php
  10. 8
      resources/views/tags/list.blade.php
  11. 4
      resources/views/tags/trash.blade.php
  12. 2
      resources/views/welcome.blade.php

2
config/app.php
View File

@ -14,7 +14,7 @@ return [
*/ */
'name' => env('APP_NAME', 'Heimdall'), 'name' => env('APP_NAME', 'Heimdall'),
'version' => '1.4.0', 'version' => '1.4.1',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

14
resources/views/app.blade.php
View File

@ -37,7 +37,7 @@
<?php <?php
$active = ((bool)$app->pinned === true) ? 'active' : ''; $active = ((bool)$app->pinned === true) ? 'active' : '';
?> ?>
<li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', $app->id) }}"><i class="fas fa-thumbtack"></i></a></li> <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>
@endforeach @endforeach
</ul> </ul>
@ -46,8 +46,8 @@
<div class="content"> <div class="content">
<header class="appheader"> <header class="appheader">
<ul> <ul>
<li><a href="{{ route('dash') }}">Dash</a></li><li> <li><a href="{{ route('dash', [], false) }}">Dash</a></li><li>
<a href="{{ route('items.index') }}">Items</a></li> <a href="{{ route('items.index', [], false) }}">Items</a></li>
</ul> </ul>
</header> </header>
<main> <main>
@ -76,10 +76,10 @@
<a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a> <a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a>
@endif @endif
<a id="dash" class="config" href="{{ route('dash') }}"><i class="fas fa-th"></i></a> <a id="dash" class="config" href="{{ route('dash', [], false) }}"><i class="fas fa-th"></i></a>
<a id="items" class="config" href="{{ route('items.index') }}"><i class="fas fa-list"></i></a> <a id="items" class="config" href="{{ route('items.index', [], false) }}"><i class="fas fa-list"></i></a>
<a id="folder" class="config" href="{{ route('tags.index') }}"><i class="fas fa-tag"></i></a> <a id="folder" class="config" href="{{ route('tags.index', [], false) }}"><i class="fas fa-tag"></i></a>
<a id="settings" class="config" href="{{ route('settings.index') }}"><i class="fas fa-cogs"></i></a> <a id="settings" class="config" href="{{ route('settings.index', [], false) }}"><i class="fas fa-cogs"></i></a>
</div> </div>
</main> </main>

2
resources/views/item.blade.php
View File

@ -13,6 +13,6 @@
</div> </div>
<a class="link"{{ $app->target }} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a> <a class="link"{{ $app->target }} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
</div> </div>
<a class="item-edit" href="{{ route($app->link_type.'.edit', $app->id) }}"><i class="fas fa-pencil"></i></a> <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a>
</section> </section>

4
resources/views/items/form.blade.php
View File

@ -3,7 +3,7 @@
<div class="section-title">{{ __('app.apps.add_application') }}</div> <div class="section-title">{{ __('app.apps.add_application') }}</div>
<div class="module-actions"> <div class="module-actions">
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button> <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
<a href="{{ route('items.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('items.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
<div id="create" class="create"> <div id="create" class="create">
@ -73,7 +73,7 @@
<div class="section-title">&nbsp;</div> <div class="section-title">&nbsp;</div>
<div class="module-actions"> <div class="module-actions">
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button> <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
<a href="{{ route('items.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('items.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</footer> </footer>

8
resources/views/items/list.blade.php
View File

@ -6,13 +6,13 @@
<div class="section-title"> <div class="section-title">
{{ __('app.apps.app_list') }} {{ __('app.apps.app_list') }}
@if( isset($trash) && $trash->count() > 0 ) @if( isset($trash) && $trash->count() > 0 )
<a class="trashed" href="{{ route('items.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a> <a class="trashed" href="{{ route('items.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
@endif @endif
</div> </div>
<div class="module-actions"> <div class="module-actions">
<a href="{{ route('items.create') }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a> <a href="{{ route('items.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
<a href="{{ route('dash') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
@ -31,7 +31,7 @@
<tr> <tr>
<td>{{ $app->title }}</td> <td>{{ $app->title }}</td>
<td><a href="{{ $app->url }}">{{ $app->link }}</a></td> <td><a href="{{ $app->url }}">{{ $app->link }}</a></td>
<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> <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>
<td class="text-center"> <td class="text-center">
{!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!} {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
<button class="link" type="submit"><i class="fa fa-trash-alt"></i></button> <button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>

4
resources/views/items/trash.blade.php
View File

@ -7,7 +7,7 @@
Showing Deleted Applications Showing Deleted Applications
</div> </div>
<div class="module-actions"> <div class="module-actions">
<a href="{{ route('items.index') }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('items.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
@ -26,7 +26,7 @@
<tr> <tr>
<td>{{ $app->title }}</td> <td>{{ $app->title }}</td>
<td>{{ __('app.url') }}</td> <td>{{ __('app.url') }}</td>
<td class="text-center"><a href="{!! route('items.restore', $app->id) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td> <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>
<td class="text-center"> <td class="text-center">
{!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!} {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
<input type="hidden" name="force" value="1" /> <input type="hidden" name="force" value="1" />

4
resources/views/settings/form.blade.php
View File

@ -3,7 +3,7 @@
<div class="section-title">{{ __($setting->label) }}</div> <div class="section-title">{{ __($setting->label) }}</div>
<div class="module-actions"> <div class="module-actions">
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button> <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
<a href="{{ route('settings.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('settings.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
<div class="create"> <div class="create">
@ -23,7 +23,7 @@
<div class="section-title">&nbsp;</div> <div class="section-title">&nbsp;</div>
<div class="module-actions"> <div class="module-actions">
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button> <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
<a href="{{ route('settings.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('settings.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</footer> </footer>

2
resources/views/settings/list.blade.php
View File

@ -29,7 +29,7 @@
</td> </td>
<td class="text-center"> <td class="text-center">
@if((bool)$setting->system !== true) @if((bool)$setting->system !== true)
<a href="{!! route('settings.edit', ['id' => $setting->id]) !!}" title="{{ __('app.settings.edit') }} {!! $setting->label !!}" class="secondary"><i class="fa fa-pencil"></i></a> <a href="{!! route('settings.edit', ['id' => $setting->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $setting->label !!}" class="secondary"><i class="fa fa-pencil"></i></a>
@endif @endif
</td> </td>
</tr> </tr>

4
resources/views/tags/form.blade.php
View File

@ -3,7 +3,7 @@
<div class="section-title">{{ __('app.apps.add_tag') }}</div> <div class="section-title">{{ __('app.apps.add_tag') }}</div>
<div class="module-actions"> <div class="module-actions">
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button> <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
<a href="{{ route('tags.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('tags.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
<div id="create" class="create"> <div id="create" class="create">
@ -67,7 +67,7 @@
<div class="section-title">&nbsp;</div> <div class="section-title">&nbsp;</div>
<div class="module-actions"> <div class="module-actions">
<button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button> <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
<a href="{{ route('tags.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('tags.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</footer> </footer>

8
resources/views/tags/list.blade.php
View File

@ -6,13 +6,13 @@
<div class="section-title"> <div class="section-title">
{{ __('app.apps.tag_list') }} {{ __('app.apps.tag_list') }}
@if( isset($trash) && $trash->count() > 0 ) @if( isset($trash) && $trash->count() > 0 )
<a class="trashed" href="{{ route('tags.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a> <a class="trashed" href="{{ route('tags.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
@endif @endif
</div> </div>
<div class="module-actions"> <div class="module-actions">
<a href="{{ route('tags.create') }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a> <a href="{{ route('tags.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
<a href="{{ route('dash') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
@ -31,7 +31,7 @@
<tr> <tr>
<td>{{ $app->title }}</td> <td>{{ $app->title }}</td>
<td><a{{ $app->target }} href="{{ $app->url }}">{{ $app->link }}</a></td> <td><a{{ $app->target }} href="{{ $app->url }}">{{ $app->link }}</a></td>
<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> <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>
<td class="text-center"> <td class="text-center">
{!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!} {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}
<button class="link" type="submit"><i class="fa fa-trash-alt"></i></button> <button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>

4
resources/views/tags/trash.blade.php
View File

@ -7,7 +7,7 @@
Showing Deleted Applications Showing Deleted Applications
</div> </div>
<div class="module-actions"> <div class="module-actions">
<a href="{{ route('tags.index') }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a> <a href="{{ route('tags.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
@ -26,7 +26,7 @@
<tr> <tr>
<td>{{ $app->title }}</td> <td>{{ $app->title }}</td>
<td>{{ __('app.url') }}</td> <td>{{ __('app.url') }}</td>
<td class="text-center"><a href="{!! route('tags.restore', $app->id) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td> <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>
<td class="text-center"> <td class="text-center">
{!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!} {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}
<input type="hidden" name="force" value="1" /> <input type="hidden" name="force" value="1" />

2
resources/views/welcome.blade.php
View File

@ -10,7 +10,7 @@
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>{!! __('app.dash.no_apps', <p>{!! __('app.dash.no_apps',
[ [
'link1' => '<a href="'.route('items.create').'">'.__('app.dash.link1').'</a>', 'link1' => '<a href="'.route('items.create', [], false).'">'.__('app.dash.link1').'</a>',
'link2' => '<a id="pin-item" href="">'.__('app.dash.link2').'</a>' 'link2' => '<a id="pin-item" href="">'.__('app.dash.link2').'</a>'
]) !!}</p> ]) !!}</p>
</div> </div>

Write Preview
Loading…
Cancel
Save