diff --git a/public/css/app.css b/public/css/app.css index 462744820..05b332e1c 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -575,4 +575,13 @@ input[type="number"] { .btn-icon { height: 34px; -} \ No newline at end of file +} + +.form-small #account_id, .form-small .select2.select2-container { + width: 70% !important; + float: left; +} + +.form-small #currency { + width: 30%; +} diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index b61be999c..bd2b2509e 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -12,16 +12,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('general.default_account')) }} - -
- {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
+ {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
-
- {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
+ {!! Form::select('account_id', $accounts, setting('general.default_account'), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
+ {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
- {!! $errors->first('currency_code', '

:message

') !!}
{{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index f1428957d..ab0cdfc75 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -17,16 +17,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts) }} - -
- {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
+ {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
-
- {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
+ {!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
+ {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
- {!! $errors->first('currency_code', '

:message

') !!}
{{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index 7dbf7c996..913baf489 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -12,16 +12,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('general.accounts', 1)) }} - -
- {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
+ {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
-
- {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
+ {!! Form::select('account_id', $accounts, setting('general.accounts', 1), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
+ {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
- {!! $errors->first('currency_code', '

:message

') !!}
{{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index c9327cb9d..f457786b6 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -17,16 +17,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts) }} - -
- {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
+ {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
-
- {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
+ {!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
+ {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
- {!! $errors->first('currency_code', '

:message

') !!}
{{ Form::textareaGroup('description', trans('general.description')) }}