IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-29 02:11:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed form elements.

Browse Source
This commit is contained in:
James Cole 2016-02-06 15:00:57 +01:00
parent 1d0cb45e4c
commit 8256f60340
3 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Support/ExpandedForm.php
View File

@ -27,7 +27,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function amount(string $name, $value = null, array $options = []) public function amount(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -52,7 +52,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function balance(string $name, $value = null, array $options = []) public function balance(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -76,7 +76,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function checkbox(string $name, $value = 1, $checked = null, $options = []) public function checkbox(string $name, $value = 1, $checked = null, $options = []): string
{ {
$options['checked'] = $checked === true ? true : null; $options['checked'] = $checked === true ? true : null;
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -98,7 +98,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function date(string $name, $value = null, array $options = []) public function date(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -116,7 +116,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function file(string $name, array $options = []) public function file(string $name, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -134,7 +134,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function integer(string $name, $value = null, array $options = []) public function integer(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -154,7 +154,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function location(string $name, $value = null, array $options = []) public function location(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -173,9 +173,9 @@ class ExpandedForm
* @param \Illuminate\Support\Collection $set * @param \Illuminate\Support\Collection $set
* @param bool $addEmpty * @param bool $addEmpty
* *
* @return mixed * @return array
*/ */
public function makeSelectList(Collection $set, bool $addEmpty = false) public function makeSelectList(Collection $set, bool $addEmpty = false): array
{ {
$selectList = []; $selectList = [];
if ($addEmpty) { if ($addEmpty) {
@ -206,7 +206,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function multiCheckbox(string $name, array $list = [], $selected = null, array $options = []) public function multiCheckbox(string $name, array $list = [], $selected = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -227,7 +227,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function multiRadio(string $name, array $list = [], $selected = null, array $options = []) public function multiRadio(string $name, array $list = [], $selected = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -246,7 +246,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function optionsList($type, $name) public function optionsList($type, $name): string
{ {
$previousValue = null; $previousValue = null;
@ -272,7 +272,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function select(string $name, array $list = [], $selected = null, array $options = []) public function select(string $name, array $list = [], $selected = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -292,7 +292,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function staticText(string $name, $value, array $options = []) public function staticText(string $name, $value, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -311,7 +311,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function tags(string $name, $value = null, array $options = []) public function tags(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -330,7 +330,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function text(string $name, $value = null, array $options = []) public function text(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -349,7 +349,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
public function textarea(string $name, $value = null, array $options = []) public function textarea(string $name, $value = null, array $options = []): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -369,7 +369,7 @@ class ExpandedForm
* *
* @return array * @return array
*/ */
protected function expandOptionArray(string $name, $label, array $options) protected function expandOptionArray(string $name, $label, array $options): array
{ {
$options['class'] = 'form-control'; $options['class'] = 'form-control';
$options['id'] = 'ffInput_' . $name; $options['id'] = 'ffInput_' . $name;
@ -410,7 +410,7 @@ class ExpandedForm
* *
* @return string * @return string
*/ */
protected function getHolderClasses(string $name) protected function getHolderClasses(string $name): string
{ {
/* /*
* Get errors from session: * Get errors from session:
@ -432,13 +432,13 @@ class ExpandedForm
* *
* @return mixed * @return mixed
*/ */
protected function label(string $name, array $options) protected function label(string $name, array $options): string
{ {
if (isset($options['label'])) { if (isset($options['label'])) {
return $options['label']; return $options['label'];
} }
return trans('form.' . $name); return strval(trans('form.' . $name));
} }
} }

26
resources/views/export/index.twig
View File

@ -76,31 +76,7 @@
<!-- ACCOUNTS --> <!-- ACCOUNTS -->
{{ ExpandedForm.multiCheckbox('accounts',accountList, checked, {' class': 'account-checkbox'}) }}
<div class="form-group">
<label for="inputAccounts" class="col-sm-4 control-label">{{ 'export_included_accounts'|_ }}</label>
<div class="col-sm-8">
{% if errors.has('accounts') %}
<div class="alert alert-danger" role="alert">
{{ errors.first('accounts') }}
</div>
{% endif %}
{% for account in accounts %}
<div class="checkbox">
<label>
<input type="checkbox" class="account-checkbox" name="accounts[]" value="{{ account.id }}" checked>
{{ account.name }}
{% if account.getMeta('accountRole') == 'sharedAsset' %}
({{ 'shared'|_|lower }})
{% endif %}
</label>
</div>
{% endfor %}
</div>
</div>
{{ ExpandedForm.checkbox('include_attachments','1', true) }} {{ ExpandedForm.checkbox('include_attachments','1', true) }}

9
resources/views/form/multiCheckbox.twig
View File

@ -3,9 +3,14 @@
<div class="col-sm-8"> <div class="col-sm-8">
{% for value,description in list %} {% for value,description in list %}
<div class="checkbox"> {% set options = options|merge({'id': 'ffInput_'~name~'_'~value}) %}
<div class="checkbox">
<label> <label>
{{ Form.checkbox(name~'[]', value, (selected == value), options) }} {% if value in selected %}
{{ Form.checkbox(name~'[]', value, true, options) }}
{% else %}
{{ Form.checkbox(name~'[]', value, false, options) }}
{% endif %}
{{ description }} {{ description }}
</label> </label>
</div> </div>