From a27622c1516e2a6049fc971f206d34e6ee1e3bdb Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 2 Jun 2026 07:31:44 +0000 Subject: [PATCH 1/2] Swap dependency --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9fe633ac..dd5330e0 100644 --- a/composer.json +++ b/composer.json @@ -25,13 +25,13 @@ "laravel/framework": "^11.51", "laravel/tinker": "^2.9", "laravel/ui": "^4.4", - "laravelcollective/html": "^6.4", "league/flysystem-aws-s3-v3": "^3.0", "mcamara/laravel-localization": "2.3.0", "phpoffice/phpspreadsheet": "^1.15", "predis/predis": "^2.2", "santigarcor/laratrust": "^8.3", - "tray-labs/laravel-influxdb": "1.0.12" + "tray-labs/laravel-influxdb": "1.0.12", + "spatie/laravel-html": "^3.11" }, "require-dev": { "appzcoder/crud-generator": "^4.0", From a1980cb8096e550c3cd5c40678b17095ff836d2d Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 2 Jun 2026 07:31:48 +0000 Subject: [PATCH 2/2] Convert `Form` facade --- config/app.php | 2 - .../views/alert-rule-formula/form.blade.php | 4 +- resources/views/alert-rule/form.blade.php | 10 ++--- resources/views/alert-rule/index.blade.php | 6 +-- resources/views/alert/form.blade.php | 10 ++--- resources/views/alert/index.blade.php | 6 +-- .../views/calculation-model/form.blade.php | 6 +-- resources/views/categories/create.blade.php | 6 +-- resources/views/categories/edit.blade.php | 6 +-- .../categories/partials/details.blade.php | 34 ++++++++--------- .../views/categories/partials/form.blade.php | 18 ++++----- .../partials/translations.blade.php | 2 +- resources/views/checklist-svg/form.blade.php | 4 +- resources/views/checklists/form.blade.php | 4 +- .../views/dashboard-group/form.blade.php | 4 +- resources/views/devices/create.blade.php | 12 +++--- resources/views/devices/data.blade.php | 4 +- resources/views/devices/edit.blade.php | 38 +++++++++---------- resources/views/devices/index.blade.php | 10 ++--- resources/views/devices/show.blade.php | 14 +++---- resources/views/flash-log/form.blade.php | 4 +- resources/views/flash-log/index.blade.php | 4 +- resources/views/groups/create.blade.php | 8 ++-- resources/views/groups/edit.blade.php | 8 ++-- resources/views/groups/index.blade.php | 6 +-- resources/views/image/form.blade.php | 8 ++-- resources/views/inspections/form.blade.php | 2 +- resources/views/measurement/form.blade.php | 2 +- .../views/research/consent_edit.blade.php | 10 ++--- resources/views/research/data.blade.php | 4 +- resources/views/research/form.blade.php | 8 ++-- resources/views/research/show.blade.php | 4 +- resources/views/roles/create.blade.php | 12 +++--- resources/views/roles/edit.blade.php | 10 ++--- resources/views/roles/index.blade.php | 6 +-- resources/views/sample-code/form.blade.php | 4 +- .../views/sensordefinition/form.blade.php | 6 +-- .../views/sensordefinition/index.blade.php | 8 ++-- resources/views/translations/edit.blade.php | 8 ++-- .../translations/partials/input.blade.php | 10 ++--- resources/views/users/create.blade.php | 24 ++++++------ resources/views/users/edit.blade.php | 22 +++++------ resources/views/users/index.blade.php | 12 +++--- 43 files changed, 194 insertions(+), 196 deletions(-) diff --git a/config/app.php b/config/app.php index bfa8a7db..c4d43955 100644 --- a/config/app.php +++ b/config/app.php @@ -7,8 +7,6 @@ 'webapp_url' => env('WEBAPP_URL', null), 'aliases' => Facade::defaultAliases()->merge([ - 'Form' => Collective\Html\FormFacade::class, - 'Html' => Collective\Html\HtmlFacade::class, 'Influx' => TrayLabs\InfluxDB\Facades\InfluxDB::class, 'InterventionImage' => Intervention\Image\Facades\Image::class, 'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class, diff --git a/resources/views/alert-rule-formula/form.blade.php b/resources/views/alert-rule-formula/form.blade.php index 9bce9eac..1f52cece 100644 --- a/resources/views/alert-rule-formula/form.blade.php +++ b/resources/views/alert-rule-formula/form.blade.php @@ -2,7 +2,7 @@
- {!! Form::select('alert_rule_id', App\Models\AlertRule::selectList(), e($alertruleformula->alert_rule_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('beep.AlertRuleFormula')]),'class' => 'form-control select2')) !!} + {{ html()->select('alert_rule_id', App\Models\AlertRule::selectList(), e($alertruleformula->alert_rule_id ?? null))->placeholder(__('crud.select', ['item' => __('beep.AlertRuleFormula')]))->class('form-control select2') }} {!! $errors->first('alert_rule_id', '

:message

') !!}
@@ -11,7 +11,7 @@
- {!! Form::select('measurement_id', App\Measurement::selectList(), e($alertruleformula->measurement_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.measurement')]),'class' => 'form-control select2')) !!} + {{ html()->select('measurement_id', App\Measurement::selectList(), e($alertruleformula->measurement_id ?? null))->placeholder(__('crud.select', ['item' => __('general.measurement')]))->class('form-control select2') }} {!! $errors->first('measurement_id', '

:message

') !!}
diff --git a/resources/views/alert-rule/form.blade.php b/resources/views/alert-rule/form.blade.php index f35a3da6..ebb8f3dd 100644 --- a/resources/views/alert-rule/form.blade.php +++ b/resources/views/alert-rule/form.blade.php @@ -80,7 +80,7 @@
- {!! Form::select('measurement_id', App\Measurement::selectList(), e($alertrule->measurement_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.measurement')]),'class' => 'form-control select2')) !!} + {{ html()->select('measurement_id', App\Measurement::selectList(), e($alertrule->measurement_id ?? null))->placeholder(__('crud.select', ['item' => __('general.measurement')]))->class('form-control select2') }} {!! $errors->first('measurement_id', '

:message

') !!}
@@ -155,7 +155,7 @@
- {!! Form::select('exclude_months[]', App\Models\AlertRule::$exclude_months, isset($alertrule->exclude_months) ? $alertrule->getExcludeMonthsAttribute() : null, array('class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('exclude_months[]', App\Models\AlertRule::$exclude_months, isset($alertrule->exclude_months) ? $alertrule->getExcludeMonthsAttribute() : null)->class('form-control select2') }} {!! $errors->first('exclude_months', '

:message

') !!}
@@ -164,7 +164,7 @@
- {!! Form::select('exclude_hours[]', App\Models\AlertRule::$exclude_hours, isset($alertrule->exclude_hours) ? $alertrule->getExcludeHoursAttribute() : null, array('class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('exclude_hours[]', App\Models\AlertRule::$exclude_hours, isset($alertrule->exclude_hours) ? $alertrule->getExcludeHoursAttribute() : null)->class('form-control select2') }} {!! $errors->first('exclude_hours', '

:message

') !!}
@@ -173,7 +173,7 @@
- {!! Form::select('exclude_hive_ids[]', App\Hive::selectList(true), isset($alertrule->exclude_hive_ids) ? $alertrule->getExcludeHiveIdsAttribute() : null, array('class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('exclude_hive_ids[]', App\Hive::selectList(true), isset($alertrule->exclude_hive_ids) ? $alertrule->getExcludeHiveIdsAttribute() : null)->class('form-control select2') }} {!! $errors->first('exclude_hive_ids', '

:message

') !!}
@@ -193,7 +193,7 @@
- {!! Form::select('user_id', App\User::selectList(), e($alertrule->user_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.user')]),'class' => 'form-control select2')) !!} + {{ html()->select('user_id', App\User::selectList(), e($alertrule->user_id ?? null))->placeholder(__('crud.select', ['item' => __('general.user')]))->class('form-control select2') }} {!! $errors->first('user_id', '

:message

') !!}
diff --git a/resources/views/alert-rule/index.blade.php b/resources/views/alert-rule/index.blade.php index 954508ab..7c203292 100644 --- a/resources/views/alert-rule/index.blade.php +++ b/resources/views/alert-rule/index.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('page-title') {{ __('crud.management', ['item'=>__('beep.AlertRule')]) }} - {!! Form::open(['method' => 'GET', 'route' => 'alert-rule.index', 'class' => 'form-inline', 'role' => 'search', 'style'=>'display: inline-block;']) !!} + {{ html()->form('GET', route('alert-rule.index'))->class('form-inline')->attribute('role', 'search')->style('display: inline-block;')->open() }}
@@ -15,7 +15,7 @@
--}}
- {!! Form::select('user_id', $users, $user_id, array('class' => 'form-control select2', 'placeholder'=>'Select user...', 'onchange'=>'this.form.submit()')) !!} + {{ html()->select('user_id', $users, $user_id)->class('form-control select2')->placeholder('Select user...')->attribute('onchange', 'this.form.submit()') }} {!! $errors->first('user_id', '

:message

') !!}
@@ -24,7 +24,7 @@
Default
- {!! Form::close() !!} + {{ html()->form()->close() }} @endsection @section('content') diff --git a/resources/views/alert/form.blade.php b/resources/views/alert/form.blade.php index 4078d347..5e64440b 100644 --- a/resources/views/alert/form.blade.php +++ b/resources/views/alert/form.blade.php @@ -2,7 +2,7 @@
- {!! Form::select('alert_rule_id', App\Models\AlertRule::selectList(), e($alert->alert_rule_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.alert_rule')]),'class' => 'form-control select2')) !!} + {{ html()->select('alert_rule_id', App\Models\AlertRule::selectList(), e($alert->alert_rule_id ?? null))->placeholder(__('crud.select', ['item' => __('general.alert_rule')]))->class('form-control select2') }} {!! $errors->first('alert_rule_id', '

:message

') !!}
@@ -29,7 +29,7 @@
- {!! Form::select('measurement_id', App\Measurement::selectList(), e($alert->measurement_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.measurement')]),'class' => 'form-control select2')) !!} + {{ html()->select('measurement_id', App\Measurement::selectList(), e($alert->measurement_id ?? null))->placeholder(__('crud.select', ['item' => __('general.measurement')]))->class('form-control select2') }} {!! $errors->first('measurement_id', '

:message

') !!}
@@ -79,7 +79,7 @@
- {!! Form::select('location_id', App\Location::selectList(), e($alert->location_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.location')]),'class' => 'form-control select2')) !!} + {{ html()->select('location_id', App\Location::selectList(), e($alert->location_id ?? null))->placeholder(__('crud.select', ['item' => __('general.location')]))->class('form-control select2') }} {!! $errors->first('location_id', '

:message

') !!}
@@ -97,7 +97,7 @@
- {!! Form::select('device_id', App\Device::selectList(), e($alert->device_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.device')]),'class' => 'form-control select2')) !!} + {{ html()->select('device_id', App\Device::selectList(), e($alert->device_id ?? null))->placeholder(__('crud.select', ['item' => __('general.device')]))->class('form-control select2') }} {!! $errors->first('device_id', '

:message

') !!}
@@ -106,7 +106,7 @@
- {!! Form::select('user_id', App\User::selectList(), e($alert->user_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.user')]),'class' => 'form-control select2')) !!} + {{ html()->select('user_id', App\User::selectList(), e($alert->user_id ?? null))->placeholder(__('crud.select', ['item' => __('general.user')]))->class('form-control select2') }} {!! $errors->first('user_id', '

:message

') !!}
diff --git a/resources/views/alert/index.blade.php b/resources/views/alert/index.blade.php index f9d3ebcf..2c7b872c 100644 --- a/resources/views/alert/index.blade.php +++ b/resources/views/alert/index.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('page-title') {{ __('crud.management', ['item'=>__('beep.Alert')]) }} - {!! Form::open(['method' => 'GET', 'route' => 'alert.index', 'class' => 'form-inline', 'role' => 'search', 'style'=>'display: inline-block;']) !!} + {{ html()->form('GET', route('alert.index'))->class('form-inline')->attribute('role', 'search')->style('display: inline-block;')->open() }}
@@ -15,13 +15,13 @@
- {!! Form::select('user_id', $users, $user_id, array('class' => 'form-control select2', 'placeholder'=>'Select user...', 'onchange'=>'this.form.submit()')) !!} + {{ html()->select('user_id', $users, $user_id)->class('form-control select2')->placeholder('Select user...')->attribute('onchange', 'this.form.submit()') }} {!! $errors->first('user_id', '

:message

') !!}
No measurements
- {!! Form::close() !!} + {{ html()->form()->close() }} @endsection @section('content') diff --git a/resources/views/calculation-model/form.blade.php b/resources/views/calculation-model/form.blade.php index 47420c24..6ae572ad 100644 --- a/resources/views/calculation-model/form.blade.php +++ b/resources/views/calculation-model/form.blade.php @@ -11,7 +11,7 @@
- {!! Form::select('data_measurement_id', App\Measurement::selectList(), e($calculationmodel->data_measurement_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.measurement')]),'class' => 'form-control select2')) !!} + {{ html()->select('data_measurement_id', App\Measurement::selectList(), e($calculationmodel->data_measurement_id ?? null))->placeholder(__('crud.select', ['item' => __('general.measurement')]))->class('form-control select2') }} {!! $errors->first('data_measurement_id', '

:message

') !!}
@@ -20,7 +20,7 @@
- {!! Form::select('measurement_id', App\Measurement::selectList(), e($calculationmodel->measurement_id ?? null), array('placeholder'=>__('crud.select', ['item'=>__('general.measurement')]),'class' => 'form-control select2')) !!} + {{ html()->select('measurement_id', App\Measurement::selectList(), e($calculationmodel->measurement_id ?? null))->placeholder(__('crud.select', ['item' => __('general.measurement')]))->class('form-control select2') }} {!! $errors->first('measurement_id', '

:message

') !!}
@@ -107,7 +107,7 @@
- {!! Form::select('calculation', App\Models\CalculationModel::$calculations, e($calculationmodel->calculation ?? null), array('placeholder'=>__('crud.select', ['item'=>'Calculation type']),'class' => 'form-control select2')) !!} + {{ html()->select('calculation', App\Models\CalculationModel::$calculations, e($calculationmodel->calculation ?? null))->placeholder(__('crud.select', ['item' => 'Calculation type']))->class('form-control select2') }} {!! $errors->first('calculation', '

:message

') !!}
diff --git a/resources/views/categories/create.blade.php b/resources/views/categories/create.blade.php index 3796c7c8..c245b992 100755 --- a/resources/views/categories/create.blade.php +++ b/resources/views/categories/create.blade.php @@ -5,11 +5,11 @@ @overwrite @section('body') - {!! Form::model($data, [ 'route' => 'categories.store' ]) !!} + {{ html()->modelForm($data, 'POST', route('categories.store'))->open() }} @include('categories.partials.form')
- {!! Form::submit('Create', [ 'class' => 'btn btn-primary btn-block' ]) !!} + {{ html()->input('submit')->value('Create')->class('btn btn-primary btn-block') }}
- {!! Form::close() !!} + {{ html()->closeModelForm() }} @overwrite \ No newline at end of file diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index 3ad934fc..1d10ddac 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -5,12 +5,12 @@ @overwrite @section('body') - {!! Form::model($category, [ 'route' => [ 'categories.update', $category->getKey() ], 'method' => 'PATCH' ]) !!} + {{ html()->modelForm($category, 'PATCH', route('categories.update', $category->getKey()))->open() }} @include('categories.partials.form')
- {!! Form::submit('Save', [ 'class' => 'btn btn-primary' ]) !!} + {{ html()->input('submit')->value('Save')->class('btn btn-primary') }}
- {!! Form::close() !!} + {{ html()->closeModelForm() }} @overwrite \ No newline at end of file diff --git a/resources/views/categories/partials/details.blade.php b/resources/views/categories/partials/details.blade.php index 5b66764d..6fad3e62 100644 --- a/resources/views/categories/partials/details.blade.php +++ b/resources/views/categories/partials/details.blade.php @@ -11,7 +11,7 @@
@endif - {!! Form::model($category, ['method' => 'PATCH', 'route' => ['categories.update', $category->id], 'files'=>'true']) !!} + {{ html()->modelForm($category, 'PATCH', route('categories.update', $category->id))->acceptsFiles()->open() }}
@@ -24,11 +24,11 @@ @endif - {!! Form::text('name', null, array('placeholder' => 'Programmatic name (make sure it not already used!!)', 'class' => 'form-control', 'title'=>'Programmatic (code) name (make sure it not used in the code, else it will break the app!!)')) !!} + {{ html()->text('name')->placeholder('Programmatic name (make sure it not already used!!)')->class('form-control')->attribute('title', 'Programmatic (code) name (make sure it not used in the code, else it will break the app!!)') }}
- {!! Form::file('icon', array('class' => 'btn btn-default', 'style'=>'display: inline-block;', 'title'=>'Icon')) !!} + {{ html()->file('icon')->class('btn btn-default')->style('display: inline-block;')->attribute('title', 'Icon') }}
@@ -36,10 +36,10 @@
- {!! Form::select('parent_id', $categories, null, [ 'class' => 'form-control' ]) !!} + {{ html()->select('parent_id', $categories)->class('form-control') }}
- {!! Form::select('type', App\Category::$types, null, array('class' => 'form-control')) !!} + {{ html()->select('type', App\Category::$types)->class('form-control') }}
@@ -56,14 +56,14 @@
{{ __('crud.description') }}:
-
{!! Form::text('description', null, array('placeholder' => 'Description in English', 'class' => 'form-control')) !!}
+
{{ html()->text('description')->placeholder('Description in English')->class('form-control') }}
Input {{ __('crud.type') }}:
-
{!! Form::select('category_input_id', App\CategoryInput::selectList(), null, array('class' => 'form-control')) !!}
+
{{ html()->select('category_input_id', App\CategoryInput::selectList())->class('form-control') }}
{{ __('general.Physical_quantity') }} ({{ __('general.unit') }}):
-
{!! Form::select('physical_quantity_id', App\PhysicalQuantity::selectList(), null, array('class' => 'form-control')) !!}
+
{{ html()->select('physical_quantity_id', App\PhysicalQuantity::selectList())->class('form-control') }}
{{ __('general.Source') }}:
-
{!! Form::text('source', null, array('placeholder' => __('general.Source').' (http://)', 'class' => 'form-control')) !!}
+
{{ html()->text('source')->placeholder(__('general.Source') . ' (http://)')->class('form-control') }}
{{ __('beep.required_in_inspection') }}:
@@ -77,7 +77,7 @@
{{--
--}} {{--
Old (fixed) category ID:
-
{!! Form::text('old_id', null, array('placeholder' => 'Id of former category in database', 'class' => 'form-control')) !!}
--}} +
{{ html()->text('old_id')->placeholder('Id of former category in database')->class('form-control') }}
--}}
@@ -87,7 +87,7 @@ - {!! Form::close() !!} + {{ html()->closeModelForm() }}
@@ -101,13 +101,13 @@ @permission('taxonomy-delete') @if ($category->useAmount() == 0) - {!! Form::open(['method' => 'DELETE','route' => ['categories.destroy', $category->id], 'style'=>'display:inline', 'onsubmit'=>'return confirm("'.__('crud.sure',['item'=>__('general.category'),'name'=>'\''.$category->name.'\'']).'")', 'title'=>'Delete category (and all it\'s descendants)']) !!} - {!! Form::button('', ['type'=>'submit', 'class' => 'btn btn-danger pull-right']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('categories.destroy', $category->id))->style('display:inline')->attribute('onsubmit', 'return confirm("' . __('crud.sure', ['item' => __('general.category'), 'name' => '\'' . $category->name . '\'']) . '")')->attribute('title', 'Delete category (and all it\'s descendants)')->open() }} + {{ html()->input('submit')->value('')->class('btn btn-danger pull-right') }} + {{ html()->form()->close() }} - {!! Form::open(['method' => 'DELETE','route' => ['categories.pop', $category->id], 'style'=>'display:inline', 'onsubmit'=>'return confirm("Are you sure you want to pop category "'.$category->name.'" out in between of the tree (and move all it"s descendants to its parent?")', 'title'=>'Pop category (and move all it\'s descendants to its parent)']) !!} - {!! Form::button('', ['type'=>'submit', 'class' => 'btn btn-danger pull-right','style'=>'margin-right: 10px;', ($category->isLeaf() ? 'disabled' : '')]) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('categories.pop', $category->id))->style('display:inline')->attribute('onsubmit', 'return confirm("Are you sure you want to pop category "' . $category->name . '" out in between of the tree (and move all it"s descendants to its parent?")')->attribute('title', 'Pop category (and move all it\'s descendants to its parent)')->open() }} + {{ html()->input('submit')->value('')->class('btn btn-danger pull-right')->style('margin-right: 10px;') }} + {{ html()->form()->close() }} @endif @endpermission diff --git a/resources/views/categories/partials/form.blade.php b/resources/views/categories/partials/form.blade.php index c4247391..fc38436a 100755 --- a/resources/views/categories/partials/form.blade.php +++ b/resources/views/categories/partials/form.blade.php @@ -1,28 +1,28 @@
- {!! Form::label('name', 'Identifier name (EN, lowercase, no spaces):') !!} - {!! Form::text('name', null, [ 'class' => 'form-control', 'autofocus' => true ]) !!} + {{ html()->label('Identifier name (EN, lowercase, no spaces):', 'name') }} + {{ html()->text('name')->class('form-control')->autofocus(true) }} {!! $errors->first('name') !!}
- {!! Form::label('names', 'OR multiple textual rows with categories (EN). Use a TAB to indicate a new child category:') !!} - {!! Form::textarea('names', null, [ 'class' => 'form-control' ]) !!} + {{ html()->label('OR multiple textual rows with categories (EN). Use a TAB to indicate a new child category:', 'names') }} + {{ html()->textarea('names')->class('form-control') }} {!! $errors->first('names') !!}
- {!! Form::label('parent_id', 'Parent:') !!} - {!! Form::select('parent_id', $categories, null, [ 'class' => 'form-control' ]) !!} + {{ html()->label('Parent:', 'parent_id') }} + {{ html()->select('parent_id', $categories)->class('form-control') }} {!! $errors->first('parent_id') !!}
{{ __('crud.description') }}:
-
{!! Form::text('description', null, array('placeholder' => 'Description in English', 'class' => 'form-control')) !!}
+
{{ html()->text('description')->placeholder('Description in English')->class('form-control') }}
{{ __('crud.type') }}:
-
{!! Form::select('category_input_id', App\CategoryInput::selectList(), isset($category->category_input_id) ? $category->category_input_id : 32, array('class' => 'form-control')) !!}
+
{{ html()->select('category_input_id', App\CategoryInput::selectList(), isset($category->category_input_id) ? $category->category_input_id : 32)->class('form-control') }}
{{ __('general.Physical_quantity') }} ({{ __('general.unit') }}):
-
{!! Form::select('physical_quantity_id', App\PhysicalQuantity::selectList(), null, array('class' => 'form-control')) !!}
+
{{ html()->select('physical_quantity_id', App\PhysicalQuantity::selectList())->class('form-control') }}
{{ __('beep.required_in_inspection') }}:
diff --git a/resources/views/categories/partials/translations.blade.php b/resources/views/categories/partials/translations.blade.php index d41b107f..329f869c 100644 --- a/resources/views/categories/partials/translations.blade.php +++ b/resources/views/categories/partials/translations.blade.php @@ -4,7 +4,7 @@ {{ $lang->name_english }}:
- {!! Form::text('language['.$lang->abbreviation.']', $translations->get($lang->id), array('placeholder' => $lang->name,'class' => 'form-control')) !!} + {{ html()->text('language[' . $lang->abbreviation . ']', $translations->get($lang->id))->placeholder($lang->name)->class('form-control') }}
@endforeach diff --git a/resources/views/checklist-svg/form.blade.php b/resources/views/checklist-svg/form.blade.php index 3642a5b2..1a65bd90 100644 --- a/resources/views/checklist-svg/form.blade.php +++ b/resources/views/checklist-svg/form.blade.php @@ -1,14 +1,14 @@
- {!! Form::select('user_id', App\User::selectlist(), isset($checklistsvg->user_id) ? $checklistsvg->user_id : Auth::user()->id, array('placeholder'=>__('crud.select', ['item'=>__('general.user')]),'class' => 'form-control select2')) !!} + {{ html()->select('user_id', App\User::selectlist(), isset($checklistsvg->user_id) ? $checklistsvg->user_id : Auth::user()->id)->placeholder(__('crud.select', ['item' => __('general.user')]))->class('form-control select2') }}
- {!! Form::select('checklist_id', App\Checklist::selectList(), isset($checklistsvg->checklist_id) ? $checklistsvg->checklist_id : null, array('id'=>'checklist_id', 'class' => 'form-control select2')) !!} + {{ html()->select('checklist_id', App\Checklist::selectList(), isset($checklistsvg->checklist_id) ? $checklistsvg->checklist_id : null)->id('checklist_id')->class('form-control select2') }} {!! $errors->first('checklist_id', '

:message

') !!}
diff --git a/resources/views/checklists/form.blade.php b/resources/views/checklists/form.blade.php index 723a3932..0d1c32cf 100644 --- a/resources/views/checklists/form.blade.php +++ b/resources/views/checklists/form.blade.php @@ -45,7 +45,7 @@
- {!! Form::select('user_id[]', $users, $selectedUserIds, array('id'=>'user_id', 'multiple'=>'multiple', 'class' => 'form-control select2', 'placeholder'=>'Select users...')) !!} + {{ html()->multiselect('user_id[]', $users, $selectedUserIds)->id('user_id')->class('form-control select2')->placeholder('Select users...') }} {!! $errors->first('user_id', '

:message

') !!}
@@ -58,7 +58,7 @@

{{ Auth::user()->name }}

- {!! Form::hidden('user_id[]', Auth::user()->id) !!} + {{ html()->hidden('user_id[]', Auth::user()->id) }} {!! $errors->first('user_id', '

:message

') !!}
diff --git a/resources/views/dashboard-group/form.blade.php b/resources/views/dashboard-group/form.blade.php index 14c9644f..967af1df 100644 --- a/resources/views/dashboard-group/form.blade.php +++ b/resources/views/dashboard-group/form.blade.php @@ -29,7 +29,7 @@
- {!! Form::select('hive_ids[]', $hive_ids, $dashboardgroup->hive_ids, array('class' => 'form-control select2','multiple')) !!} + {{ html()->multiselect('hive_ids[]', $hive_ids, $dashboardgroup->hive_ids)->class('form-control select2') }}
@@ -46,7 +46,7 @@
- {!! Form::select('interval', \App\Models\DashboardGroup::$intervals, $dashboardgroup->interval, array('class' => 'form-control select2','required')) !!} + {{ html()->select('interval', \App\Models\DashboardGroup::$intervals, $dashboardgroup->interval)->class('form-control select2')->required() }} {!! $errors->first('interval', '

:message

') !!}
diff --git a/resources/views/devices/create.blade.php b/resources/views/devices/create.blade.php index 5542fe52..b74c43ad 100644 --- a/resources/views/devices/create.blade.php +++ b/resources/views/devices/create.blade.php @@ -15,30 +15,30 @@
@endif - {!! Form::open(array('route' => 'devices.store','method'=>'POST')) !!} + {{ html()->form('POST', route('devices.store'))->open() }}
- {!! Form::text('name', null, ['placeholder' => __('crud.name'),'class' => 'form-control']) !!} + {{ html()->text('name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::select('category_id', $types, null, ['placeholder'=>__('crud.select', ['item'=>__('general.device').' '.__('general.type')]),'class' => 'form-control select2']) !!} + {{ html()->select('category_id', $types)->placeholder(__('crud.select', ['item' => __('general.device') . ' ' . __('general.type')]))->class('form-control select2') }}
- {!! Form::text('key', null, ['placeholder' => __('crud.key'),'class' => 'form-control']) !!} + {{ html()->text('key')->placeholder(__('crud.key'))->class('form-control') }}
- {!! Form::select('user_id', App\User::selectlist(), null, array('placeholder'=>__('crud.select', ['item'=>__('general.user')]),'class' => 'form-control select2')) !!} + {{ html()->select('user_id', App\User::selectlist())->placeholder(__('crud.select', ['item' => __('general.user')]))->class('form-control select2') }}
@@ -60,5 +60,5 @@
- {!! Form::close() !!} + {{ html()->form()->close() }} @endsection \ No newline at end of file diff --git a/resources/views/devices/data.blade.php b/resources/views/devices/data.blade.php index 342e492d..bee222d2 100644 --- a/resources/views/devices/data.blade.php +++ b/resources/views/devices/data.blade.php @@ -10,7 +10,7 @@ @slot('title') {{ __('crud.overview', ['item'=>__('general.devices')]) }}
- {!! Form::open(['method' => 'GET', 'route' => 'devices.data', 'class' => 'form-inline', 'role' => 'search']) !!} + {{ html()->form('GET', route('devices.data'))->class('form-inline')->attribute('role', 'search')->open() }}
@@ -31,7 +31,7 @@
- {!! Form::close() !!} + {{ html()->form()->close() }}
NB: De 'Research', 'User' & 'Device properties' filter velden filteren max 50 devices op volgorde van het laatste contact uit de database
 @endslot @@ -114,9 +114,9 @@ @endpermission @permission('sensor-delete') - {!! Form::open(['method' => 'DELETE','route' => ['devices.destroy', $device->id], 'style'=>'display:inline', 'onsubmit'=>'return confirm("'.__('crud.sure',['item'=>__('general.sensor'),'name'=>'\''.$device->name.'\'']).'")']) !!} - {!! Form::button('', ['type'=>'submit', 'class' => 'btn btn-danger pull-right']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('devices.destroy', $device->id))->style('display:inline')->attribute('onsubmit', 'return confirm("' . __('crud.sure', ['item' => __('general.sensor'), 'name' => '\'' . $device->name . '\'']) . '")')->open() }} + {{ html()->input('submit')->value('')->class('btn btn-danger pull-right') }} + {{ html()->form()->close() }} @endpermission @endif diff --git a/resources/views/devices/show.blade.php b/resources/views/devices/show.blade.php index 56ec3b35..c05dbf50 100644 --- a/resources/views/devices/show.blade.php +++ b/resources/views/devices/show.blade.php @@ -92,43 +92,43 @@ @endslot @slot('body') - {!! Form::open(['method' => 'GET','route' => ['devices.flashlog', $item->id, $flashlog->id]]) !!} + {{ html()->form('GET', route('devices.flashlog', [$item->id, $flashlog->id]))->open() }}
- {!! Form::number('matches_min', $matches_min, array('class' => 'form-control')) !!} + {{ html()->number('matches_min', $matches_min)->class('form-control') }}
- {!! Form::number('match_props', $match_props, array('class' => 'form-control')) !!} + {{ html()->number('match_props', $match_props)->class('form-control') }}
- {!! Form::number('db_records', $db_records, array('class' => 'form-control')) !!} + {{ html()->number('db_records', $db_records)->class('form-control') }}

- {!! Form::checkbox('save_result', 1, $save_result) !!} + {{ html()->checkbox('save_result', $save_result, 1) }}

- {!! Form::checkbox('dont_use_rtc', 1, $dont_use_rtc) !!} + {{ html()->checkbox('dont_use_rtc', $dont_use_rtc, 1) }}
- {!! Form::close() !!} + {{ html()->form()->close() }} diff --git a/resources/views/flash-log/form.blade.php b/resources/views/flash-log/form.blade.php index 82c921a2..1bdd0cf9 100644 --- a/resources/views/flash-log/form.blade.php +++ b/resources/views/flash-log/form.blade.php @@ -2,7 +2,7 @@
- {!! Form::select('user_id', App\User::selectList(), isset($flashlog->user_id) ? $flashlog->user_id : null, array('id'=>'user_id', 'class' => 'form-control select2')) !!} + {{ html()->select('user_id', App\User::selectList(), isset($flashlog->user_id) ? $flashlog->user_id : null)->id('user_id')->class('form-control select2') }} {!! $errors->first('user_id', '

:message

') !!}
@@ -11,7 +11,7 @@
- {!! Form::select('device_id', App\Device::selectList(), isset($flashlog->device_id) ? $flashlog->device_id : null, array('id'=>'device_id', 'class' => 'form-control select2')) !!} + {{ html()->select('device_id', App\Device::selectList(), isset($flashlog->device_id) ? $flashlog->device_id : null)->id('device_id')->class('form-control select2') }} {!! $errors->first('device_id', '

:message

') !!}
diff --git a/resources/views/flash-log/index.blade.php b/resources/views/flash-log/index.blade.php index 0d9daf67..d9600862 100644 --- a/resources/views/flash-log/index.blade.php +++ b/resources/views/flash-log/index.blade.php @@ -7,7 +7,7 @@ @component('components/box') @slot('title') {{ __('crud.overview', ['item'=>__('beep.Flash_logs')]) }} - {!! Form::open(['method' => 'GET', 'route' => 'flash-log.index', 'class' => 'form-inline', 'role' => 'search']) !!} + {{ html()->form('GET', route('flash-log.index'))->class('form-inline')->attribute('role', 'search')->open() }}
@@ -57,7 +57,7 @@
- {!! Form::close() !!} + {{ html()->form()->close() }}
NB: De 'Device', 'User' & 'Flashlog properties' filter velden filteren max 50 flashlog op volgorde van de laatste upload uit de database
 @endslot diff --git a/resources/views/groups/create.blade.php b/resources/views/groups/create.blade.php index 50701d39..fbb19374 100644 --- a/resources/views/groups/create.blade.php +++ b/resources/views/groups/create.blade.php @@ -15,23 +15,23 @@ @endif - {!! Form::open(array('route' => 'groups.store','method'=>'POST')) !!} + {{ html()->form('POST', route('groups.store'))->open() }}
- {!! Form::text('name', null, array('placeholder' => __('crud.name'),'class' => 'form-control')) !!} + {{ html()->text('name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::text('type', null, array('placeholder' => __('crud.type'),'class' => 'form-control')) !!} + {{ html()->text('type')->placeholder(__('crud.type'))->class('form-control') }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @endsection \ No newline at end of file diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index 67033270..bbd7d984 100644 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -15,23 +15,23 @@ @endif - {!! Form::model($item, ['method' => 'PATCH','route' => ['groups.update', $item->id]]) !!} + {{ html()->modelForm($item, 'PATCH', route('groups.update', $item->id))->open() }}
- {!! Form::text('name', null, array('placeholder' => __('crud.name'),'class' => 'form-control')) !!} + {{ html()->text('name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::text('type', null, array('placeholder' => __('crud.type'),'class' => 'form-control','style'=>'height:100px')) !!} + {{ html()->text('type')->placeholder(__('crud.type'))->class('form-control')->style('height:100px') }}
- {!! Form::close() !!} + {{ html()->closeModelForm() }} @endsection \ No newline at end of file diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index 9336db29..126bd25d 100644 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -36,9 +36,9 @@ @endpermission @permission('group-delete') - {!! Form::open(['method' => 'DELETE','route' => ['groups.destroy', $group->id], 'style'=>'display:inline', 'onsubmit'=>'return confirm("'.__('crud.sure',['item'=>__('general.group'),'name'=>'\''.$group->name.'\'']).'")']) !!} - {!! Form::button('', ['type'=>'submit', 'class' => 'btn btn-danger pull-right']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('groups.destroy', $group->id))->style('display:inline')->attribute('onsubmit', 'return confirm("' . __('crud.sure', ['item' => __('general.group'), 'name' => '\'' . $group->name . '\'']) . '")')->open() }} + {{ html()->input('submit')->value('')->class('btn btn-danger pull-right') }} + {{ html()->form()->close() }} @endpermission diff --git a/resources/views/image/form.blade.php b/resources/views/image/form.blade.php index ad121142..b69966f7 100644 --- a/resources/views/image/form.blade.php +++ b/resources/views/image/form.blade.php @@ -63,7 +63,7 @@
- {!! Form::select('user_id', App\User::all()->sortBy('name')->pluck('name','id'), isset($image->user_id) ? $image->user_id : Auth::user()->id, array('id'=>'user_id', 'class' => 'form-control select2', 'placeholder'=>'Select user...')) !!} + {{ html()->select('user_id', App\User::all()->sortBy('name')->pluck('name', 'id'), isset($image->user_id) ? $image->user_id : Auth::user()->id)->id('user_id')->class('form-control select2')->placeholder('Select user...') }} {!! $errors->first('user_id', '

:message

') !!}
@@ -72,7 +72,7 @@
- {!! Form::select('hive_id', Auth::user()->allHives()->orderBy('name')->pluck('name','id'), isset($image->hive_id) ? $image->hive_id : null, array('id'=>'hive_id', 'class' => 'form-control select2', 'placeholder'=>'Select hive...')) !!} + {{ html()->select('hive_id', Auth::user()->allHives()->orderBy('name')->pluck('name', 'id'), isset($image->hive_id) ? $image->hive_id : null)->id('hive_id')->class('form-control select2')->placeholder('Select hive...') }} {!! $errors->first('hive_id', '

:message

') !!}
@@ -81,7 +81,7 @@
- {!! Form::select('category_id', App\Category::all()->whereIn('input', ['image','file'])->pluck('trans','id'), isset($image->category_id) ? $image->category_id : null, array('id'=>'category_id', 'class' => 'form-control select2', 'placeholder'=>'Select category...')) !!} + {{ html()->select('category_id', App\Category::all()->whereIn('input', ['image', 'file'])->pluck('trans', 'id'), isset($image->category_id) ? $image->category_id : null)->id('category_id')->class('form-control select2')->placeholder('Select category...') }} {!! $errors->first('category_id', '

:message

') !!}
@@ -90,7 +90,7 @@
- {!! Form::select('inspection_id', Auth::user()->inspections->sortByDesc('created_at')->pluck('created_at','id'), isset($image->inspection_id) ? $image->inspection_id : null, array('id'=>'inspection_id', 'class' => 'form-control select2', 'placeholder'=>'Select inspection...')) !!} + {{ html()->select('inspection_id', Auth::user()->inspections->sortByDesc('created_at')->pluck('created_at', 'id'), isset($image->inspection_id) ? $image->inspection_id : null)->id('inspection_id')->class('form-control select2')->placeholder('Select inspection...') }} {!! $errors->first('inspection_id', '

:message

') !!}
diff --git a/resources/views/inspections/form.blade.php b/resources/views/inspections/form.blade.php index 5f466e6e..6cee1737 100644 --- a/resources/views/inspections/form.blade.php +++ b/resources/views/inspections/form.blade.php @@ -50,7 +50,7 @@
- {!! Form::select('checklist_id', App\Checklist::selectList(), isset($measurement->checklist_id) ? $measurement->checklist_id : null, array('id'=>'checklist_id', 'class' => 'form-control select2')) !!} + {{ html()->select('checklist_id', App\Checklist::selectList(), isset($measurement->checklist_id) ? $measurement->checklist_id : null)->id('checklist_id')->class('form-control select2') }} {!! $errors->first('checklist_id', '

:message

') !!}
diff --git a/resources/views/measurement/form.blade.php b/resources/views/measurement/form.blade.php index a10d8960..378d080f 100644 --- a/resources/views/measurement/form.blade.php +++ b/resources/views/measurement/form.blade.php @@ -11,7 +11,7 @@
- {!! Form::select('physical_quantity_id', App\PhysicalQuantity::selectList(), isset($measurement->physical_quantity_id) ? $measurement->physical_quantity_id : null, array('id'=>'physical_quantity_id', 'class' => 'form-control')) !!} + {{ html()->select('physical_quantity_id', App\PhysicalQuantity::selectList(), isset($measurement->physical_quantity_id) ? $measurement->physical_quantity_id : null)->id('physical_quantity_id')->class('form-control') }} {!! $errors->first('physical_quantity_id', '

:message

') !!}
diff --git a/resources/views/research/consent_edit.blade.php b/resources/views/research/consent_edit.blade.php index 8bd37f81..300d85f2 100644 --- a/resources/views/research/consent_edit.blade.php +++ b/resources/views/research/consent_edit.blade.php @@ -42,24 +42,24 @@ - {!! Form::model($item, ['method' => 'PATCH','route' => ['research.consent_edit', ['id'=>$research->id, 'c_id'=>$item->id]]]) !!} + {{ html()->modelForm($item, 'PATCH', route('research.consent_edit', ['id' => $research->id, 'c_id' => $item->id]))->open() }}
- {!! Form::select('consent_hive_ids[]', \App\Hive::where('user_id',$item->user_id)->pluck('name','id')->toArray(), $item->consent_hive_ids, array('class' => 'form-control select2', 'multiple', 'id'=>'consent_hive_ids')) !!} + {{ html()->multiselect('consent_hive_ids[]', \App\Hive::where('user_id', $item->user_id)->pluck('name', 'id')->toArray(), $item->consent_hive_ids)->class('form-control select2')->id('consent_hive_ids') }}
- {!! Form::select('consent_location_ids[]', \App\Location::where('user_id',$item->user_id)->pluck('name','id')->toArray(), $item->consent_location_ids, array('class' => 'form-control select2', 'multiple', 'id'=>'consent_location_ids')) !!} + {{ html()->multiselect('consent_location_ids[]', \App\Location::where('user_id', $item->user_id)->pluck('name', 'id')->toArray(), $item->consent_location_ids)->class('form-control select2')->id('consent_location_ids') }}
- {!! Form::select('consent_sensor_ids[]', \App\Device::where('user_id',$item->user_id)->pluck('name','id')->toArray(), $item->consent_sensor_ids, array('class' => 'form-control select2', 'multiple', 'id'=>'consent_sensor_ids')) !!} + {{ html()->multiselect('consent_sensor_ids[]', \App\Device::where('user_id', $item->user_id)->pluck('name', 'id')->toArray(), $item->consent_sensor_ids)->class('form-control select2')->id('consent_sensor_ids') }}
@@ -75,6 +75,6 @@ - {!! Form::close() !!} + {{ html()->closeModelForm() }} @endcomponent @endsection diff --git a/resources/views/research/data.blade.php b/resources/views/research/data.blade.php index 7d1225fc..5b6c03f4 100644 --- a/resources/views/research/data.blade.php +++ b/resources/views/research/data.blade.php @@ -58,7 +58,7 @@
- {!! Form::select('user_ids[]', $consent_users_select, $consent_users_selected, array('id'=>'user_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('user_ids[]', $consent_users_select, $consent_users_selected)->id('user_ids')->class('form-control select2') }} {!! $errors->first('user_ids', '

:message

') !!}
@@ -70,7 +70,7 @@
- {!! Form::select('device_ids[]', $devices_select, $device_ids, array('id'=>'device_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('device_ids[]', $devices_select, $device_ids)->id('device_ids')->class('form-control select2') }} {!! $errors->first('device_ids', '

:message

') !!}
diff --git a/resources/views/research/form.blade.php b/resources/views/research/form.blade.php index 0c981c74..4e964c73 100644 --- a/resources/views/research/form.blade.php +++ b/resources/views/research/form.blade.php @@ -3,7 +3,7 @@
{{-- --}} - {!! Form::select('user_id', App\User::selectList(), isset($research->user_id) ? $research->user_id : Auth::user()->id, array('id'=>'user_id','class' => 'form-control select2')) !!} + {{ html()->select('user_id', App\User::selectList(), isset($research->user_id) ? $research->user_id : Auth::user()->id)->id('user_id')->class('form-control select2') }} {!! $errors->first('user_id', '

:message

') !!}
@@ -145,7 +145,7 @@
{{-- --}} - {!! Form::select('checklist_ids[]', App\Checklist::selectList(), $research->checklists->count() > 0 ? $research->checklists->pluck('id') : null, array('id'=>'checklist_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('checklist_ids[]', App\Checklist::selectList(), $research->checklists->count() > 0 ? $research->checklists->pluck('id') : null)->id('checklist_ids')->class('form-control select2') }} {!! $errors->first('checklist_ids', '

:message

') !!}
@@ -156,7 +156,7 @@
{{-- --}} - {!! Form::select('viewer_ids[]', App\User::selectList(), $research->viewers->count() > 0 ? $research->viewers->pluck('id') : null, array('id'=>'viewer_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('viewer_ids[]', App\User::selectList(), $research->viewers->count() > 0 ? $research->viewers->pluck('id') : null)->id('viewer_ids')->class('form-control select2') }} {!! $errors->first('viewer_ids', '

:message

') !!}
@@ -167,7 +167,7 @@
{{-- --}} - {!! Form::select('default_user_ids[]', App\User::selectList(), isset($research->default_user_ids) ? $research->default_user_ids : null, array('id'=>'default_user_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('default_user_ids[]', App\User::selectList(), isset($research->default_user_ids) ? $research->default_user_ids : null)->id('default_user_ids')->class('form-control select2') }} {!! $errors->first('default_user_ids', '

:message

') !!}
diff --git a/resources/views/research/show.blade.php b/resources/views/research/show.blade.php index 789c0603..1ecd0a04 100644 --- a/resources/views/research/show.blade.php +++ b/resources/views/research/show.blade.php @@ -22,7 +22,7 @@
- {!! Form::select('user_ids[]', $consent_users_select, $consent_users_selected, array('id'=>'user_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('user_ids[]', $consent_users_select, $consent_users_selected)->id('user_ids')->class('form-control select2') }} {!! $errors->first('user_ids', '

:message

') !!}
@@ -31,7 +31,7 @@
- {!! Form::select('device_ids[]', $devices_select, $device_ids, array('id'=>'device_ids','class' => 'form-control select2', 'multiple')) !!} + {{ html()->multiselect('device_ids[]', $devices_select, $device_ids)->id('device_ids')->class('form-control select2') }} {!! $errors->first('device_ids', '

:message

') !!}
diff --git a/resources/views/roles/create.blade.php b/resources/views/roles/create.blade.php index 45d4a2a1..b8c1f524 100644 --- a/resources/views/roles/create.blade.php +++ b/resources/views/roles/create.blade.php @@ -15,24 +15,24 @@ @endif - {!! Form::open(array('route' => 'roles.store','method'=>'POST')) !!} + {{ html()->form('POST', route('roles.store'))->open() }}
- {!! Form::text('name', null, array('placeholder' => __('crud.name'),'class' => 'form-control')) !!} + {{ html()->text('name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::text('display_name', null, array('placeholder' => __('crud.display_name'),'class' => 'form-control')) !!} + {{ html()->text('display_name')->placeholder(__('crud.display_name'))->class('form-control') }}
- {!! Form::textarea('description', null, array('placeholder' => __('crud.description'),'class' => 'form-control','style'=>'height:100px')) !!} + {{ html()->textarea('description')->placeholder(__('crud.description'))->class('form-control')->style('height:100px') }}
@@ -41,7 +41,7 @@

{{ __('crud.select_multi', ['item'=>__('general.permission')]) }}

@foreach($permission as $value) -

- {!! Form::close() !!} + {{ html()->form()->close() }} @endsection \ No newline at end of file diff --git a/resources/views/roles/edit.blade.php b/resources/views/roles/edit.blade.php index 8ebb55ee..28b9289c 100644 --- a/resources/views/roles/edit.blade.php +++ b/resources/views/roles/edit.blade.php @@ -15,18 +15,18 @@ @endif - {!! Form::model($role, ['method' => 'PATCH','route' => ['roles.update', $role->id]]) !!} + {{ html()->modelForm($role, 'PATCH', route('roles.update', $role->id))->open() }}
- {!! Form::text('display_name', null, array('placeholder' => __('crud.name'),'class' => 'form-control')) !!} + {{ html()->text('display_name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::textarea('description', null, array('placeholder' => __('crud.description'),'class' => 'form-control','style'=>'height:100px')) !!} + {{ html()->textarea('description')->placeholder(__('crud.description'))->class('form-control')->style('height:100px') }}
@@ -35,7 +35,7 @@

{{ __('crud.select_multi', ['item'=>__('general.permission')]) }}

@foreach($permission as $value) -

- {!! Form::close() !!} + {{ html()->closeModelForm() }} @endsection \ No newline at end of file diff --git a/resources/views/roles/index.blade.php b/resources/views/roles/index.blade.php index cc5ead69..1e1044b2 100644 --- a/resources/views/roles/index.blade.php +++ b/resources/views/roles/index.blade.php @@ -37,9 +37,9 @@ @endpermission @permission('role-delete') - {!! Form::open(['method' => 'DELETE','route' => ['roles.destroy', $role->id], 'style'=>'display:inline', 'onsubmit'=>'return confirm("'.__('crud.sure',['item'=>__('general.role'),'name'=>'\''.$role->display_name.'\'']).'")']) !!} - {!! Form::button('', ['type'=>'submit', 'class' => 'btn btn-danger pull-right']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('roles.destroy', $role->id))->style('display:inline')->attribute('onsubmit', 'return confirm("' . __('crud.sure', ['item' => __('general.role'), 'name' => '\'' . $role->display_name . '\'']) . '")')->open() }} + {{ html()->input('submit')->value('')->class('btn btn-danger pull-right') }} + {{ html()->form()->close() }} @endpermission diff --git a/resources/views/sample-code/form.blade.php b/resources/views/sample-code/form.blade.php index de5cc3ff..59d822e8 100644 --- a/resources/views/sample-code/form.blade.php +++ b/resources/views/sample-code/form.blade.php @@ -58,7 +58,7 @@
- {!! Form::select('user_id', App\User::selectList(), isset($samplecode->user_id) ? $samplecode->user_id : null, array('id'=>'user_id', 'class' => 'form-control')) !!} + {{ html()->select('user_id', App\User::selectList(), isset($samplecode->user_id) ? $samplecode->user_id : null)->id('user_id')->class('form-control') }} {!! $errors->first('user_id', '

:message

') !!}
@@ -74,7 +74,7 @@
- {!! Form::select('queen_id', App\Queen::selectList(), isset($samplecode->queen_id) ? $samplecode->queen_id : null, array('id'=>'queen_id', 'class' => 'form-control')) !!} + {{ html()->select('queen_id', App\Queen::selectList(), isset($samplecode->queen_id) ? $samplecode->queen_id : null)->id('queen_id')->class('form-control') }} {!! $errors->first('queen_id', '

:message

') !!}
diff --git a/resources/views/sensordefinition/form.blade.php b/resources/views/sensordefinition/form.blade.php index 6e9155e3..fcef868e 100644 --- a/resources/views/sensordefinition/form.blade.php +++ b/resources/views/sensordefinition/form.blade.php @@ -62,7 +62,7 @@
- {!! Form::select('input_measurement_id', $measurement_select, isset($sensordefinition->input_measurement_id) ? $sensordefinition->input_measurement_id : null, array('id'=>'input_measurement_id', 'class' => 'form-control select2', 'placeholder'=>'Select physical quantity...')) !!} + {{ html()->select('input_measurement_id', $measurement_select, isset($sensordefinition->input_measurement_id) ? $sensordefinition->input_measurement_id : null)->id('input_measurement_id')->class('form-control select2')->placeholder('Select physical quantity...') }} {!! $errors->first('input_measurement_id', '

:message

') !!}
@@ -72,7 +72,7 @@
- {!! Form::select('output_measurement_id', $measurement_select, isset($sensordefinition->output_measurement_id) ? $sensordefinition->output_measurement_id : null, array('id'=>'output_measurement_id', 'class' => 'form-control select2', 'placeholder'=>'Select physical quantity...')) !!} + {{ html()->select('output_measurement_id', $measurement_select, isset($sensordefinition->output_measurement_id) ? $sensordefinition->output_measurement_id : null)->id('output_measurement_id')->class('form-control select2')->placeholder('Select physical quantity...') }} {!! $errors->first('output_measurement_id', '

:message

') !!}
@@ -82,7 +82,7 @@
- {!! Form::select('device_id', $devices_select, isset($sensordefinition->device_id) ? $sensordefinition->device_id : null, array('id'=>'device_id', 'class' => 'form-control select2')) !!} + {{ html()->select('device_id', $devices_select, isset($sensordefinition->device_id) ? $sensordefinition->device_id : null)->id('device_id')->class('form-control select2') }} {!! $errors->first('device_id', '

:message

') !!}
diff --git a/resources/views/sensordefinition/index.blade.php b/resources/views/sensordefinition/index.blade.php index 57ab9188..d22a659d 100644 --- a/resources/views/sensordefinition/index.blade.php +++ b/resources/views/sensordefinition/index.blade.php @@ -8,10 +8,10 @@ @slot('title') {{ __('crud.overview', ['item'=>__('beep.SensorDefinition')]) }} - {!! Form::open(['method' => 'GET', 'route' => 'sensordefinition.index', 'class' => 'form-inline', 'role' => 'search']) !!} + {{ html()->form('GET', route('sensordefinition.index'))->class('form-inline')->attribute('role', 'search')->open() }}
- {!! Form::select('measurement_id', App\Measurement::selectList(), e($search_mid ?? null), array('style'=>'max-width: 300px; font-size:10px;', 'onchange'=>'this.form.submit()', 'placeholder'=>__('crud.select', ['item'=>__('beep.measurement')]),'class' => 'form-control select2')) !!} + {{ html()->select('measurement_id', App\Measurement::selectList(), e($search_mid ?? null))->style('max-width: 300px; font-size:10px;')->attribute('onchange', 'this.form.submit()')->placeholder(__('crud.select', ['item' => __('beep.measurement')]))->class('form-control select2') }}
@@ -31,9 +31,9 @@
- {!! Form::hidden('page', $page) !!} + {{ html()->hidden('page', $page) }} - {!! Form::close() !!} + {{ html()->form()->close() }} @endslot @slot('action') diff --git a/resources/views/translations/edit.blade.php b/resources/views/translations/edit.blade.php index 58a9c49d..b1c5e1d4 100644 --- a/resources/views/translations/edit.blade.php +++ b/resources/views/translations/edit.blade.php @@ -30,7 +30,7 @@ @endslot @endcomponent - {!! Form::open([ 'route' => ['translations.update', $language->id], 'method' => 'PATCH' ]) !!} + {{ html()->form('PATCH', route('translations.update', $language->id))->open() }} @component('components/box') @slot('title') @@ -38,7 +38,7 @@ @endslot @slot('action') - {!! Form::submit('Update translations', [ 'class' => 'btn btn-primary btn-block small' ]) !!} + {{ html()->input('submit')->value('Update translations')->class('btn btn-primary btn-block small') }} @endslot @slot('body') @@ -50,12 +50,12 @@ @endif
- {!! Form::submit('Update translations', [ 'class' => 'btn btn-primary btn-block' ]) !!} + {{ html()->input('submit')->value('Update translations')->class('btn btn-primary btn-block') }}
@endslot @endcomponent - {!! Form::close() !!} + {{ html()->form()->close() }} @endsection \ No newline at end of file diff --git a/resources/views/translations/partials/input.blade.php b/resources/views/translations/partials/input.blade.php index ce697102..78ac71fa 100644 --- a/resources/views/translations/partials/input.blade.php +++ b/resources/views/translations/partials/input.blade.php @@ -32,10 +32,10 @@ {{ App\Translation::where('type', 'alert_rule_description')->where('name', $r->description)->where('language_id', 1)->value('translation') }}

- {!! Form::text("translation_alert_rule[$r->id]", App\Translation::where('type', 'alert_rule')->where('name', $r->name)->where('language_id', $language->id)->value('translation'), [ 'class' => 'form-control' ]) !!} + {{ html()->text("translation_alert_rule[{$r->id}]", App\Translation::where('type', 'alert_rule')->where('name', $r->name)->where('language_id', $language->id)->value('translation'))->class('form-control') }} - {!! Form::text("translation_alert_rule_descr[$r->id]", App\Translation::where('type', 'alert_rule_description')->where('name', $r->description)->where('language_id', $language->id)->value('translation'), [ 'class' => 'form-control' ]) !!} + {{ html()->text("translation_alert_rule_descr[{$r->id}]", App\Translation::where('type', 'alert_rule_description')->where('name', $r->description)->where('language_id', $language->id)->value('translation'))->class('form-control') }} @@ -78,7 +78,7 @@

{{ App\Translation::where('type', 'physical_quantity')->where('name', $p->abbreviation)->where('language_id', 1)->value('translation') }}

- {!! Form::text("translation_physical_quantity[$p->id]", App\Translation::where('type', 'physical_quantity')->where('name', $p->abbreviation)->where('language_id', $language->id)->value('translation'), [ 'class' => 'form-control' ]) !!} + {{ html()->text("translation_physical_quantity[{$p->id}]", App\Translation::where('type', 'physical_quantity')->where('name', $p->abbreviation)->where('language_id', $language->id)->value('translation'))->class('form-control') }} @@ -120,7 +120,7 @@

{{ App\Translation::where('type', 'measurement')->where('name', $m->abbreviation)->where('language_id', 1)->value('translation') }}

- {!! Form::text("translation_measurement[$m->id]", App\Translation::where('type', 'measurement')->where('name', $m->abbreviation)->where('language_id', $language->id)->value('translation'), [ 'class' => 'form-control' ]) !!} + {{ html()->text("translation_measurement[{$m->id}]", App\Translation::where('type', 'measurement')->where('name', $m->abbreviation)->where('language_id', $language->id)->value('translation'))->class('form-control') }} @@ -169,7 +169,7 @@

{{ App\Translation::where('type', 'category')->where('name', $name)->where('language_id', 1)->value('translation') }}

- {!! Form::text("translation_category[$cat_id]", App\Translation::where('type', 'category')->where('name', $name)->where('language_id', $language->id)->value('translation'), [ 'class' => 'form-control' ]) !!} + {{ html()->text("translation_category[{$cat_id}]", App\Translation::where('type', 'category')->where('name', $name)->where('language_id', $language->id)->value('translation'))->class('form-control') }} diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index 45a353ea..3fe19ab2 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -15,63 +15,63 @@ @endif - {!! Form::open(array('route' => 'users.store','method'=>'POST','files'=>'true')) !!} + {{ html()->form('POST', route('users.store'))->acceptsFiles()->open() }}
- {!! Form::text('name', null, array('placeholder' => __('crud.name'),'class' => 'form-control')) !!} + {{ html()->text('name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::text('email', null, array('placeholder' => __('crud.email'),'class' => 'form-control')) !!} + {{ html()->text('email')->placeholder(__('crud.email'))->class('form-control') }}
- {!! Form::text('locale', null, array('placeholder' => __('general.Language').' code','class' => 'form-control')) !!} + {{ html()->text('locale')->placeholder(__('general.Language') . ' code')->class('form-control') }}
- {!! Form::text('rate_limit_per_min', null, array('placeholder' => 'Max requests per minute'.' code','class' => 'form-control')) !!} + {{ html()->text('rate_limit_per_min')->placeholder('Max requests per minute' . ' code')->class('form-control') }}
- {!! Form::file('avatar', array('class' => 'btn btn-default')) !!} + {{ html()->file('avatar')->class('btn btn-default') }}

{{ __('crud.avatar_file') }}

- {!! Form::password('password', array('placeholder' => __('crud.pass'),'class' => 'form-control')) !!} + {{ html()->password('password')->attribute('placeholder', __('crud.pass'))->class('form-control') }}
- {!! Form::password('confirm-password', array('placeholder' => __('crud.pass_confirm'),'class' => 'form-control')) !!} + {{ html()->password('confirm-password')->attribute('placeholder', __('crud.pass_confirm'))->class('form-control') }}
@role('superadmin')
- {!! Form::select('sensors[]', $sensors, null, array('class' => 'form-control select2','multiple')) !!} + {{ html()->multiselect('sensors[]', $sensors)->class('form-control select2') }}

{{ __('crud.select_multi', ['item'=>__('general.sensors')]) }}

- {!! Form::select('roles[]', $roles, null, array('class' => 'form-control select2','multiple')) !!} + {{ html()->multiselect('roles[]', $roles)->class('form-control select2') }}

{{ __('crud.select_multi', ['item'=>__('general.roles')]) }}

@@ -80,6 +80,6 @@
- {!! Form::hidden('api-token', Str::random(60)) !!} - {!! Form::close() !!} + {{ html()->hidden('api-token', Str::random(60)) }} + {{ html()->form()->close() }} @endsection \ No newline at end of file diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 68deebc3..6954e4bf 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -16,30 +16,30 @@ @endif - {!! Form::model($user, ['method' => 'PATCH','route' => ['users.update', $user->id],'files'=>'true']) !!} + {{ html()->modelForm($user, 'PATCH', route('users.update', $user->id))->acceptsFiles()->open() }}
- {!! Form::text('name', null, array('placeholder' => __('crud.name'),'class' => 'form-control')) !!} + {{ html()->text('name')->placeholder(__('crud.name'))->class('form-control') }}
- {!! Form::text('email', null, array('placeholder' => __('crud.email'),'class' => 'form-control')) !!} + {{ html()->text('email')->placeholder(__('crud.email'))->class('form-control') }}
- {!! Form::text('locale', null, array('placeholder' => __('general.Language').' code','class' => 'form-control')) !!} + {{ html()->text('locale')->placeholder(__('general.Language') . ' code')->class('form-control') }}
- {!! Form::text('rate_limit_per_min', null, array('placeholder' => 'Max requests per minute'.' code','class' => 'form-control')) !!} + {{ html()->text('rate_limit_per_min')->placeholder('Max requests per minute' . ' code')->class('form-control') }}
@@ -47,34 +47,34 @@
- {!! Form::file('avatar', array('class' => 'btn btn-default', 'style'=>'display: inline-block;')) !!} + {{ html()->file('avatar')->class('btn btn-default')->style('display: inline-block;') }}

{{ __('crud.avatar_file')}}

- {!! Form::password('password', array('placeholder' => __('crud.pass'),'class' => 'form-control')) !!} + {{ html()->password('password')->attribute('placeholder', __('crud.pass'))->class('form-control') }}
- {!! Form::password('confirm-password', array('placeholder' => __('crud.pass_confirm'),'class' => 'form-control')) !!} + {{ html()->password('confirm-password')->attribute('placeholder', __('crud.pass_confirm'))->class('form-control') }}
@role('superadmin')
- {!! Form::select('sensors[]', $sensors, $userSensor, array('class' => 'form-control select2','multiple')) !!} + {{ html()->multiselect('sensors[]', $sensors, $userSensor)->class('form-control select2') }}

{{ __('crud.select_multi', ['item'=>__('general.sensors')]) }}

- {!! Form::select('roles[]', $roles, $userRole, array('class' => 'form-control select2','multiple')) !!} + {{ html()->multiselect('roles[]', $roles, $userRole)->class('form-control select2') }}

{{ __('crud.select_multi', ['item'=>__('general.roles')]) }}

@@ -85,5 +85,5 @@ - {!! Form::close() !!} + {{ html()->closeModelForm() }} @endsection \ No newline at end of file diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index b2cb90dc..4e479e9a 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -9,15 +9,15 @@ @component('components/box') @slot('title') {{ __('crud.overview', ['item'=>__('general.users')]) }} - {!! Form::open(['method' => 'GET', 'route' => 'users.index', 'class' => 'form-inline', 'role' => 'search']) !!} + {{ html()->form('GET', route('users.index'))->class('form-inline')->attribute('role', 'search')->open() }}
- {!! Form::hidden('page', $page) !!} - {!! Form::close() !!} + {{ html()->hidden('page', $page) }} + {{ html()->form()->close() }} @endslot @slot('action') @@ -100,9 +100,9 @@ @endpermission @permission('user-delete') - {!! Form::open(['method' => 'DELETE','route' => ['users.destroy', $user->id], 'style'=>'display:inline', 'onsubmit'=>'return confirm("'.__('crud.sure',['item'=>__('general.user'),'name'=>'\''.$user->name.'\'']).'")']) !!} - {!! Form::button('', ['type'=>'submit', 'class' => 'btn btn-danger pull-right']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('users.destroy', $user->id))->style('display:inline')->attribute('onsubmit', 'return confirm("' . __('crud.sure', ['item' => __('general.user'), 'name' => '\'' . $user->name . '\'']) . '")')->open() }} + {{ html()->input('submit')->value('')->class('btn btn-danger pull-right') }} + {{ html()->form()->close() }} @endpermission