Merge pull request #241 from YunoHost/improve-log-list

[enh] Improve log list

src/js/yunohost/controllers/tools.js

@@ -97,9 +97,9 @@
 
     // Display journals list
     app.get('#/tools/logs', function (c) {
-        c.api("/logs", function(categories) {
+        c.api("/logs?limit=25&with_details", function(categories) {
             data = [];
-            icons = {
+            category_icons = {
                 'operation': 'wrench',
                 'history': 'history',
                 'package': 'puzzle-piece',
@@ -108,11 +108,20 @@
                 'service': 'cog',
                 'app': 'cubes'
             }
+            success_icons = {
+                true: 'check text-success',
+                false: 'close text-danger',
+                '?': 'question text-warning'
+            }
             for (var category in categories) {
+                for (var log in categories[category])
+                {
+                    categories[category][log].success_icon = success_icons[categories[category][log].success]
+                }
                 if (categories.hasOwnProperty(category)) {
                     data.push({
                         key:category,
-                        icon:(category in icons)?icons[category]:'info-circle',
+                        icon:(category in category_icons)?category_icons[category]:'info-circle',
                         value:categories[category]
                     });
                 }

src/views/tools/tools_log.ms

@@ -2,7 +2,11 @@
     <a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
     <a href="#/tools">{{t 'tools'}}</a>
     <a href="#/tools/logs">{{t 'logs'}}</a>
+    {{#if log.name}}
+    <a href="#/tools/logs/{{ log.name }}">{{ log.name }}</a>
+    {{else}}
     <a href="#/tools/logs/{{ log.log_path }}">{{ log.log_path }}</a>
+    {{/if}}
 </div>
 
 <div class="actions-group">

src/views/tools/tools_logs.ms

@@ -22,7 +22,8 @@
         <div id="collapse-{{key}}" class="panel-collapse{{#if @first}}{{else}} collapse{{/if}}" role="tabpanel" aria-labelledby="heading-{{key}}">
             <div class="list-group">
             {{#value}}
-                <a href="#/tools/logs/{{ name }}" class="list-group-item" title='{{formatTime started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}'><small style="margin-right:20px;" >{{formatRelative started_at}}</small> {{ description }}</a>
+                <a href="#/tools/logs/{{ name }}" class="list-group-item" title='{{formatTime started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}'><small style="margin-right:20px;" >{{formatRelative started_at}}</small>
+                <span class="fa-fw fa-{{success_icon}}"></span> {{ description }}</a>
             {{/value}}
             </div>
         </div>