kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-04-09 07:56:46 +02:00
parent 595596d73f
commit 8db96025a3
81 changed files with 228 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
resources/views/transactions/convert.twig
View File

@@ -5,7 +5,8 @@
{% endblock %}
{% block content %}
<form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, journal.id]) }}" accept-charset="UTF-8" class="form-horizontal" id="store"
<form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, journal.id]) }}" accept-charset="UTF-8"
class="form-horizontal" id="store"
enctype="multipart/form-data">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
@@ -47,8 +48,7 @@
sourceName: sourceAccount.name,
destinationRoute: route('accounts.show', [destinationAccount.id]),
destinationName: destinationAccount.name,
})|raw
}}
})|raw }}
</em>
</p>
<p><em>
@@ -69,8 +69,7 @@
sourceName: sourceAccount.name,
destinationRoute: route('accounts.show', [destinationAccount.id]),
destinationName: destinationAccount.name,
})|raw
}}
})|raw }}
</em></p>
<p>
@@ -95,8 +94,7 @@
sourceName: sourceAccount.name,
destinationRoute: route('accounts.show', [destinationAccount.id]),
destinationName: destinationAccount.name,
})|raw
}}
})|raw }}
</em>
</p>
<p>
@@ -121,8 +119,7 @@
sourceName: sourceAccount.name,
destinationRoute: route('accounts.show', [destinationAccount.id]),
destinationName: destinationAccount.name,
})|raw
}}
})|raw }}
</em>
</p>
<p>
@@ -147,8 +144,7 @@
sourceName: sourceAccount.name,
destinationRoute: route('accounts.show', [destinationAccount.id]),
destinationName: destinationAccount.name,
})|raw
}}
})|raw }}
</em>
</p>
@@ -175,8 +171,7 @@
sourceName: sourceAccount.name,
destinationRoute: route('accounts.show', [destinationAccount.id]),
destinationName: destinationAccount.name,
})|raw
}}
})|raw }}
</em>
</p>

15
resources/views/transactions/mass/edit.twig
View File

@@ -69,7 +69,8 @@
</select>
{% else %}
{# SOURCE ACCOUNT NAME FOR DEPOSIT #}
<input class="form-control input-sm" placeholder="{{ journal.source_account_name }}" name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}">
<input class="form-control input-sm" placeholder="{{ journal.source_account_name }}"
name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}">
{% endif %}
</td>
<td>
@@ -83,20 +84,24 @@
</select>
{% else %}
{# DESTINATION ACCOUNT NAME FOR EXPENSE #}
<input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}" name="destination_account_name[{{ journal.id }}]" type="text" value="{{ journal.destination_account_name }}">
<input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}"
name="destination_account_name[{{ journal.id }}]" type="text"
value="{{ journal.destination_account_name }}">
{% endif %}
</td>
{# category #}
<td>
<input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}" name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}">
<input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}"
name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}">
</td>
{# budget #}
<td>
{% if journal.transaction_type_type == 'Withdrawal' %}
<select class="form-control input-sm" name="budget_id[{{ journal.id }}]">
<option value="0" label="(none)"
{% if journal.budgets.count == 0 %}selected="selected"{% endif %}
>(none)</option>
{% if journal.budgets.count == 0 %}selected="selected"{% endif %}
>(none)
</option>
{% for budget in budgets %}
<option value="{{ budget.id }}"{% if budget.id==journal.budgets[0].id %} selected="selected"{% endif %}
label="{{ budget.name }}">{{ budget.name }}</option>

12
resources/views/transactions/show.twig
View File

@@ -243,12 +243,12 @@
</p>
{% endif %}
{% if transactions|length == 1 %}
<p>
<i class="fa fa-copy" aria-hidden="true"></i>
<a href="{{ route('transactions.clone', [journal.id]) }}">
{{ ('clone_'~journal.transactionType.type|lower)|_ }}
</a>
</p>
<p>
<i class="fa fa-copy" aria-hidden="true"></i>
<a href="{{ route('transactions.clone', [journal.id]) }}">
{{ ('clone_'~journal.transactionType.type|lower)|_ }}
</a>
</p>
{% endif %}
</div>