Merge pull request #194 from YunoHost/fix-service-active-status

Use the active/inactive status instead of running/exited/dead in service views

src/js/yunohost/controllers/services.js

@@ -18,7 +18,7 @@
                 v.name = k;
                 // Handlebars want booleans
                 v.is_loaded = (v.loaded=='enabled') ? true : false;
-                v.is_running = (v.status=='running') ? true : false;
+                v.is_running = (v.active=='active') ? true : false;
                 // Translate status and loaded state
                 v.status = y18n.t(v.status);
                 v.loaded = y18n.t(v.loaded);
@@ -48,9 +48,9 @@
             data2.service.name = c.params['service'];
             // Handlebars want booleans
             data2.service.is_loaded = (data.loaded=='enabled') ? true : false;
-            data2.service.is_running = (data.status=='running') ? true : false;
+            data2.service.is_running = (data.active=='active') ? true : false;
             // Translate status and loaded state
-            data2.service.status = y18n.t(data.status);
+            data2.service.active = y18n.t(data.active);
             data2.service.loaded = y18n.t(data.loaded);
             store.clear('slide');
             c.view('service/service_info', data2);

src/locales/en.json

@@ -1,5 +1,6 @@
 {
     "action": "Action",
+    "active": "Active",
     "add": "Add",
     "remove": "Remove",
     "administration_password": "Administration password",

src/views/service/service_info.ms

@@ -39,7 +39,7 @@
             <br>
             {{t 'service_status'}}
             <span class="text-{{#is_running}}success{{/is_running}}{{^is_running}}danger{{/is_running}}">
-            {{status}}
+            {{active}}
             </span>
             <br>
             {{t 'started_at'}}

src/views/service/service_list.ms

@@ -13,7 +13,7 @@
         <div class="list-group-item-text">
             {{t 'service_status'}}
             <span class="text-{{#is_running}}success{{/is_running}}{{^is_running}}danger{{/is_running}}">
-            {{status}}
+            {{active}}
             </span>
             <br>
             {{t 'started_at'}}