refs #443 form element add manuel

akaunting · Aug 7, 2018 · 62beb11 · 62beb11
1 parent 36df336
commit 62beb11
Show file tree

Hide file tree

Showing 22 changed files with 84 additions and 36 deletions.
diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php
@@ -7,6 +7,8 @@
 <form role="form" method="POST" action="{{ url('auth/forgot') }}">
     {{ csrf_field() }}
 
+    @stack('email_input_start')
+
     <div class="form-group has-feedback{{ $errors->has('email') ? ' has-error' : '' }}">
         <input name="email" type="email" class="form-control" placeholder="{{ trans('auth.enter_email') }}" required>
         <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
@@ -16,6 +18,9 @@
             </span>
         @endif
     </div>
+
+    @stack('email_input_end')
+
     <div class="row">
         <!-- /.col -->
         <div class="col-sm-offset-8 col-sm-4">

diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php
@@ -7,6 +7,7 @@
 <form role="form" method="POST" action="{{ url('auth/login') }}">
     {{ csrf_field() }}
 
+    @stack('email_input_start')
     <div class="form-group has-feedback{{ $errors->has('email') ? ' has-error' : '' }}">
         <input name="email" type="email" class="form-control" placeholder="{{ trans('general.email') }}" required autofocus>
         <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
@@ -16,6 +17,9 @@
             </span>
         @endif
     </div>
+    @stack('email_input_end')
+
+    @stack('password_input_start')
     <div class="form-group has-feedback{{ $errors->has('password') ? ' has-error' : '' }}">
         <input name="password" type="password" class="form-control" placeholder="{{ trans('auth.password.current') }}" required>
         <span class="glyphicon glyphicon-lock form-control-feedback"></span>
@@ -25,15 +29,20 @@
             </span>
         @endif
     </div>
+    @stack('password_input_end')
+
     <div class="row">
+        @stack('remember_input_start')
         <div class="col-sm-8">
             <div class="checkbox icheck">
                 <label>
                     <input name="remember" type="checkbox" {{ old('remember') ? 'checked' : '' }}> &nbsp;{{ trans('auth.remember_me') }}
                 </label>
             </div>
         </div>
+        @stack('remember_input_end')
         <!-- /.col -->
+
         <div class="col-sm-4">
             <button type="submit" class="btn btn-success btn-block btn-flat">{{ trans('auth.login') }}</button>
         </div>

diff --git a/resources/views/auth/reset/create.blade.php b/resources/views/auth/reset/create.blade.php
@@ -9,6 +9,7 @@
 
     <input type="hidden" name="token" value="{{ $token }}">
 
+    @stack('email_input_start')
     <div class="form-group has-feedback{{ $errors->has('email') ? ' has-error' : '' }}">
         <input name="email" type="email" class="form-control" placeholder="{{ trans('auth.current_email') }}" value="{{ $email or old('email') }}" required autofocus>
         <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
@@ -18,7 +19,9 @@
             </span>
         @endif
     </div>
+    @stack('email_input_end')
 
+    @stack('password_input_start')
     <div class="form-group has-feedback{{ $errors->has('password') ? ' has-error' : '' }}">
         <input name="password" type="password" class="form-control" placeholder="{{ trans('auth.password.new') }}" required>
         <span class="glyphicon glyphicon-lock form-control-feedback"></span>
@@ -28,7 +31,9 @@
             </span>
         @endif
     </div>
+    @stack('password_input_end')
 
+    @stack('password_confirmation_input_start')
     <div class="form-group has-feedback{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
         <input name="password_confirmation" type="password" class="form-control" placeholder="{{ trans('auth.password.new_confirm') }}" required>
         <span class="glyphicon glyphicon-lock form-control-feedback"></span>
@@ -38,6 +43,7 @@
             </span>
         @endif
     </div>
+    @stack('password_confirmation_input_end')
 
     <div class="row">
         <!-- /.col -->

diff --git 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)) }}
                 <div class="form-group col-md-6">
                     {!! Form::label('picture', trans_choice('general.pictures', 1), ['class' => 'control-label']) !!}
@@ -28,6 +29,7 @@
                         {!! Form::hidden('picture', null, ['id' => 'picture', 'class' => 'form-control']) !!}
                     </div>
                 </div>
+                @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
@@ -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')
             <div class="form-group col-md-6">
                 {!! Form::label('picture', trans_choice('general.pictures', 1), ['class' => 'control-label']) !!}
                 <div class="input-group">
@@ -32,6 +33,7 @@
                     {!! Form::hidden('picture', null, ['id' => 'picture', 'class' => 'form-control']) !!}
                 </div>
             </div>
+            @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
@@ -12,11 +12,13 @@
                     {!! trans('import.message', ['link' => url('public/files/import/' . $type . '.xlsx')]) !!}
                 </div>
             </div>
+            @stack('import_input_start')
             <div class="form-group col-md-12 required {{ $errors->has('import') ? 'has-error' : '' }}" style="min-height: 59px">
                 {!! Form::label('import', trans('general.form.select.file'), ['class' => 'control-label']) !!}
                 {!! Form::file('import', null, ['class' => 'form-control']) !!}
                 {!! $errors->first('import', '<p class="help-block">:message</p>') !!}
             </div>
+            @stack('import_input_end')
         </div>
         <!-- /.box-body -->
 

diff --git 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')
             <div class="form-group col-md-6 required {{ $errors->has('category_id') ? 'has-error' : ''}}">
                 {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
                 <div class="input-group">
@@ -33,6 +34,7 @@
                 </div>
                 {!! $errors->first('category_id', '<p class="help-block">:message</p>') !!}
             </div>
+            @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
@@ -8,6 +8,7 @@
     {!! Form::open(['url' => 'expenses/bills', 'files' => true, 'role' => 'form']) !!}
 
     <div class="box-body">
+        @stack('vendor_id_input_start')
         <div class="form-group col-md-6 required {{ $errors->has('vendor_id') ? 'has-error' : ''}}">
             {!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!}
             <div class="input-group">
@@ -19,6 +20,7 @@
             </div>
             {!! $errors->first('vendor_id', '<p class="help-block">:message</p>') !!}
         </div>
+        @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
@@ -24,9 +24,11 @@
 
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
 
-            <div  id="customer-create-user" class="form-group col-md-12 margin-top">
+            @stack('create_user_input_start')
+            <div id="customer-create-user" class="form-group col-md-12 margin-top">
                 <strong>{{ trans('customers.allow_login') }}</strong> &nbsp;  {{ Form::checkbox('create_user', '1', null, ['id' => 'create_user']) }}
             </div>
+            @stack('create_user_input_end')
         </div>
         <!-- /.box-body -->
 

diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/incomes/customers/edit.blade.php
@@ -28,13 +28,15 @@
 
         {{ Form::radioGroup('enabled', trans('general.enabled')) }}
 
+        @stack('create_user_input_start')
         <div  id="customer-create-user" class="form-group col-md-12 margin-top">
             @if ($customer->user_id)
                 <strong>{{ trans('customers.user_created') }}</strong> &nbsp; {{ Form::checkbox('create_user', '1', 1, ['id' => 'create_user', 'disabled' => 'disabled']) }}
             @else
                 <strong>{{ trans('customers.allow_login') }}</strong> &nbsp; {{ Form::checkbox('create_user', '1', null, ['id' => 'create_user']) }}
             @endif
         </div>
+        @stack('create_user_input_end')
     </div>
     <!-- /.box-body -->
 

diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php
@@ -17,7 +17,9 @@
         </div>
         {!! Form::open(['url' => 'reports/expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-right">
+            @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')
         </div>
         {!! Form::close() !!}
     </div>

diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php
@@ -17,7 +17,9 @@
         </div>
         {!! Form::open(['url' => 'reports/income-expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-right">
+            @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')
         </div>
         {!! Form::close() !!}
     </div>

diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php
@@ -17,7 +17,9 @@
         </div>
         {!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-right">
+            @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')
         </div>
         {!! Form::close() !!}
     </div>

diff --git a/resources/views/reports/profit_loss/index.blade.php b/resources/views/reports/profit_loss/index.blade.php
@@ -17,7 +17,9 @@
         </div>
         {!! Form::open(['url' => 'reports/profit-loss', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-right">
+            @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')
         </div>
         {!! Form::close() !!}
     </div>

diff --git a/resources/views/reports/tax_summary/index.blade.php b/resources/views/reports/tax_summary/index.blade.php
@@ -17,7 +17,9 @@
         </div>
         {!! Form::open(['url' => 'reports/tax-summary', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-right">
+            @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')
         </div>
         {!! Form::close() !!}
     </div>

diff --git 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')
             <div class="form-group col-md-6 required {{ $errors->has('color') ? 'has-error' : ''}}">
                 {!! Form::label('color', trans('general.color'), ['class' => 'control-label']) !!}
                 <div  id="category-color-picker" class="input-group colorpicker-component">
@@ -20,6 +21,7 @@
                 </div>
                 {!! $errors->first('color', '<p class="help-block">:message</p>') !!}
             </div>
+            @stack('color_input_end')
 
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
         </div>

diff --git 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')
             <div class="form-group col-md-6 required {{ $errors->has('color') ? 'has-error' : ''}}">
                 {!! Form::label('color', trans('general.color'), ['class' => 'control-label']) !!}
                 <div  id="category-color-picker" class="input-group colorpicker-component">
@@ -29,6 +30,7 @@
                 </div>
                 {!! $errors->first('color', '<p class="help-block">:message</p>') !!}
             </div>
+            @stack('color_input_end')
 
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
         </div>

diff --git a/resources/views/vendor/nwidart/menus/child/dropdown.blade.php b/resources/views/vendor/nwidart/menus/child/dropdown.blade.php
@@ -1,12 +1,12 @@
 <li class="dropdown-submenu {{ $item->hasActiveOnChild() ? 'active' : '' }}">
-	<a tabindex="-1" href="#">{{ $child->title }}</a>
-	<ul class="dropdown-menu">
-		@foreach ($child->childs as $item)
-			@if ($item->hasChilds())
-				@include('menus::child.dropdown', ['child' => $item])
-			@else
-				@include('menus::child.item', compact('item'))
-			@endif
-		@endforeach
-	</ul>
+    <a tabindex="-1" href="#">{{ $child->title }}</a>
+    <ul class="dropdown-menu">
+        @foreach ($child->childs as $item)
+            @if ($item->hasChilds())
+                @include('menus::child.dropdown', ['child' => $item])
+            @else
+                @include('menus::child.item', compact('item'))
+            @endif
+        @endforeach
+    </ul>
 </li>
diff --git 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())
-	<li class="divider"></li>
+    <li class="divider"></li>
 @elseif ($item->isHeader())
-	<li class="dropdown-header">{{ $item->title }}</li>
+    <li class="dropdown-header">{{ $item->title }}</li>
 @else
-	<li class="{{ $item->isActive() ? 'active' : '' }}">
-		<a tabindex="-1" href="{{ $item->getUrl() }}">
-			{{ $item->title }}
-		</a>
-	</li>
+    <li class="{{ $item->isActive() ? 'active' : '' }}">
+        <a tabindex="-1" href="{{ $item->getUrl() }}">
+            {{ $item->title }}
+        </a>
+    </li>
 @endif
diff --git a/resources/views/vendor/nwidart/menus/item/dropdown.blade.php b/resources/views/vendor/nwidart/menus/item/dropdown.blade.php
@@ -5,11 +5,11 @@
   </a>
   <ul class="dropdown-menu" role="menu">
     @foreach ($item->childs as $child)
-    	@if ($child->hasChilds())
-  			@include('menus::child.dropdown', ['item' => $child])
-    	@else
-  			@include('menus::item.item', ['item' => $child])
-    	@endif
+        @if ($child->hasChilds())
+            @include('menus::child.dropdown', ['item' => $child])
+        @else
+            @include('menus::item.item', ['item' => $child])
+        @endif
     @endforeach
   </ul>
 </li>
diff --git 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())
-	<li class="divider"></li>
+    <li class="divider"></li>
 @elseif ($item->isHeader())
-	<li class="dropdown-header">{{ $item->title }}</li>
+    <li class="dropdown-header">{{ $item->title }}</li>
 @else
-	<li class="{{ $item->isActive() ? 'active' : '' }}">
-	  <a href="{{ $item->getUrl() }}" {!! $item->getAttributes() !!}>
-	  	{!! $item->getIcon() !!}
-	    {{ $item->title }}
-	  </a>
-	</li>
+    <li class="{{ $item->isActive() ? 'active' : '' }}">
+      <a href="{{ $item->getUrl() }}" {!! $item->getAttributes() !!}>
+        {!! $item->getIcon() !!}
+        {{ $item->title }}
+      </a>
+    </li>
 @endif
diff --git 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