kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues with relative urls

Browse Source
This commit is contained in:
James Cole
2023-09-05 19:34:46 +02:00
parent 5ee80dd046
commit dd794e409f
43 changed files with 509 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/transactions/bulk/edit.twig
View File

@@ -40,7 +40,7 @@
<tr>
<td>
<a href="{{ route('transactions.show', [journal.transaction_group_id]) }}">
{{ journal.description }}</a></td>
{{ journal.description }}</a></td>
<td>
{% if journal.transaction_type_type == 'Deposit' %}
{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
@@ -77,7 +77,7 @@
<td>
{% for tag in journal.tags %}
{% if 0 != tag.id %}
<span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
<span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
<span class="fa fa-fw fa-tag"></span>
{{ tag.name }}</a>
</span>
@@ -85,7 +85,7 @@
{% endfor %}
</td>
<td>
{% if journal.journals_in_group > 1 %}
{% if journal.journals_in_group > 1 %}
<span title="{{ 'part_of_split'|_ }}" class="text-danger fa fa-fw fa-exclamation-triangle"></span>
{% endif %}
</td>
@@ -141,19 +141,19 @@
<td>
<div class="radio">
<label>
<input type="radio" name="tags_action" id="tags_action_do_nothing" value="no_nothing" checked />
<input type="radio" name="tags_action" id="tags_action_do_nothing" value="no_nothing" checked/>
{{ 'no_bulk_tags'|_ }}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="tags_action" id="tags_action_do_replace" value="do_replace" />
<input type="radio" name="tags_action" id="tags_action_do_replace" value="do_replace"/>
{{ 'replace_with_these_tags'|_ }}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="tags_action" id="tags_action_do_append" value="do_append" />
<input type="radio" name="tags_action" id="tags_action_do_append" value="do_append"/>
{{ 'append_these_tags'|_ }}
</label>
</div>
@@ -195,5 +195,5 @@
<script type="text/javascript" src="v1/js/ff/transactions/mass/edit-bulk.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}
{% block styles %}
<link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
<link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
{% endblock %}

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

@@ -81,13 +81,13 @@
transaction.source_type == 'Debt' or
transaction.source_type == 'Mortgage' %}
<input
autocomplete="off"
placeholder="Source account"
name="source_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.destination_type != "Cash account" %}{{ preFilled.source_name[transaction.transaction_journal_id]|default(transaction.destination_name) }}{% endif %}"
class="form-control tt-input input-revenue"
spellcheck="false" dir="auto">
autocomplete="off"
placeholder="Source account"
name="source_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.destination_type != "Cash account" %}{{ preFilled.source_name[transaction.transaction_journal_id]|default(transaction.destination_name) }}{% endif %}"
class="form-control tt-input input-revenue"
spellcheck="false" dir="auto">
{% endif %}
{% endif %}
@@ -153,13 +153,13 @@
transaction.source_type == 'Debt' or
transaction.source_type == 'Mortgage' %}
<input
autocomplete="off"
placeholder="Source account"
name="source_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.destination_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
class="form-control tt-input"
spellcheck="false" dir="auto">
autocomplete="off"
placeholder="Source account"
name="source_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.destination_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
class="form-control tt-input"
spellcheck="false" dir="auto">
{% endif %}
{% endif %}
@@ -206,13 +206,13 @@
{# if new source is Liability, destination must be expense account. #}
<input
autocomplete="off"
placeholder="Destination account"
name="destination_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.source_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
class="form-control tt-input"
spellcheck="false" dir="auto">
autocomplete="off"
placeholder="Destination account"
name="destination_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.source_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
class="form-control tt-input"
spellcheck="false" dir="auto">
{% endif %}
{% endif %}
@@ -237,13 +237,13 @@
transaction.source_type == 'Debt' or
transaction.source_type == 'Mortgage' %}
<input
autocomplete="off"
placeholder="Destination account"
name="destination_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.source_type != "Cash account" %}{{ transaction.destination_name }}{% endif %}"
class="form-control tt-input"
spellcheck="false" dir="auto">
autocomplete="off"
placeholder="Destination account"
name="destination_name[{{ transaction.transaction_journal_id }}]"
type="text"
value="{% if transaction.source_type != "Cash account" %}{{ transaction.destination_name }}{% endif %}"
class="form-control tt-input"
spellcheck="false" dir="auto">
{% endif %}
{% endif %}

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

@@ -36,7 +36,7 @@
<td>
{# LINK TO EDIT FORM #}
<a href="{{ route('transactions.edit', journal.transaction_group_id) }}" class="btn btn-xs btn-default"><span
class="fa fa-fw fa-pencil"></span></a>
class="fa fa-fw fa-pencil"></span></a>
<input type="hidden" name="journals[]" value="{{ journal.transaction_journal_id }}"/>
</td>
<td>