kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 11:48:53 +00:00
Code Issues Projects Releases Wiki Activity

Rebuild frontend.

Browse Source
This commit is contained in:
James Cole
2021-07-18 19:23:50 +02:00
parent 704cf26725
commit e959dbc6e0
27 changed files with 332 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/v1/recurring/create.twig
View File

@@ -128,6 +128,13 @@
{# CATEGORY ALWAYS #}
{{ ExpandedForm.text('category') }}
{# BILL / SUBSCRIPTION ONLY FOR WITHDRAWALS #}
{% if bills|length > 1 %}
{{ ExpandedForm.select('bill_id', bills, null) }}
{% else %}
{{ ExpandedForm.select('bill_id', bills, null, {helpText: trans('firefly.no_bill_pointer', {link: route('bills.index')})}) }}
{% endif %}
{# TAGS #}
{{ ExpandedForm.text('tags') }}

7
resources/views/v1/recurring/edit.twig
View File

@@ -125,6 +125,13 @@
{# CATEGORY ALWAYS #}
{{ ExpandedForm.text('category',array.transactions[0].category_name) }}
{# BILL ONLY WHEN CREATING A WITHDRAWAL #}
{% if bills|length > 1 %}
{{ ExpandedForm.select('bill_id', bills, array.transactions[0].bill_id) }}
{% else %}
{{ ExpandedForm.select('bill_id', bills, array.transactions[0].bill_id, {helpText: trans('firefly.no_bill_pointer', {link: route('bills.index')})}) }}
{% endif %}
{# TAGS #}
{{ ExpandedForm.text('tags', array.transactions[0].tags) }}

4
resources/views/v2/partials/layout/sidebar.twig
View File

@@ -46,10 +46,10 @@
</li>
<li class="nav-item">
<a href="{{ route('bills.index') }}" class="nav-link {{ activeRoutePartial('bills') }}">
<a href="{{ route('subscriptions.index') }}" class="nav-link {{ activeRoutePartial('bills') }} {{ activeRoutePartial('subscriptions') }}">
<span class="nav-icon far fa-calendar-alt"></span>
<p>
{{ 'bills'|_ }}
{{ 'subscriptions'|_ }}
</p>
</a>
</li>