diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index d9afa496..ae0ca50d 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/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] }); } diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms index 1f7a48af..f701b755 100644 --- a/src/views/tools/tools_log.ms +++ b/src/views/tools/tools_log.ms @@ -2,7 +2,11 @@ {{t 'home'}} {{t 'tools'}} {{t 'logs'}} + {{#if log.name}} + {{ log.name }} + {{else}} {{ log.log_path }} + {{/if}}
diff --git a/src/views/tools/tools_logs.ms b/src/views/tools/tools_logs.ms index 30fbf8de..b7f4d7b2 100644 --- a/src/views/tools/tools_logs.ms +++ b/src/views/tools/tools_logs.ms @@ -22,7 +22,8 @@