From 521623797e8e7ab97c2ff9cd30757485084353bd Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 14 Jan 2016 09:49:12 +0100
Subject: [PATCH] Move rule groups.

---
 app/Http/routes.php              |  4 ++++
 resources/lang/en_US/firefly.php |  4 +++-
 resources/views/rules/index.twig | 10 ++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index c6d261bd91..e414bec428 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -247,6 +247,10 @@ Route::group(
     Route::get('/rules/groups/edit/{ruleGroup}', ['uses' => 'RuleController@editRuleGroup', 'as' => 'rules.rule-group.edit']);
     Route::get('/rules/groups/delete/{ruleGroup}', ['uses' => 'RuleController@deleteRuleGroup', 'as' => 'rules.rule-group.delete']);
 
+    Route::get('/rules/groups/up/{ruleGroup}', ['uses' => 'RuleController@upRuleGroup', 'as' => 'rules.rule-group.up']);
+    Route::get('/rules/groups/down/{ruleGroup}', ['uses' => 'RuleController@downRuleGroup', 'as' => 'rules.rule-group.down']);
+
+
     Route::post('/rules/groups/store', ['uses' => 'RuleController@storeRuleGroup', 'as' => 'rules.rule-group.store']);
     Route::post('/rules/groups/update/{ruleGroup}', ['uses' => 'RuleController@updateRuleGroup', 'as' => 'rules.rule-group.update']);
     Route::post('/rules/groups/destroy/{ruleGroup}', ['uses' => 'RuleController@destroyRuleGroup', 'as' => 'rules.rule-group.destroy']);
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index fa33d0ace7..17c03e889d 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -54,9 +54,11 @@ return [
     'updated_rule_group'                 => 'Successfully updated rule group ":title".',
     'edit_rule_group'                    => 'Edit rule group ":title"',
     'delete_rule_group'                  => 'Delete rule group ":title"',
-    'deleted_rule_group'                  => 'Deleted rule group ":title"',
+    'deleted_rule_group'                 => 'Deleted rule group ":title"',
     'update_rule_group'                  => 'Update rule group',
     'no_rules_in_group'                  => 'There are no rules in this group',
+    'move_rule_group_up'                 => 'Move rule group up',
+    'move_rule_group_down'               => 'Move rule group down',
 
     // actions and triggers
     'rule_trigger_user_action'           => 'User action is ":trigger_value"',
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index bdce941bae..cdb6cf1b09 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -36,8 +36,14 @@
                             <div class="btn-group">
                                 <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-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
-                                    <li><a href="{{ route('rules.rule-group.delete',ruleGroup.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a>
+                                    <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>