From 2e35a7e46f0929438c1c206e3116caa829f07dc6 Mon Sep 17 00:00:00 2001
From: Thomas Duval <thomas.duval@orange.com>
Date: Fri, 5 Oct 2018 16:54:37 +0200
Subject: Update code to 4.6 official version

Change-Id: Ibd0da0e476e24b2685f54693efc11f7a58d40a62
---
 moon_dashboard/moon/static/moon/model/model.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'moon_dashboard/moon/static/moon/model/model.html')

diff --git a/moon_dashboard/moon/static/moon/model/model.html b/moon_dashboard/moon/static/moon/model/model.html
index 98d64c75..97f08910 100644
--- a/moon_dashboard/moon/static/moon/model/model.html
+++ b/moon_dashboard/moon/static/moon/model/model.html
@@ -62,10 +62,6 @@
         <translate>Import</translate>
       </label>
       <input id="file" class="input-file" type="file" on-read-file="ctrl.importData(contents)" accept="application/json,.json"/>
-      <!--button type="button" class="btn btn-primary" ng-click="ctrl.createModel()">
-        <span class="fa fa-upload"></span>
-        <translate>Import</translate>
-      </button-->
     </div>
   </div>
 
@@ -115,19 +111,19 @@
                   <tr>
                     <td>
                       <p ng-repeat="category in metaRule.subject_categories">
-                        <span>{$ category.name $}</span>
+                        <span title="{$ category.description $}">{$ category.name $}</span>
                         <button type="button" class="fa fa-trash pull-right" ng-click="ctrl.removeCategoryFromMetaRule('subject', metaRule, category)" title="{$ 'Remove Subject' | translate $}"></button>
                       </p>
                     </td>
                     <td>
                       <p ng-repeat="category in metaRule.object_categories">
-                        <span>{$ category.name $}</span>
+                        <span title="{$ category.description $}">{$ category.name $}</span>
                         <button type="button" class="fa fa-trash pull-right" ng-click="ctrl.removeCategoryFromMetaRule('object', metaRule, category)" title="{$ 'Remove Object' | translate $}"></button>
                       </p>
                     </td>
                     <td>
                       <p ng-repeat="category in metaRule.action_categories">
-                        <span>{$ category.name $}</span>
+                        <span title="{$ category.description $}">{$ category.name $}</span>
                         <button type="button" class="fa fa-trash pull-right" ng-click="ctrl.removeCategoryFromMetaRule('action', metaRule, category)" title="{$ 'Remove Action' | translate $}"></button>
                       </p>
                     </td>
-- 
cgit 1.2.3-korg