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

User can now re-order triggers and actions.

Browse Source
This commit is contained in:
James Cole
2016-01-14 11:27:15 +01:00
parent b9b0413510
commit 81b9d5da09
10 changed files with 243 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,16 +34,22 @@
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i
class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('rules.rule-group.edit',ruleGroup.id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('rules.rule-group.delete',ruleGroup.id) }}"><i class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a>
{% if ruleGroup.order > 1 %}
<li><a href="{{ route('rules.rule-group.up',ruleGroup.id) }}"><i class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a>
{% endif %}
{% if ruleGroup.order < ruleGroups|length %}
<li><a href="{{ route('rules.rule-group.down',ruleGroup.id) }}"><i class="fa fa-fw fa-arrow-down"></i> {{ 'move_rule_group_down'|_ }}</a>
{% endif %}
<li><a href="{{ route('rules.rule-group.edit',ruleGroup.id) }}"><i
class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('rules.rule-group.delete',ruleGroup.id) }}"><i
class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a>
{% if ruleGroup.order > 1 %}
<li><a href="{{ route('rules.rule-group.up',ruleGroup.id) }}"><i
class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a>
{% endif %}
{% if ruleGroup.order < ruleGroups|length %}
<li><a href="{{ route('rules.rule-group.down',ruleGroup.id) }}"><i
class="fa fa-fw fa-arrow-down"></i> {{ 'move_rule_group_down'|_ }}
</a>
{% endif %}
</li>
</ul>
</div>
@@ -70,23 +76,30 @@
<td>
<div class="btn-group btn-group-xs">
{% if rule.order > 1 %}
<a title="{{ 'rule_priority_up'|_ }}" href="{{ route('rules.rule.up', rule.id) }}" class="btn btn-default"><span
class="fa fa-fw fa-arrow-up"></span></a>
{% else %}
<a href="#" class="btn btn-default"><span
class="fa fa-fw"></span></a>
{% endif %}
{% if rule.order < ruleGroup.rules.count %}
<a title="{{ 'rule_priority_down'|_ }}" href="{{ route('rules.rule.down', rule.id) }}"
class="btn btn-default"><span class="fa fa-fw fa-arrow-down"></span>
</a>
<a title="{{ 'rule_priority_up'|_ }}"
href="{{ route('rules.rule.up', rule.id) }}"
class="btn btn-default"><span
class="fa fa-fw fa-arrow-up"></span></a>
{% else %}
<a href="#" class="btn btn-default"><span
class="fa fa-fw"></span></a>
{% endif %}
<a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}" class="btn btn-default"><span
{% if rule.order < ruleGroup.rules.count %}
<a title="{{ 'rule_priority_down'|_ }}"
href="{{ route('rules.rule.down', rule.id) }}"
class="btn btn-default"><span
class="fa fa-fw fa-arrow-down"></span>
</a>
{% else %}
<a href="#" class="btn btn-default"><span
class="fa fa-fw"></span></a>
{% endif %}
<a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}"
class="btn btn-default"><span
class="fa fa-fw fa-pencil"></span></a>
<a title="{{ 'delete'|_ }}" href="{{ route('rules.rule.delete', rule.id) }}" class="btn btn-danger"><span
<a title="{{ 'delete'|_ }}"
href="{{ route('rules.rule.delete', rule.id) }}"
class="btn btn-danger"><span
class="fa fa-fw fa-trash"></span></a>
</div>
@@ -98,10 +111,10 @@
</td>
<td>
{% if rule.ruleTriggers.count > 0 %}
<ul class="small">
<ul class="small rule-triggers" data-id="{{ rule.id }}">
{% for trigger in rule.ruleTriggers %}
{% if trigger.trigger_type != "user_action" %}
<li>{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}</li>
<li data-id="{{ trigger.id }}">{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}</li>
{% endif %}
{% endfor %}
</ul>
@@ -109,9 +122,9 @@
</td>
<td>
{% if rule.ruleActions.count > 0 %}
<ul class="small">
<ul class="small rule-actions" data-id="{{ rule.id }}">
{% for action in rule.ruleActions %}
<li>{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}</li>
<li data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}</li>
{% endfor %}
</ul>
{% endif %}
@@ -142,3 +155,7 @@
</div>
{% endblock %}
{% block scripts %}
<script src="js/jquery-ui.min.js" type="text/javascript"></script>
<script type="text/javascript" src="js/rules/index.js"></script>
{% endblock %}