From 62beb11051593e566026eee96793bd29909c77fc Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Tue, 7 Aug 2018 17:35:45 +0300 Subject: [PATCH] refs #443 form element add manuel --- resources/views/auth/forgot/create.blade.php | 5 +++++ resources/views/auth/login/create.blade.php | 9 +++++++++ resources/views/auth/reset/create.blade.php | 6 ++++++ resources/views/auth/users/create.blade.php | 2 ++ resources/views/auth/users/edit.blade.php | 2 ++ .../views/common/import/create.blade.php | 2 ++ resources/views/common/items/create.blade.php | 2 ++ .../views/expenses/bills/create.blade.php | 2 ++ .../views/incomes/customers/create.blade.php | 4 +++- .../views/incomes/customers/edit.blade.php | 2 ++ .../reports/expense_summary/index.blade.php | 2 ++ .../income_expense_summary/index.blade.php | 2 ++ .../reports/income_summary/index.blade.php | 2 ++ .../views/reports/profit_loss/index.blade.php | 2 ++ .../views/reports/tax_summary/index.blade.php | 2 ++ .../settings/categories/create.blade.php | 2 ++ .../views/settings/categories/edit.blade.php | 2 ++ .../nwidart/menus/child/dropdown.blade.php | 20 +++++++++---------- .../vendor/nwidart/menus/child/item.blade.php | 14 ++++++------- .../nwidart/menus/item/dropdown.blade.php | 10 +++++----- .../vendor/nwidart/menus/item/item.blade.php | 16 +++++++-------- .../views/vendor/nwidart/menus/menu.blade.php | 10 +++++----- 22 files changed, 84 insertions(+), 36 deletions(-) diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php index 386118455..13f90da8e 100644 --- a/resources/views/auth/forgot/create.blade.php +++ b/resources/views/auth/forgot/create.blade.php @@ -7,6 +7,8 @@
{{ csrf_field() }} + @stack('email_input_start') +
@@ -16,6 +18,9 @@ @endif
+ + @stack('email_input_end') +
diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php index 07b818b51..90d9d1adb 100644 --- a/resources/views/auth/login/create.blade.php +++ b/resources/views/auth/login/create.blade.php @@ -7,6 +7,7 @@ {{ csrf_field() }} + @stack('email_input_start')
@@ -16,6 +17,9 @@ @endif
+ @stack('email_input_end') + + @stack('password_input_start')
@@ -25,7 +29,10 @@ @endif
+ @stack('password_input_end') +
+ @stack('remember_input_start')
+ @stack('remember_input_end') +
diff --git a/resources/views/auth/reset/create.blade.php b/resources/views/auth/reset/create.blade.php index 310b10aa8..6cfd41cab 100644 --- a/resources/views/auth/reset/create.blade.php +++ b/resources/views/auth/reset/create.blade.php @@ -9,6 +9,7 @@ + @stack('email_input_start')
@@ -18,7 +19,9 @@ @endif
+ @stack('email_input_end') + @stack('password_input_start')
@@ -28,7 +31,9 @@ @endif
+ @stack('password_input_end') + @stack('password_confirmation_input_start')
@@ -38,6 +43,7 @@ @endif
+ @stack('password_confirmation_input_end')
diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php index 921ee4c6d..5530867fa 100644 --- a/resources/views/auth/users/create.blade.php +++ b/resources/views/auth/users/create.blade.php @@ -19,6 +19,7 @@ {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('general.default_locale')) }} @if (setting('general.use_gravatar', '0') == '1') + @stack('picture_input_start') {{ Form::hidden('picture', trans_choice('general.pictures', 1)) }}
{!! Form::label('picture', trans_choice('general.pictures', 1), ['class' => 'control-label']) !!} @@ -28,6 +29,7 @@ {!! Form::hidden('picture', null, ['id' => 'picture', 'class' => 'form-control']) !!}
+ @stack('picture_input_end') @else {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }} @endif diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index 49c512634..272842b4d 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -24,6 +24,7 @@ {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed()) }} @if (setting('general.use_gravatar', '0') == '1') + @stack('picture_input_start')
{!! Form::label('picture', trans_choice('general.pictures', 1), ['class' => 'control-label']) !!}
@@ -32,6 +33,7 @@ {!! Form::hidden('picture', null, ['id' => 'picture', 'class' => 'form-control']) !!}
+ @stack('picture_input_end') @else {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }} @endif diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php index 77b4df6fe..94c73123f 100644 --- a/resources/views/common/import/create.blade.php +++ b/resources/views/common/import/create.blade.php @@ -12,11 +12,13 @@ {!! trans('import.message', ['link' => url('public/files/import/' . $type . '.xlsx')]) !!}
+ @stack('import_input_start')
{!! Form::label('import', trans('general.form.select.file'), ['class' => 'control-label']) !!} {!! Form::file('import', null, ['class' => 'form-control']) !!} {!! $errors->first('import', '

:message

') !!}
+ @stack('import_input_end')
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php index c179c22d7..3365c78b3 100644 --- a/resources/views/common/items/create.blade.php +++ b/resources/views/common/items/create.blade.php @@ -22,6 +22,7 @@ {{ Form::selectGroup('tax_id', trans_choice('general.taxes', 1), 'percent', $taxes, setting('general.default_tax'), []) }} + @stack('category_id_input_start')
{!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
@@ -33,6 +34,7 @@
{!! $errors->first('category_id', '

:message

') !!}
+ @stack('category_id_input_end') {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }} diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index cb81ab142..95d04a745 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -8,6 +8,7 @@ {!! Form::open(['url' => 'expenses/bills', 'files' => true, 'role' => 'form']) !!}
+ @stack('vendor_id_input_start')
{!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!}
@@ -19,6 +20,7 @@
{!! $errors->first('vendor_id', '

:message

') !!}
+ @stack('vendor_id_input_end') {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }} diff --git a/resources/views/incomes/customers/create.blade.php b/resources/views/incomes/customers/create.blade.php index 7231bf247..f1c313b86 100644 --- a/resources/views/incomes/customers/create.blade.php +++ b/resources/views/incomes/customers/create.blade.php @@ -24,9 +24,11 @@ {{ Form::radioGroup('enabled', trans('general.enabled')) }} -
+ @stack('create_user_input_start') +
{{ trans('customers.allow_login') }}   {{ Form::checkbox('create_user', '1', null, ['id' => 'create_user']) }}
+ @stack('create_user_input_end')
diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/incomes/customers/edit.blade.php index 223bd7cc7..e34291182 100644 --- a/resources/views/incomes/customers/edit.blade.php +++ b/resources/views/incomes/customers/edit.blade.php @@ -28,6 +28,7 @@ {{ Form::radioGroup('enabled', trans('general.enabled')) }} + @stack('create_user_input_start')
@if ($customer->user_id) {{ trans('customers.user_created') }}   {{ Form::checkbox('create_user', '1', 1, ['id' => 'create_user', 'disabled' => 'disabled']) }} @@ -35,6 +36,7 @@ {{ trans('customers.allow_login') }}   {{ Form::checkbox('create_user', '1', null, ['id' => 'create_user']) }} @endif
+ @stack('create_user_input_end')
diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php index 49698b673..1f6e0e052 100644 --- a/resources/views/reports/expense_summary/index.blade.php +++ b/resources/views/reports/expense_summary/index.blade.php @@ -17,7 +17,9 @@ {!! Form::open(['url' => 'reports/expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
+ @stack('year_input_start') {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + @stack('year_input_end')
{!! Form::close() !!} diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php index cefbde5fb..920ff3de0 100644 --- a/resources/views/reports/income_expense_summary/index.blade.php +++ b/resources/views/reports/income_expense_summary/index.blade.php @@ -17,7 +17,9 @@ {!! Form::open(['url' => 'reports/income-expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
+ @stack('year_input_start') {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + @stack('year_input_end')
{!! Form::close() !!} diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php index bd8916313..c3f0d3b30 100644 --- a/resources/views/reports/income_summary/index.blade.php +++ b/resources/views/reports/income_summary/index.blade.php @@ -17,7 +17,9 @@ {!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!}
+ @stack('year_input_start') {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + @stack('year_input_end')
{!! Form::close() !!} diff --git a/resources/views/reports/profit_loss/index.blade.php b/resources/views/reports/profit_loss/index.blade.php index 6d69154c1..2f55f2f88 100644 --- a/resources/views/reports/profit_loss/index.blade.php +++ b/resources/views/reports/profit_loss/index.blade.php @@ -17,7 +17,9 @@ {!! Form::open(['url' => 'reports/profit-loss', 'role' => 'form', 'method' => 'GET']) !!}
+ @stack('year_input_start') {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + @stack('year_input_end')
{!! Form::close() !!} diff --git a/resources/views/reports/tax_summary/index.blade.php b/resources/views/reports/tax_summary/index.blade.php index ce1f2554c..550a066fa 100644 --- a/resources/views/reports/tax_summary/index.blade.php +++ b/resources/views/reports/tax_summary/index.blade.php @@ -17,7 +17,9 @@ {!! Form::open(['url' => 'reports/tax-summary', 'role' => 'form', 'method' => 'GET']) !!}
+ @stack('year_input_start') {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + @stack('year_input_end')
{!! Form::close() !!} diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php index c0f3fdab3..4036f24fc 100644 --- a/resources/views/settings/categories/create.blade.php +++ b/resources/views/settings/categories/create.blade.php @@ -12,6 +12,7 @@ {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, config('general.types')) }} + @stack('color_input_start')
{!! Form::label('color', trans('general.color'), ['class' => 'control-label']) !!}
@@ -20,6 +21,7 @@
{!! $errors->first('color', '

:message

') !!}
+ @stack('color_input_end') {{ Form::radioGroup('enabled', trans('general.enabled')) }} diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php index cb47eee2f..e11f75f20 100644 --- a/resources/views/settings/categories/edit.blade.php +++ b/resources/views/settings/categories/edit.blade.php @@ -21,6 +21,7 @@ {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types) }} @endif + @stack('color_input_start')
{!! Form::label('color', trans('general.color'), ['class' => 'control-label']) !!}
@@ -29,6 +30,7 @@
{!! $errors->first('color', '

:message

') !!}
+ @stack('color_input_end') {{ Form::radioGroup('enabled', trans('general.enabled')) }} diff --git a/resources/views/vendor/nwidart/menus/child/dropdown.blade.php b/resources/views/vendor/nwidart/menus/child/dropdown.blade.php index e02f1e335..1761b3882 100644 --- a/resources/views/vendor/nwidart/menus/child/dropdown.blade.php +++ b/resources/views/vendor/nwidart/menus/child/dropdown.blade.php @@ -1,12 +1,12 @@ diff --git a/resources/views/vendor/nwidart/menus/child/item.blade.php b/resources/views/vendor/nwidart/menus/child/item.blade.php index 4a1fea660..67e5a8d40 100644 --- a/resources/views/vendor/nwidart/menus/child/item.blade.php +++ b/resources/views/vendor/nwidart/menus/child/item.blade.php @@ -1,11 +1,11 @@ @if ($item->isDivider()) -
  • +
  • @elseif ($item->isHeader()) - + @else -
  • - - {{ $item->title }} - -
  • +
  • + + {{ $item->title }} + +
  • @endif diff --git a/resources/views/vendor/nwidart/menus/item/dropdown.blade.php b/resources/views/vendor/nwidart/menus/item/dropdown.blade.php index 5dc6f3427..57e12a770 100644 --- a/resources/views/vendor/nwidart/menus/item/dropdown.blade.php +++ b/resources/views/vendor/nwidart/menus/item/dropdown.blade.php @@ -5,11 +5,11 @@ diff --git a/resources/views/vendor/nwidart/menus/item/item.blade.php b/resources/views/vendor/nwidart/menus/item/item.blade.php index d22787479..88864e493 100644 --- a/resources/views/vendor/nwidart/menus/item/item.blade.php +++ b/resources/views/vendor/nwidart/menus/item/item.blade.php @@ -1,12 +1,12 @@ @if ($item->isDivider()) -
  • +
  • @elseif ($item->isHeader()) - + @else -
  • - getAttributes() !!}> - {!! $item->getIcon() !!} - {{ $item->title }} - -
  • +
  • + getAttributes() !!}> + {!! $item->getIcon() !!} + {{ $item->title }} + +
  • @endif diff --git a/resources/views/vendor/nwidart/menus/menu.blade.php b/resources/views/vendor/nwidart/menus/menu.blade.php index aef512811..2504b8a8c 100644 --- a/resources/views/vendor/nwidart/menus/menu.blade.php +++ b/resources/views/vendor/nwidart/menus/menu.blade.php @@ -1,7 +1,7 @@ @foreach ($items as $item) - @if ($item->hasChilds()) - @include('menus::item.dropdown', compact('item')) - @else - @include('menus::item.item', compact('item')) - @endif + @if ($item->hasChilds()) + @include('menus::item.dropdown', compact('item')) + @else + @include('menus::item.item', compact('item')) + @endif @endforeach