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 #853

Browse Source
This commit is contained in:
James Cole
2017-09-25 09:28:16 +02:00
parent c917d2b1c4
commit ea1d543795
8 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/rules/index.twig
View File

@@ -107,8 +107,7 @@
<td>
<div class="btn-group btn-group-xs test_buttons">
{# show which transactions would match #}
<a href="#" class="btn btn-default test_rule_triggers" data-id="{{ rule.id }}"
title="{{ 'test_rule_triggers'|_ }}"><i data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></i></a>
<a href="#" class="btn btn-default test_rule_triggers" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><i data-id="{{ rule.id }}" class="test_rule_triggers fa fa-fw fa-flask"></i></a>
{# actually execute rule #}
<a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default"

6
resources/views/rules/rule-group/select-transactions.twig
View File

@@ -21,6 +21,9 @@
<p>
{{ trans('firefly.apply_rule_group_selection_intro', {title: ruleGroup.title}) }}
</p>
<p class="text-danger">
{{ 'apply_rule_warning'|_ }}
</p>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }}
@@ -41,6 +44,9 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript">
var askReadWarning = "{{ trans('firefly.rules_have_read_warning')|escape('js') }}";
</script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/rules/select-transactions.js?v={{ FF_VERSION }}"></script>

6
resources/views/rules/rule/select-transactions.twig
View File

@@ -21,6 +21,9 @@
<p>
{{ trans('firefly.apply_rule_selection_intro', {title: rule.title}) }}
</p>
<p class="text-danger">
{{ 'apply_rule_warning'|_ }}
</p>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }}
@@ -41,6 +44,9 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript">
var askReadWarning = "{{ trans('firefly.rules_have_read_warning')|escape('js') }}";
</script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/rules/select-transactions.js?v={{ FF_VERSION }}"></script>