1 files changed, 90 insertions, 58 deletions
diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html
index 3ec54239..76ac4365 100644
--- a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html
+++ b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html
@@ -1,79 +1,74 @@
 <div>
 
-    <div class="row">
-        <div class="table-responsive" data-role="table">
+    <div class="panel panel-default">
 
-            <table class="table table-striped table-hover" ng-table="list.table">
+        <div class="panel-heading">
 
-                <thead>
+            <h4 data-translate="moon.policy.rules.edit.title">List of associated Subjects</h4>
 
-                <tr>
+        </div>
+
+        <div class="panel-body">
 
-                    <th class="customTables sortable"
-                        ng-class="{ 'sort-asc': list.table.isSortBy('name', 'asc'), 'sort-desc': list.table.isSortBy('name', 'desc') }"
-                        ng-click="list.table.sorting('name', list.table.isSortBy('name', 'asc') ? 'desc' : 'asc')">
-                        <div data-translate="moon.policy.rules.list.table.id">Id</div>
-                    </th>
+            <div class="table-responsive" data-role="table">
 
-                    <th class="customTables sortable"
-                        ng-class="{ 'sort-asc': list.table.isSortBy('description', 'asc'), 'sort-desc': list.table.isSortBy('description', 'desc') }"
-                        ng-click="list.table.sorting('description', list.table.isSortBy('description', 'asc') ? 'desc' : 'asc')">
-                        <div data-translate="moon.policy.rules.list.table.metaRule">Meta Rule</div>
-                    </th>
+                <table class="table table-striped table-hover" ng-table="list.table">
 
-                    <th class="customTables sortable"
-                        ng-class="{ 'sort-asc': list.table.isSortBy('enabled', 'asc'), 'sort-desc': list.table.isSortBy('enabled', 'desc') }"
-                        ng-click="list.table.sorting('enabled', list.table.isSortBy('enabled', 'asc') ? 'desc' : 'asc')">
-                        <div data-translate="moon.policy.rules.list.table.enabled">Enabled</div>
-                    </th>
+                    <thead>
 
-                    <th class="customTables sortable"
-                        ng-class="{ 'sort-asc': list.table.isSortBy('enabled', 'asc'), 'sort-desc': list.table.isSortBy('enabled', 'desc') }"
-                        ng-click="list.table.sorting('enabled', list.table.isSortBy('enabled', 'asc') ? 'desc' : 'asc')">
-                        <div data-translate="moon.policy.rules.list.table.rule">Rule</div>
-                    </th>
-                </tr>
+                    <tr>
 
-                </thead>
+                        <th class="customTables sortable"
+                            ng-class="{ 'sort-asc': list.table.isSortBy('description', 'asc'), 'sort-desc': list.table.isSortBy('description', 'desc') }"
+                            ng-click="list.table.sorting('description', list.table.isSortBy('description', 'asc') ? 'desc' : 'asc')">
+                            <div data-translate="moon.policy.rules.list.table.metaRule">Meta Rule</div>
+                        </th>
 
-                <moon-loader ng-if="list.loadingRules"></moon-loader>
+                        <th class="customTables sortable">
+                            <div data-translate="moon.policy.rules.list.table.rule">Rule</div>
+                        </th>
 
-                <tbody ng-if="!list.loadingRules && !list.hasRules()">
-                    <tr>
-                        <td colspan="2"><span data-translate="moon.policy.rules.list.table.notFound">There is no Rules</span></td>
+                        <th class="customTables sortable">
+                            <div data-translate="moon.policy.rules.list.table.instructions">Instruction</div>
+                        </th>
+
+                        <th class="customTables sortable">
+                            <div data-translate="moon.policy.rules.list.table.action.title">Actions</div>
+                        </th>
                     </tr>
-                </tbody>
 
-                <tbody ng-if="!list.loadingRules && list.hasRules()">
+                    </thead>
 
-                <tr ng-repeat="aRule in $data | filter:list.search.find | orderBy:sort:reverse">
-                    <td ng-bind="aRule.id"></td>
+                    <moon-loader ng-if="list.loadingRules"></moon-loader>
 
-                    <td>
-                        <span ng-if="!list.getMetaRuleFromRule(aRule)">
-                            <moon-loader ng-if="!list.getMetaRuleFromRule(aRule)" ></moon-loader>
-                            <em data-translate="moon.policy.rules.list.table.loading.metaRule">Loading </em>
-                        </span>
+                    <tbody ng-if="!list.loadingRules && !list.hasRules()">
+                        <tr>
+                            <td colspan="4"><span data-translate="moon.policy.rules.list.table.notFound">There is no Rules</span></td>
+                        </tr>
+                    </tbody>
 
-                        <span ng-if="list.getMetaRuleFromRule(aRule)">
-                            <span ng-bind="aRule.meta_rule.name"></span>
-                        </span>
-                    </td>
+                    <tbody ng-if="!list.loadingRules && list.hasRules()">
 
-                    <td>
-                        <span ng-if="aRule.enabled" class="glyphicon glyphicon-ok"></span>
-                        <span ng-if="!aRule.enabled" class="glyphicon glyphicon-remove"></span>
-                    </td>
+                    <tr ng-repeat="aRule in $data | filter:list.search.find | orderBy:sort:reverse">
+                        <td>
+                            <span ng-if="!list.getMetaRuleFromRule(aRule)">
+                                <moon-loader ng-if="!list.getMetaRuleFromRule(aRule)" ></moon-loader>
+                                <em data-translate="moon.policy.rules.list.table.loading.metaRule">Loading </em>
+                            </span>
 
-                    <td >
+                                <span ng-if="list.getMetaRuleFromRule(aRule)">
+                                <span ng-bind="aRule.meta_rule.name"></span>
+                            </span>
+                        </td>
 
-                        <span ng-if="!list.getMetaRuleFromRule(aRule)">
-                            <moon-loader ng-if="!list.getMetaRuleFromRule(aRule)" ></moon-loader>
-                            <em data-translate="moon.policy.rules.list.table.loading.metaRule">Loading </em>
-                        </span>
+                        <td>
 
+                            <span ng-if="!list.getMetaRuleFromRule(aRule)">
+                                <moon-loader ng-if="!list.getMetaRuleFromRule(aRule)" ></moon-loader>
+                                <em data-translate="moon.policy.rules.list.table.loading.metaRule">Loading </em>
+                            </span>
 
-                        <span ng-if="list.getMetaRuleFromRule(aRule)" ng-repeat="(key, value) in aRule.rule">
+                            <span ng-if="list.getMetaRuleFromRule(aRule)" ng-repeat="(key, value) in aRule.rule">
 
                              <span ng-if="!list.getCategoryFromRuleIndex(key, aRule)">
                                 <moon-loader ng-if="!list.getCategoryFromRuleIndex(key, aRule)" ></moon-loader>
@@ -87,13 +82,50 @@
 
                         </span>
 
-                    </td>
+                        </td>
+
+                        <td>
+                            <pre ng-bind="aRule.instructions | json "></pre>
+                        </td>
+
+                        <td>
+
+                            <a href=""  ng-if="!aRule.loader" ng-click="list.deleteRules(aRule)" >
+                                <span class="glyphicon glyphicon-transfer"></span>
+                                <span class="control-label" data-translate="moon.policy.rules.list.table.action.delete">Delete</span>
+                            </a>
+
+                            <div ng-if="aRule.loader">
+
+                                <moon-loader></moon-loader>
 
-                </tr>
+                            </div>
+
+                        </td>
+
+                    </tr>
+
+                    </tbody>
+
+                </table>
+
+            </div>
+
+        </div>
+
+    </div>
+
+    <div ng-if="list.editMode" class="panel panel-default">
+
+        <div class="panel-heading">
+
+            <h4 data-translate="moon.policy.rules.edit.action.add.title">Add a Rules</h4>
+
+        </div>
 
-                </tbody>
+        <div class="panel-body">.
 
-            </table>
+            <moon-rules-edit policy="list.policy"></moon-rules-edit>
 
         </div>