Merge pull request #191 from YunoHost/services_dbus

display more information on service listing page (thanks to dbus)

src/js/yunohost/controllers/services.js

@@ -24,6 +24,17 @@
                 v.loaded = y18n.t(v.loaded);
                 data2.services.push(v);
             });
+
+            data2.services.sort(function (a, b) {
+                if (a.name > b.name) {
+                    return 1;
+                }
+                else if (a.name < b.name) {
+                    return -1;
+                }
+                return 0;
+            });
+
             c.view('service/service_list', data2);
         });
     });
@@ -110,4 +121,4 @@
         );
     });
 
-})();
+})();

src/locales/en.json

@@ -248,6 +248,7 @@
     "running": "Running",
     "save": "Save",
     "select_user": "Select user",
+    "service_description": "Description:",
     "service_log": "%s log",
     "service_start_on_boot": "Start on boot: ",
     "service_status": "Status: ",
@@ -257,6 +258,7 @@
     "size": "Size",
     "skip": "Skip",
     "start": "Start",
+    "started_at": "Started at:",
     "status": "Status",
     "stop": "Stop",
     "storage_create": "Add remote storage",

src/views/service/service_info.ms

@@ -9,7 +9,24 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-    <h2 class="panel-title"><span class="fa-fw fa-info-circle"></span> {{t 'status'}}</h2>
+    <h2 class="panel-title"><span class="fa-fw fa-info-circle"></span> {{t 'infos'}}</h2>
+    </div>
+    <div class="panel-body">
+    {{#service}}
+        <dl class="dl-horizontal">
+            <dt>{{t 'name'}}</dt>
+            <dd>{{name}}</dd>
+            <dt>{{t 'description'}}</dt>
+            <dd>{{description}}</dd>
+        </dl>
+    {{/service}}
+    </div>
+</div>
+
+
+<div class="panel panel-default">
+    <div class="panel-heading">
+    <h2 class="panel-title"><span class="fa-fw fa-wrench"></span> {{t 'status'}}</h2>
     </div>
     <div class="panel-body">
         <dl class="dl-horizontal">
@@ -24,6 +41,9 @@
             <span class="text-{{#is_running}}success{{/is_running}}{{^is_running}}danger{{/is_running}}">
             {{status}}
             </span>
+            <br>
+            {{t 'started_at'}}
+            {{active_at.human}}
         </div>
 
         <div class="pull-right">

src/views/service/service_list.ms

@@ -9,13 +9,16 @@
 {{#services}}
     <a href="#/services/{{name}}" class="list-group-item slide service-{{name}}">
         <span class="fa-chevron-right pull-right"></span>
-        <h2 class="list-group-item-heading">{{name}}</h2>
+        <h2 class="list-group-item-heading">{{name}} <small>{{description}}</small></h2>
         <div class="list-group-item-text">
             {{t 'service_status'}}
             <span class="text-{{#is_running}}success{{/is_running}}{{^is_running}}danger{{/is_running}}">
             {{status}}
             </span>
+            <br>
+            {{t 'started_at'}}
+            {{active_at.human}}
         </div>
-	</a>
+    </a>
 {{/services}}
 </div>