From eee142fbecb7b8b042ff7173819ac919e8791881 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Tue, 28 Jun 2016 05:11:12 +0200 Subject: [PATCH 01/15] [enh] display list of journals in tools --- src/js/yunohost/controllers/tools.js | 15 +++++++++++++- src/views/tools/tools_journals.ms | 30 ++++++++++++++++++++++++++++ src/views/tools/tools_list.ms | 4 ++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/views/tools/tools_journals.ms diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index b6bf64c3..63b850f8 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -95,6 +95,19 @@ } }); + // Display journals list + app.get('#/tools/journals', function (c) { + c.api("/journals", function(categories) { + c.view('tools/tools_journals', { + "data": categories, + formatDate: function() { + console.log("caca"); + return this.started_at.getDate(); + } + }); + }); + }); + // Download SSL Certificate Authority app.get('#/tools/ca', function (c) { c.view('tools/tools_ca'); @@ -170,4 +183,4 @@ }); }); -})(); \ No newline at end of file +})(); diff --git a/src/views/tools/tools_journals.ms b/src/views/tools/tools_journals.ms new file mode 100644 index 00000000..905f97d0 --- /dev/null +++ b/src/views/tools/tools_journals.ms @@ -0,0 +1,30 @@ +
+ {{t 'home'}} + {{t 'tools'}} + {{t 'journals'}} +
+ +
+ +{{#if data}} +{{#data}} +{{#categories}} +
+
+ +
+
{{#journals}} + {{ started_at }} {{ name }} + {{/journals}}
+
+
+
+{{/categories}} +{{/data}} +{{/if}} diff --git a/src/views/tools/tools_list.ms b/src/views/tools/tools_list.ms index add62158..6c8608e4 100644 --- a/src/views/tools/tools_list.ms +++ b/src/views/tools/tools_list.ms @@ -11,6 +11,10 @@

{{t 'diagnosis'}}

+ + +

{{t 'journals'}}

+

{{t 'monitoring'}}

From 12670632cfd3e8215b8fbbd5bf7755c18d190db4 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Tue, 28 Jun 2016 05:38:17 +0200 Subject: [PATCH 02/15] [enh] display a single journal --- src/js/yunohost/controllers/tools.js | 9 ++++++ src/views/tools/tools_journal.ms | 47 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 src/views/tools/tools_journal.ms diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index 63b850f8..d2ae7a4f 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -108,6 +108,15 @@ }); }); + // One journal + app.get('#/tools/journals/:file_name', function (c) { + c.api("/journals/" + c.params["file_name"], function(journal) { + c.view('tools/tools_journal', { + "journal": journal, + }); + }); + }); + // Download SSL Certificate Authority app.get('#/tools/ca', function (c) { c.view('tools/tools_ca'); diff --git a/src/views/tools/tools_journal.ms b/src/views/tools/tools_journal.ms new file mode 100644 index 00000000..986acfad --- /dev/null +++ b/src/views/tools/tools_journal.ms @@ -0,0 +1,47 @@ +{{#journal}} +
+ {{t 'home'}} + {{t 'tools'}} + {{t 'journals'}} + {{ name }} - {{ started_at }} +
+ +
+ +
+
+

{{t 'infos'}}

+
+
+
+
{{t 'name'}}
{{ name }}
+
{{t 'started_at'}}
{{ started_at }}
+
{{t 'path'}}
{{ path }}
+ {{#each metadata}} +
{{@key}}
+
{{.}}
+ {{/each}} +
+
+
+ +
+
+

{{t 'logs'}}

+
+
+ + + + + +
+
{{#logs}}{{datetime}}
+{{/logs}}
+ 		+
{{#logs}}{{{line}}}
+{{/logs}}
+
+
+
+{{/journal}} From b346a16262829211adb8d4c422141e616b9a1eb9 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Tue, 28 Jun 2016 06:05:31 +0200 Subject: [PATCH 03/15] [enh] overflow or use full space for journal logs --- src/css/style.less | 7 +++++++ src/views/tools/tools_journal.ms | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/css/style.less b/src/css/style.less index e85f117e..ecb7d74c 100644 --- a/src/css/style.less +++ b/src/css/style.less @@ -416,6 +416,13 @@ button[data-paste-content] { } } +.full-width { + width: 100%; +} + +.overflow-auto { + overflow: auto; +} /** Breadcrumb **/ @breadcrumb-bg: none; diff --git a/src/views/tools/tools_journal.ms b/src/views/tools/tools_journal.ms index 986acfad..24739936 100644 --- a/src/views/tools/tools_journal.ms +++ b/src/views/tools/tools_journal.ms @@ -29,15 +29,15 @@

{{t 'logs'}}

-
+
- From 2cda2ea6976a66dd09be427ea23b89d908c9007e Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Tue, 28 Jun 2016 06:06:47 +0200 Subject: [PATCH 04/15] [mod] use journal name as title --- src/views/tools/tools_journal.ms | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/tools/tools_journal.ms b/src/views/tools/tools_journal.ms index 24739936..392ebcb5 100644 --- a/src/views/tools/tools_journal.ms +++ b/src/views/tools/tools_journal.ms @@ -10,11 +10,10 @@
-

{{t 'infos'}}

+

{{ name }}

-
{{t 'name'}}
{{ name }}
{{t 'started_at'}}
{{ started_at }}
{{t 'path'}}
{{ path }}
{{#each metadata}} From 663cbe84d3256baf3bf21e6ebc6b188ee871c26b Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 26 May 2018 03:18:32 +0200 Subject: [PATCH 05/15] [enh] display more lines and paste logs --- src/bower.json | 1 + src/gulpfile.js | 1 + src/js/yunohost/controllers/tools.js | 31 +++++--- src/js/yunohost/helpers.js | 2 +- src/js/yunohost/main.js | 3 +- src/views/tools/tools_journal.ms | 46 ------------ src/views/tools/tools_list.ms | 4 +- src/views/tools/tools_log.ms | 71 +++++++++++++++++++ .../{tools_journals.ms => tools_logs.ms} | 18 +++-- src/views/tools/tools_rebooting.ms | 1 + src/views/tools/tools_shuttingdown.ms | 1 + 11 files changed, 111 insertions(+), 68 deletions(-) delete mode 100644 src/views/tools/tools_journal.ms create mode 100644 src/views/tools/tools_log.ms rename src/views/tools/{tools_journals.ms => tools_logs.ms} (50%) create mode 100644 src/views/tools/tools_rebooting.ms create mode 100644 src/views/tools/tools_shuttingdown.ms diff --git a/src/bower.json b/src/bower.json index 970655e5..f27d25da 100644 --- a/src/bower.json +++ b/src/bower.json @@ -7,6 +7,7 @@ "bootstrap": "3.3.6", "font-awesome": "4.5.0", "handlebars": "1.3.0", + "handlebars-helper-intl": "1.1.2", "sammy": "0.7.6", "js-cookie": "2.1.0", "source-sans-pro": "git://github.com/adobe-fonts/source-sans-pro.git#2.020R-ro/1.075R-it", diff --git a/src/gulpfile.js b/src/gulpfile.js index 608a8748..c754f518 100644 --- a/src/gulpfile.js +++ b/src/gulpfile.js @@ -41,6 +41,7 @@ gulp.task('js', function() { 'bower_components/jquery/dist/jquery.js', 'bower_components/js-cookie/src/js.cookie.js', 'bower_components/handlebars/handlebars.js', + 'bower_components/handlebars-helper-intl/dist/handlebars-intl-with-locales.js', 'bower_components/sammy/lib/sammy.js', 'bower_components/sammy/lib/plugins/sammy.handlebars.js', 'bower_components/sammy/lib/plugins/sammy.json.js', diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index d2ae7a4f..cc2c6a1c 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -96,12 +96,11 @@ }); // Display journals list - app.get('#/tools/journals', function (c) { - c.api("/journals", function(categories) { - c.view('tools/tools_journals', { + app.get('#/tools/logs', function (c) { + c.api("/logs", function(categories) { + c.view('tools/tools_logs', { "data": categories, formatDate: function() { - console.log("caca"); return this.started_at.getDate(); } }); @@ -109,10 +108,26 @@ }); // One journal - app.get('#/tools/journals/:file_name', function (c) { - c.api("/journals/" + c.params["file_name"], function(journal) { - c.view('tools/tools_journal', { - "journal": journal, + app.get(/\#\/tools\/logs\/(.*)(\?number=(\d+))?/, function (c) { + var params = "?path=" + c.params["splat"][0]; + var number = (c.params["number"])?c.params["number"]:50; + params += "&number=" + number; + + c.api("/logs/display" + params, function(log) { + if ('metadata' in log) { + if ('started_at' in log.metadata) { + log.metadata.started_at = Date.parse(log.metadata.started_at) + } + if ('ended_at' in log.metadata) { + log.metadata.ended_at = Date.parse(log.metadata.ended_at) + } + if (!'env' in log.metadata && 'args' in log.metadata) { + log.metadata.env = log.metadata.args + } + } + c.view('tools/tools_log', { + "log": log, + "next_number": log.logs.length == number ? number * 10:false }); }); }); diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js index 4b10707f..70e7a7f0 100644 --- a/src/js/yunohost/helpers.js +++ b/src/js/yunohost/helpers.js @@ -383,7 +383,7 @@ // Paste 
         prePaste: function() {
-            var pasteButtons = $('button[data-paste-content]');
+            var pasteButtons = $('button[data-paste-content],a[data-paste-content]');
             pasteButtons.on('click', function(){
                 // Get paste content element
                 var preElement = $($(this).data('paste-content'));
diff --git a/src/js/yunohost/main.js b/src/js/yunohost/main.js
index 4c741efd..bcf70f48 100644
--- a/src/js/yunohost/main.js
+++ b/src/js/yunohost/main.js
@@ -10,6 +10,7 @@
 
         // Plugins
         sam.use('Handlebars', 'ms');
+        window.HandlebarsIntl.registerWith(Handlebars);
 
         Handlebars.registerHelper('ucwords', function(str) {
             return (str + '').replace(/^([a-z\u00E0-\u00FC])|\s+([a-z\u00E0-\u00FC])/g, function ($1) {
@@ -122,4 +123,4 @@
         app.run('#/');
     });
 
-})();
\ No newline at end of file
+})();
diff --git a/src/views/tools/tools_journal.ms b/src/views/tools/tools_journal.ms
deleted file mode 100644
index 392ebcb5..00000000
--- a/src/views/tools/tools_journal.ms
+++ /dev/null
@@ -1,46 +0,0 @@
-{{#journal}}
-

-    {{t 'home'}}
-    {{t 'tools'}}
-    {{t 'journals'}}
-    {{ name }} - {{ started_at }}
-

-
-

-
-

-    

-        
 {{ name }}

-    

-    

-        

-            
{{t 'started_at'}}
 
{{ started_at }}

-            
{{t 'path'}}
 
{{ path }}

-            {{#each metadata}}
-            
{{@key}}

-            
{{.}}

-            {{/each}}
-        

-    

-

-
-

-    

-        
 {{t 'logs'}}

-    

-    

-        
{{#logs}}{{datetime}}
 {{/logs}}
 -
{{#logs}}{{{line}}}
+
+
{{#logs}}{{{line}}}
 {{/logs}}
- - - - -
-
{{#logs}}{{datetime}}
-{{/logs}}
- 		-
{{#logs}}{{{line}}}
-{{/logs}}
-
-
-
-{{/journal}} diff --git a/src/views/tools/tools_list.ms b/src/views/tools/tools_list.ms index 6c8608e4..d744f68d 100644 --- a/src/views/tools/tools_list.ms +++ b/src/views/tools/tools_list.ms @@ -11,9 +11,9 @@

{{t 'diagnosis'}}

- + -

{{t 'journals'}}

+

{{t 'logs'}}

 diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms new file mode 100644 index 00000000..2fd0bd7a --- /dev/null +++ b/src/views/tools/tools_log.ms @@ -0,0 +1,71 @@ +
+ {{t 'home'}} + {{t 'tools'}} + {{t 'logs'}} + {{ log.log_path }} +
+ +
+ + {{t 'upload'}} + +
+ +
+ +{{#if log.metadata}} +
+
+

{{ log.description }}

+
+
+
+
{{t 'path'}}
{{ log.log_path }}
+ {{#if log.metadata.started_at}} +
{{t 'started_at'}}
+
{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
+ {{/if}} + {{#if log.metadata.ended_at}} +
{{t 'ended_at'}}
+
{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
+ {{/if}} +
+
+
+{{#if log.metadata.env}} +
+ +
+
+
+ {{#each log.metadata.env}} +
{{@key}}
+
{{.}}
+ {{/each}} +
+
+
+
+{{/if}} + +{{/if}} +
+
+

{{#if log.metadata}}{{t 'logs'}}{{else}}{{log.log_path}}{{/if}}

+
+
+ {{#if log.metadata.error}} + + {{/if}} + +{{#if next_number}}MORE{{/if}} +
{{#log.logs}}{{.}}
+{{/log.logs}}
+
+
diff --git a/src/views/tools/tools_journals.ms b/src/views/tools/tools_logs.ms similarity index 50% rename from src/views/tools/tools_journals.ms rename to src/views/tools/tools_logs.ms index 905f97d0..12e4e43e 100644 --- a/src/views/tools/tools_journals.ms +++ b/src/views/tools/tools_logs.ms @@ -1,30 +1,28 @@
{{t 'home'}} {{t 'tools'}} - {{t 'journals'}} + {{t 'logs'}}
{{#if data}} {{#data}} -{{#categories}}
- -{{/categories}} {{/data}} {{/if}} diff --git a/src/views/tools/tools_rebooting.ms b/src/views/tools/tools_rebooting.ms new file mode 100644 index 00000000..1d4d95cc --- /dev/null +++ b/src/views/tools/tools_rebooting.ms @@ -0,0 +1 @@ +
{{t 'tools_rebooting'}}
diff --git a/src/views/tools/tools_shuttingdown.ms b/src/views/tools/tools_shuttingdown.ms new file mode 100644 index 00000000..e7294efd --- /dev/null +++ b/src/views/tools/tools_shuttingdown.ms @@ -0,0 +1 @@ +
{{t 'tools_shuttingdown'}}
From a10c6ff33a63e3d59999ee03e5d4ce698d94b45f Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 2 Jun 2018 13:44:40 +0200 Subject: [PATCH 06/15] [enh] Adapt log view to the new api, and add paste option --- src/js/yunohost/controllers/tools.js | 12 +++++++++++- src/views/tools/tools_logs.ms | 18 +++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index cc2c6a1c..6acb2051 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -98,8 +98,18 @@ // Display journals list app.get('#/tools/logs', function (c) { c.api("/logs", function(categories) { + data = []; + for (var category in categories) { + if (categories.hasOwnProperty(category)) { + data.push({ + key:category, + value:categories[category] + }); + } + } + c.view('tools/tools_logs', { - "data": categories, + "data": data, formatDate: function() { return this.started_at.getDate(); } diff --git a/src/views/tools/tools_logs.ms b/src/views/tools/tools_logs.ms index 12e4e43e..ca3ca26f 100644 --- a/src/views/tools/tools_logs.ms +++ b/src/views/tools/tools_logs.ms @@ -7,22 +7,22 @@
{{#if data}} -{{#data}}
+{{#data}}
- {{/data}} +
{{/if}} From f7ec1274bf359dda47676f249a5b4f3b1bfdd623 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 4 Jun 2018 02:50:24 +0200 Subject: [PATCH 07/15] [enh] Icon and i18n for logs categories --- src/js/yunohost/controllers/tools.js | 10 ++++++++++ src/js/yunohost/main.js | 11 ++++++++++- src/locales/en.json | 11 ++++++++++- src/views/tools/tools_logs.ms | 12 +++++++++--- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index 6acb2051..cb9789ef 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -99,10 +99,20 @@ app.get('#/tools/logs', function (c) { c.api("/logs", function(categories) { data = []; + icons = { + 'operation': 'wrench', + 'history': 'history', + 'package': 'puzzle-piece', + 'system': 'cogs', + 'access': 'ban', + 'service': 'cog', + 'app': 'cubes' + } for (var category in categories) { if (categories.hasOwnProperty(category)) { data.push({ key:category, + icon:(category in icons)?icons[category]:'info-circle', value:categories[category] }); } diff --git a/src/js/yunohost/main.js b/src/js/yunohost/main.js index bcf70f48..501ec52e 100644 --- a/src/js/yunohost/main.js +++ b/src/js/yunohost/main.js @@ -38,7 +38,16 @@ var result = y18n.t(y18n_key, Array.prototype.slice.call(arguments, 1)); return new Handlebars.SafeString(result); }); - + + Handlebars.registerHelper('concat', function() { + var outStr = ''; + for(var arg in arguments){ + if(typeof arguments[arg]!='object'){ + outStr += arguments[arg]; + } + } + return outStr; + }); // Look for supported type of storage to use /** diff --git a/src/locales/en.json b/src/locales/en.json index f3dcb64c..f6c7ed98 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -307,5 +307,14 @@ "diagnosis" : "Diagnosis", "diagnosis_with_private" : "Diagnosis with private data", "diagnosis_view_private" : "Show diagnosis with private data", - "diagnosis_hide_private" : "Show diagnosis without private data" + "diagnosis_hide_private" : "Show diagnosis without private data", + "logs": "Logs", + "logs_operation": "Operations made on system with YunoHost", + "logs_history": "History of command run on system", + "logs_package": "Debian packages management history", + "logs_system": "Kernel logs and others low level events", + "logs_access": "List of access and bans", + "logs_service": "Services logs", + "logs_app": "Apps logs", + "logs_no_logs_registered": "No log registered for this category" } diff --git a/src/views/tools/tools_logs.ms b/src/views/tools/tools_logs.ms index ca3ca26f..6dbe1c97 100644 --- a/src/views/tools/tools_logs.ms +++ b/src/views/tools/tools_logs.ms @@ -13,15 +13,21 @@
-
{{#value}} +
+ {{#if value}} + {{#value}} {{ started_at }} {{ description }} - {{/value}}
+ {{/value}} + {{else}} +
{{t 'logs_no_logs_registered'}}
+ {{/if}}
+
{{/data}}
From 6a04b57ca60d289a6693f185bee7e86b081e4143 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 4 Jun 2018 02:56:42 +0200 Subject: [PATCH 08/15] [enh] Open first log category --- src/views/tools/tools_logs.ms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/tools/tools_logs.ms b/src/views/tools/tools_logs.ms index 6dbe1c97..3cb069e6 100644 --- a/src/views/tools/tools_logs.ms +++ b/src/views/tools/tools_logs.ms @@ -17,7 +17,7 @@
-
+
{{#if value}} {{#value}} From 07d2e1c3bd0513bd6db1c3b16276d16761d2ca3e Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 4 Jun 2018 03:32:04 +0200 Subject: [PATCH 09/15] [enh] Add context in log paste feature --- src/js/yunohost/helpers.js | 2 +- src/views/tools/tools_log.ms | 29 +++++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js index 70e7a7f0..0e828651 100644 --- a/src/js/yunohost/helpers.js +++ b/src/js/yunohost/helpers.js @@ -395,7 +395,7 @@ $.ajax({ type: "POST", url: 'https://paste.yunohost.org/documents', - data: preElement[0].innerHTML, + data: preElement.text(), }) .success(function(data, textStatus, jqXHR) { window.open('https://paste.yunohost.org/' + data.key, '_blank'); diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms index 2fd0bd7a..7c604650 100644 --- a/src/views/tools/tools_log.ms +++ b/src/views/tools/tools_log.ms @@ -6,7 +6,7 @@
- + {{t 'upload'}}
@@ -16,19 +16,14 @@ {{#if log.metadata}}
-

{{ log.description }}

+ +

{{ log.description }}

-
-
{{t 'path'}}
{{ log.log_path }}
- {{#if log.metadata.started_at}} -
{{t 'started_at'}}
-
{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
- {{/if}} - {{#if log.metadata.ended_at}} -
{{t 'ended_at'}}
-
{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
- {{/if}} +
+
{{t 'path'}}
{{ log.log_path }}
+{{#if log.metadata.started_at}}
{{t 'started_at'}}
{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
+{{/if}}{{#if log.metadata.ended_at}}
{{t 'ended_at'}}
{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
{{/if}}
@@ -43,11 +38,9 @@
-
- {{#each log.metadata.env}} -
{{@key}}
-
{{.}}
- {{/each}} +
+{{#each log.metadata.env}}
{{@key}}
{{.}}
+{{/each}}
@@ -63,8 +56,8 @@ {{#if log.metadata.error}} {{/if}} +{{#if next_number}}MORE{{/if}} -{{#if next_number}}MORE{{/if}} 
{{#log.logs}}{{.}}
 {{/log.logs}}
From de8459d75303e7460d0c0ecacb0a902a31fcc10c Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 4 Jun 2018 03:51:12 +0200 Subject: [PATCH 10/15] [enh] Better more logs button --- src/locales/en.json | 9 ++++++++- src/views/tools/tools_log.ms | 14 ++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index f6c7ed98..805dd907 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -316,5 +316,12 @@ "logs_access": "List of access and bans", "logs_service": "Services logs", "logs_app": "Apps logs", - "logs_no_logs_registered": "No log registered for this category" + "logs_no_logs_registered": "No log registered for this category", + "logs_end_with_error": "This log finished with the error :", + "logs_error": "Error", + "logs_ended_at": "End", + "logs_started_at": "Start", + "logs_path": "Path", + "logs_context": "Context", + "logs_more": "Display more lines" } diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms index 7c604650..5e58f8d4 100644 --- a/src/views/tools/tools_log.ms +++ b/src/views/tools/tools_log.ms @@ -21,9 +21,10 @@
-
{{t 'path'}}
{{ log.log_path }}
-{{#if log.metadata.started_at}}
{{t 'started_at'}}
{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
-{{/if}}{{#if log.metadata.ended_at}}
{{t 'ended_at'}}
{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
{{/if}} +
{{t 'logs_path'}}
{{ log.log_path }}
+{{#if log.metadata.started_at}}
{{t 'logs_started_at'}}
{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
+{{/if}}{{#if log.metadata.ended_at}}
{{t 'logs_ended_at'}}
{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
{{/if}} +{{#if log.metadata.error}}
{{t 'logs_error'}}
{{t 'logs_end_with_error'}} {{log.metadata.error}}
{{/if}}
@@ -32,7 +33,7 @@ @@ -53,10 +54,7 @@

{{#if log.metadata}}{{t 'logs'}}{{else}}{{log.log_path}}{{/if}}

- {{#if log.metadata.error}} - - {{/if}} -{{#if next_number}}MORE{{/if}} +{{#if next_number}} {{t 'logs_more'}}{{/if}} 
{{#log.logs}}{{.}}
 {{/log.logs}}
From 2ab67113643a1b8842f3919517183f0574db9246 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 4 Jun 2018 03:54:57 +0200 Subject: [PATCH 11/15] [enh] Improve label for sharing feature --- src/locales/en.json | 1 + src/views/tools/tools_log.ms | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 805dd907..825eec60 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -323,5 +323,6 @@ "logs_started_at": "Start", "logs_path": "Path", "logs_context": "Context", + "logs_share_with_yunopaste": "Share with YunoPaste", "logs_more": "Display more lines" } diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms index 5e58f8d4..f093eb96 100644 --- a/src/views/tools/tools_log.ms +++ b/src/views/tools/tools_log.ms @@ -7,7 +7,7 @@
- {{t 'upload'}} + {{t 'logs_share_with_yunopaste'}}
From f4487c6c8f509ebc0d11676c48057946651b4051 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 4 Jun 2018 03:57:24 +0200 Subject: [PATCH 12/15] [enh] Don't display if empty --- src/views/tools/tools_logs.ms | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/tools/tools_logs.ms b/src/views/tools/tools_logs.ms index 3cb069e6..ef936850 100644 --- a/src/views/tools/tools_logs.ms +++ b/src/views/tools/tools_logs.ms @@ -9,6 +9,7 @@ {{#if data}}
{{#data}} +{{#if value}}
- {{#if value}} {{#value}} {{ started_at }} {{ description }} {{/value}} - {{else}} -
{{t 'logs_no_logs_registered'}}
- {{/if}}
+{{/if}} {{/data}}
{{/if}} From 92c97487a81cd19659fc19d024f3f5014469d741 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 23 Jul 2018 14:56:57 +0000 Subject: [PATCH 13/15] Fix syntax error in en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index f5351891..087ff993 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -245,7 +245,7 @@ "logs_path": "Path", "logs_context": "Context", "logs_share_with_yunopaste": "Share with YunoPaste", - "logs_more": "Display more lines" + "logs_more": "Display more lines", "path_url": "Path", "port": "Port", "ports": "Ports", From eee196e090250b04212f299cd13907097a8538ab Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 23 Jul 2018 17:11:02 +0000 Subject: [PATCH 14/15] Show relative time in log list + fix locale for handlebar formatTime/formatRelative --- src/js/yunohost/controllers/tools.js | 7 +++---- src/views/tools/tools_log.ms | 2 ++ src/views/tools/tools_logs.ms | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index a2e2b236..dd39d89c 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -121,9 +121,7 @@ c.view('tools/tools_logs', { "data": data, - formatDate: function() { - return this.started_at.getDate(); - } + "locale": y18n.locale }); }); }); @@ -148,7 +146,8 @@ } c.view('tools/tools_log', { "log": log, - "next_number": log.logs.length == number ? number * 10:false + "next_number": log.logs.length == number ? number * 10:false, + "locale": y18n.locale }); }); }); diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms index f093eb96..7557d4a7 100644 --- a/src/views/tools/tools_log.ms +++ b/src/views/tools/tools_log.ms @@ -13,6 +13,7 @@
+{{#intl locales=locale}} {{#if log.metadata}}
@@ -60,3 +61,4 @@ {{/log.logs}}
+{{/intl}} diff --git a/src/views/tools/tools_logs.ms b/src/views/tools/tools_logs.ms index ef936850..30fbf8de 100644 --- a/src/views/tools/tools_logs.ms +++ b/src/views/tools/tools_logs.ms @@ -6,6 +6,7 @@
+{{#intl locales=locale}} {{#if data}}
{{#data}} @@ -21,7 +22,7 @@ @@ -30,3 +31,4 @@ {{/data}}
{{/if}} +{{/intl}} From 04582fd27fb75191e6dc604bb7d77ee0a3978798 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 23 Jul 2018 18:46:59 +0000 Subject: [PATCH 15/15] Dirty onclick to share log with yunopaste using display --share --- src/views/tools/tools_log.ms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/tools/tools_log.ms b/src/views/tools/tools_log.ms index 7557d4a7..1f7a48af 100644 --- a/src/views/tools/tools_log.ms +++ b/src/views/tools/tools_log.ms @@ -6,7 +6,7 @@
- + {{t 'logs_share_with_yunopaste'}}