diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php index d21a88281..6161167b8 100644 --- a/resources/views/auth/permissions/index.blade.php +++ b/resources/views/auth/permissions/index.blade.php @@ -43,19 +43,19 @@ @foreach($permissions as $item) - {{ Form::bulkActionGroup($item->id, $item->name) }} - {{ $item->display_name }} - {{ $item->name }} - {{ $item->description }} - + {{ Form::bulkActionGroup($item->id, $item->name) }} + {{ $item->display_name }} + {{ $item->name }} + {{ $item->description }} +
{{ trans('general.edit') }} -
@permission('delete-auth-permissions') +
{!! Form::deleteLink($item, 'auth/permissions') !!} @endpermission
diff --git a/resources/views/auth/roles/index.blade.php b/resources/views/auth/roles/index.blade.php index 93f645a37..fdf61bb38 100644 --- a/resources/views/auth/roles/index.blade.php +++ b/resources/views/auth/roles/index.blade.php @@ -43,19 +43,19 @@ @foreach($roles as $item) - {{ Form::bulkActionGroup($item->id, $item->name) }} - {{ $item->display_name }} - {{ $item->name }} - {{ $item->description }} - + {{ Form::bulkActionGroup($item->id, $item->name) }} + {{ $item->display_name }} + {{ $item->name }} + {{ $item->description }} +
{{ trans('general.edit') }} -
@permission('delete-auth-roles') +
{!! Form::deleteLink($item, 'auth/roles') !!} @endpermission
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index 3a1f9e642..e01ea6f22 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -44,8 +44,8 @@ @foreach($users as $item) - {{ Form::bulkActionGroup($item->id, $item->name) }} - + {{ Form::bulkActionGroup($item->id, $item->name) }} + @if (setting('default.use_gravatar', '0') == '1') {{ $item->name }} @@ -57,13 +57,13 @@ {{ $item->name }} - {{ $item->email }} - + {{ $item->email }} + @foreach($item->roles as $role) @endforeach - + @if (user()->can('update-auth-users')) {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} @else @@ -74,7 +74,7 @@ @endif @endif - +
 {{ trans('general.cancel') }} + {!! Form::button( '
' . ' ' . trans('reconciliations.reconcile') . '', - [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-info button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!} + [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!} {!! Form::button( '
' . ' ' . trans('general.save') . '', - [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!} + [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
@else
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php index c2e6c3a6f..be7adacb0 100644 --- a/resources/views/banking/reconciliations/index.blade.php +++ b/resources/views/banking/reconciliations/index.blade.php @@ -4,7 +4,7 @@ @section('new_button') @permission('create-banking-reconciliations') -  {{ trans('general.add_new') }} +  {{ trans('general.add_new') }} @endpermission @endsection @@ -12,7 +12,7 @@
{!! Form::open([ - 'url' => 'banking/reconciliations', + 'route' => 'reconciliations.index', 'role' => 'form', 'method' => 'GET', 'class' => 'mb-0' diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index 22cff4e25..924b2cbd7 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -17,7 +17,7 @@
{!! Form::open([ - 'url' => 'banking/transactions', + 'route' => 'transactions.index', 'role' => 'form', 'method' => 'GET', 'class' => 'mb-0' diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index 29ac8ee2e..f78d2da41 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -56,8 +56,8 @@
{{ trans('general.edit') }} -
@permission('delete-banking-transfers') +
{!! Form::deleteLink($item, 'banking/transfers') !!} @endpermission
diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php index b3ec0a781..becb36c3e 100644 --- a/resources/views/common/companies/create.blade.php +++ b/resources/views/common/companies/create.blade.php @@ -17,7 +17,7 @@
- {{ Form::textGroup('name', trans('general.name'), 'building') }} + {{ Form::textGroup('name', trans('general.name'), 'font') }} {{ Form::emailGroup('email', trans('general.email'), 'envelope') }} diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php index ac4e79ac8..9b07ac324 100644 --- a/resources/views/common/companies/edit.blade.php +++ b/resources/views/common/companies/edit.blade.php @@ -18,7 +18,7 @@
- {{ Form::textGroup('name', trans('general.name'), 'building') }} + {{ Form::textGroup('name', trans('general.name'), 'font') }} {{ Form::emailGroup('email', trans('general.email'), 'envelope') }} diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php index eb2ec5c8e..88e4fcc60 100644 --- a/resources/views/common/companies/index.blade.php +++ b/resources/views/common/companies/index.blade.php @@ -4,7 +4,7 @@ @permission('create-common-companies') @section('new_button') -  {{ trans('general.add_new') }} +  {{ trans('general.add_new') }} @endsection @endpermission @@ -49,7 +49,7 @@ {{ $item->id }} {{ $item->name }} {{ $item->email }} - @date($item->created_at) + @date($item->created_at) @if (user()->can('update-common-companies')) {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php index bd9ccd05e..910227172 100644 --- a/resources/views/common/dashboards/index.blade.php +++ b/resources/views/common/dashboards/index.blade.php @@ -4,7 +4,7 @@ @permission('create-common-dashboards') @section('new_button') -  {{ trans('general.add_new') }} +  {{ trans('general.add_new') }} @endsection @endpermission @@ -32,17 +32,17 @@ - + - + @foreach($dashboards as $item) - + -
{{ Form::bulkActionAllGroup() }}{{ Form::bulkActionAllGroup() }} @sortablelink('name', trans('general.name')) @sortablelink('enabled', trans('general.enabled')){{ trans('general.actions') }}{{ trans('general.actions') }}
{{ Form::bulkActionGroup($item->id, $item->name) }}{{ Form::bulkActionGroup($item->id, $item->name) }} {{ $item->name }} @if (user()->can('update-common-dashboards')) @@ -55,7 +55,7 @@ @endif @endif +
+ +
+ -
- @permission('create-common-widgets') - {!! Form::button(trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]), [ - 'type' => 'button', - 'class' => 'dropdown-item', - 'title' => trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]), - '@click' => 'onCreateWidget()', - ]) !!} - @endpermission - @permission('update-common-dashboards') -
- @permission('create-common-dashboards') - {{ trans('general.title.create', ['type' => trans_choice('general.dashboards', 1)]) }} - @endpermission - {{ trans('general.title.manage', ['type' => trans_choice('general.dashboards', 2)]) }} - @endpermission +
+ @permission('create-common-widgets') + {!! Form::button(trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]), [ + 'type' => 'button', + 'class' => 'dropdown-item', + 'title' => trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]), + '@click' => 'onCreateWidget()', + ]) !!} + @endpermission + @permission('update-common-dashboards') +
+ @permission('create-common-dashboards') + {{ trans('general.title.create', ['type' => trans_choice('general.dashboards', 1)]) }} + @endpermission + {{ trans('general.title.manage', ['type' => trans_choice('general.dashboards', 2)]) }} + @endpermission +
-
- + @endpermission @php diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php index 0035568b5..e1afa7147 100644 --- a/resources/views/common/import/create.blade.php +++ b/resources/views/common/import/create.blade.php @@ -25,7 +25,7 @@
- +
@@ -40,8 +40,8 @@
-  {{ trans('general.cancel') }} - {!! Form::button('  ' . trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success']) !!} +  {{ trans('general.cancel') }} + {!! Form::button('  ' . trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success header-button-top']) !!}
{!! Form::close() !!} diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php index 87bece5d0..9990059a4 100644 --- a/resources/views/common/items/index.blade.php +++ b/resources/views/common/items/index.blade.php @@ -4,7 +4,7 @@ @section('new_button') @permission('create-common-items') -  {{ trans('general.add_new') }} +  {{ trans('general.add_new') }}  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @@ -85,9 +85,9 @@
@permission('create-common-items') {{ trans('general.duplicate') }} -
@endpermission @permission('delete-common-items') +
{!! Form::deleteLink($item, 'common/items') !!} @endpermission
diff --git a/resources/views/common/reports/index.blade.php b/resources/views/common/reports/index.blade.php index 97dbdfaf8..ecc615873 100644 --- a/resources/views/common/reports/index.blade.php +++ b/resources/views/common/reports/index.blade.php @@ -4,9 +4,7 @@ @section('new_button') @permission('create-common-reports') - -  {{ trans('general.add_new') }} - +  {{ trans('general.add_new') }} @endpermission @endsection @@ -27,11 +25,11 @@
@permission('create-common-reports') - {{ trans('general.edit') }} -
+ {{ trans('general.edit') }} +
@endpermission @permission('delete-common-reports') - {!! Form::deleteLink($report, 'common/reports') !!} + {!! Form::deleteLink($report, 'common/reports') !!} @endpermission
diff --git a/resources/views/install/updates/edit.blade.php b/resources/views/install/updates/edit.blade.php index 051b75afc..824b7ca28 100644 --- a/resources/views/install/updates/edit.blade.php +++ b/resources/views/install/updates/edit.blade.php @@ -3,11 +3,7 @@ @section('title', trans_choice('general.updates', 2)) @section('new_button') - - -  {{ trans('updates.check') }} - - +  {{ trans('updates.check') }} @endsection @section('content') diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php index b7b60ab6c..e343064dd 100644 --- a/resources/views/install/updates/index.blade.php +++ b/resources/views/install/updates/index.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.updates', 2)) @section('new_button') -  {{ trans('updates.check') }} +  {{ trans('updates.check') }} @endsection @section('content') @@ -38,7 +38,7 @@
- {{ trans_choice('general.modules', 2) }} + {{ trans_choice('general.modules', 2) }}
diff --git a/resources/views/modals/settings/invoice_template.blade.php b/resources/views/modals/settings/invoice_template.blade.php index 305ebf7ca..70e17da11 100644 --- a/resources/views/modals/settings/invoice_template.blade.php +++ b/resources/views/modals/settings/invoice_template.blade.php @@ -59,7 +59,6 @@ @stack('color_input_end')
- {!! Form::hidden('_template', $setting['template']) !!} {!! Form::hidden('_prefix', 'invoice') !!} {!! Form::close() !!} diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php index f99d5586a..025156f09 100644 --- a/resources/views/modules/home/index.blade.php +++ b/resources/views/modules/home/index.blade.php @@ -4,7 +4,7 @@ @section('new_button')  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} +  {{ trans('modules.my_apps') }} @endsection @section('content') diff --git a/resources/views/modules/item/documentation.blade.php b/resources/views/modules/item/documentation.blade.php index 14b5ce024..4f3555deb 100644 --- a/resources/views/modules/item/documentation.blade.php +++ b/resources/views/modules/item/documentation.blade.php @@ -3,31 +3,26 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} +  {{ trans('modules.api_key') }} +  {{ trans('modules.my_apps') }} @endsection @section('content') @include('partials.modules.bar') -
-
-
-
- @if ($documentation) - {!! $documentation->body !!} - @else - {{ trans('general.na') }} - @endif -
-
-
-
-
- « {{ trans('modules.back') }} -
-
-
+
+
+ @if ($documentation) + {!! $documentation->body !!} + @else + {{ trans('general.na') }} + @endif +
+ +
+
+
+  {{ trans('modules.back') }}
diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php index 74155130b..d316ae06a 100644 --- a/resources/views/modules/item/pre_sale.blade.php +++ b/resources/views/modules/item/pre_sale.blade.php @@ -3,16 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') - - -  {{ trans('modules.api_key') }} - - - - -  {{ trans('modules.my_apps') }} - - +  {{ trans('modules.api_key') }} +  {{ trans('modules.my_apps') }} @endsection @section('content') @@ -35,9 +27,9 @@
{!! $module->description !!} - @if($module->screenshots || $module->video) + @if ($module->screenshots || $module->video) video) + @if ($module->video) @php if (strpos($module->video->link, '=') !== false) { $code = explode('=', $module->video->link); diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 7e3dfdc6b..87aba1578 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -3,16 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') - - -  {{ trans('modules.api_key') }} - - - - -  {{ trans('modules.my_apps') }} - - +  {{ trans('modules.api_key') }} +  {{ trans('modules.my_apps') }} @endsection @section('content') diff --git a/resources/views/modules/my/index.blade.php b/resources/views/modules/my/index.blade.php index 333c4ba0a..50a535a16 100644 --- a/resources/views/modules/my/index.blade.php +++ b/resources/views/modules/my/index.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} +  {{ trans('modules.api_key') }} +  {{ trans('modules.my_apps') }} @endsection @section('content') diff --git a/resources/views/modules/tiles/index.blade.php b/resources/views/modules/tiles/index.blade.php index ca07146e0..23b57331a 100644 --- a/resources/views/modules/tiles/index.blade.php +++ b/resources/views/modules/tiles/index.blade.php @@ -3,12 +3,13 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} +  {{ trans('modules.api_key') }} +  {{ trans('modules.my_apps') }} @endsection @section('content') @include('partials.modules.bar') +

{{ $title }}

@if ($modules) @@ -19,26 +20,25 @@ @include('partials.modules.item') @endif @endforeach -
-
-
- @if ($modules->current_page > 1) - {!! trans('pagination.previous') !!} - @endif -
- -
- @if ($modules->current_page < $modules->last_page) - {!! trans('pagination.next') !!} - @endif -
+
+ @if ($modules->current_page > 1) + {!! trans('pagination.previous') !!} + @endif
+ +
+ @if ($modules->current_page < $modules->last_page) + {!! trans('pagination.next') !!} + @endif +
+ @else
@include('partials.modules.no_apps')
@endif +
@endsection @push('scripts_start') diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php index 0e9f1cf93..dd05b28cd 100644 --- a/resources/views/partials/admin/menu.blade.php +++ b/resources/views/partials/admin/menu.blade.php @@ -1,48 +1,48 @@ @stack('menu_start') - + @stack('menu_end')