kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Make it easier to switch between v1/v2 layout.

Browse Source
This commit is contained in:
James Cole
2021-01-31 20:31:40 +01:00
parent 2dd2d0ef58
commit fdd9d81701
29 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/v1/form/amount-no-currency.twig
View File

@@ -2,7 +2,7 @@
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label> <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('number', name, value, options) }} {{ Form.input('number', name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

2
resources/views/v1/form/amount.twig
View File

@@ -26,7 +26,7 @@
</div> </div>
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
<!-- Going to put in this value: {{ defaultCurrency.id }} --> <!-- Going to put in this value: {{ defaultCurrency.id }} -->
<input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}" data-backup="{{ defaultCurrency.id }}"/> <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}" data-backup="{{ defaultCurrency.id }}"/>

4
resources/views/v1/form/assetAccountCheckList.twig
View File

@@ -17,8 +17,8 @@
</div> </div>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

2
resources/views/v1/form/balance.twig
View File

@@ -26,7 +26,7 @@
</div> </div>
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
<input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}"/> <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}"/>

4
resources/views/v1/form/checkbox.twig
View File

@@ -13,7 +13,7 @@
{{ Form.checkbox(name, value, options.checked, options) }} {{ Form.checkbox(name, value, options.checked, options) }}
</label> </label>
</div> </div>
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/date.twig
View File

@@ -8,7 +8,7 @@
</div> </div>
{{ Form.input('date', name, value, options) }} {{ Form.input('date', name, value, options) }}
</div> </div>
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/file.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.file(name, options) }} {{ Form.file(name, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/integer.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('number', name, value, options) }} {{ Form.input('number', name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

2
resources/views/v1/form/location.twig
View File

@@ -39,7 +39,7 @@
{# has location set? #} {# has location set? #}
<input type="hidden" name="{{ name }}_has_location" value="{{ options.locations[name].has_location|default('false') }}"/> <input type="hidden" name="{{ name }}_has_location" value="{{ options.locations[name].has_location|default('false') }}"/>
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
resources/views/v1/form/non-selectable-amount.twig
View File

@@ -6,6 +6,6 @@
<span class="input-group-addon non-selectable-currency-symbol">{{ selectedCurrency.symbol }}</span> <span class="input-group-addon non-selectable-currency-symbol">{{ selectedCurrency.symbol }}</span>
{{ Form.input('number', name, value, options) }} {{ Form.input('number', name, value, options) }}
</div> </div>
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/number.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('number', name, value, options) }} {{ Form.input('number', name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/object_group.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('text', name, value, options) }} {{ Form.input('text', name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/password.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('password', name, value, options) }} {{ Form.input('password', name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/percentage.twig
View File

@@ -6,7 +6,7 @@
{{ Form.input('number', name, value, options) }} {{ Form.input('number', name, value, options) }}
<div class="input-group-addon">%</div> <div class="input-group-addon">%</div>
</div> </div>
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/select.twig
View File

@@ -3,8 +3,8 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.select(name, list, selected , options ) }} {{ Form.select(name, list, selected , options ) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

2
resources/views/v1/form/tags.twig
View File

@@ -3,6 +3,6 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('text', name, value, options) }} {{ Form.input('text', name, value, options) }}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/text.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.input('text', name, value, options) }} {{ Form.input('text', name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

4
resources/views/v1/form/textarea.twig
View File

@@ -3,7 +3,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{{ Form.textarea(name, value, options) }} {{ Form.textarea(name, value, options) }}
{% include 'form/help' %} {% include 'v1.form.help' %}
{% include 'form/feedback' %} {% include 'v1.form.feedback' %}
</div> </div>
</div> </div>

2
resources/views/v1/layout/default.twig
View File

@@ -122,7 +122,7 @@
<div class="row no-print"> <div class="row no-print">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="well"> <p class="well">
{% include ['demo.' ~ Route.getCurrentRoute.getName, 'demo.no-demo-text'] %} {% include ['v1.demo.' ~ Route.getCurrentRoute.getName, 'v1.demo.no-demo-text'] %}
</p> </p>
</div> </div>
</div> </div>

2
resources/views/v1/popup/report/balance-amount.twig
View File

@@ -9,7 +9,7 @@
<div class="modal-body"> <div class="modal-body">
{% set hideSource = true %} {% set hideSource = true %}
{% set hideBudget = true %} {% set hideBudget = true %}
{% include 'popup/list/journals' %} {% include 'v1.popup.list.journals' %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>

2
resources/views/v1/popup/report/budget-spent-amount.twig
View File

@@ -8,7 +8,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
{% set hideBudget = true %} {% set hideBudget = true %}
{% include 'popup/list/journals' %} {% include 'v1.popup.list.journals' %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>

2
resources/views/v1/popup/report/category-entry.twig
View File

@@ -7,7 +7,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
{% set hideCategory = true %} {% set hideCategory = true %}
{% include 'popup/list/journals' %} {% include 'v1.popup.list.journals' %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>

2
resources/views/v1/popup/report/expense-entry.twig
View File

@@ -7,7 +7,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
{% set hideDestination = true %} {% set hideDestination = true %}
{% include 'popup/list/journals' %} {% include 'v1.popup.list.journals' %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>

2
resources/views/v1/popup/report/income-entry.twig
View File

@@ -10,7 +10,7 @@
{% set hideSource = true %} {% set hideSource = true %}
{% set accountPerspective = account %} {% set accountPerspective = account %}
{% set inverseAmount = true %} {% set inverseAmount = true %}
{% include 'popup/list/journals' %} {% include 'v1.popup.list.journals' %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>

2
resources/views/v1/reports/audit/report.twig
View File

@@ -61,7 +61,7 @@
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance) balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
})|raw }} })|raw }}
</p> </p>
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %} {% include 'v1.reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
<p style="padding:10px;"> <p style="padding:10px;">

1
resources/views/v1/reports/default/month.twig
View File

@@ -140,7 +140,6 @@
</div> </div>
</div> </div>
</div> </div>
{#{% include 'reports/partials/bills' %}#}
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all"/> <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all"/>

2
resources/views/v1/rules/index.twig
View File

@@ -179,7 +179,7 @@
</div> </div>
{% endfor %} {% endfor %}
{% include '/rules/partials/test-trigger-modal' %} {% include 'v1.rules.partials.test-trigger-modal' %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">

2
resources/views/v1/rules/rule/create.twig
View File

@@ -90,7 +90,7 @@
</div> </div>
</div> </div>
{% include '/rules/partials/test-trigger-modal' %} {% include 'v1.rules.partials.test-trigger-modal' %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">

2
resources/views/v1/rules/rule/edit.twig
View File

@@ -72,7 +72,7 @@
</div> </div>
</div> </div>
{% include '/rules/partials/test-trigger-modal' %} {% include 'v1.rules.partials.test-trigger-modal' %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">