diff options
author | Patrik Kernstock <info@pkern.at> | 2018-08-25 01:00:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-25 01:00:34 +0300 |
commit | 13e5bd2aa2ae3e98c54653ef50671dd2e1ab48ab (patch) | |
tree | 0b6d7aa2b0ce6542dd5cf92c454f9a6201456206 | |
parent | 817bc4116780ff5c4fed67197598fb6a3fa75a32 (diff) | |
parent | 3374b25bfde964c4c0aae60af0d8ac0013486f72 (diff) |
Merge branch 'master' into add-apps-monitoring
-rw-r--r-- | css/style.css | 16 | ||||
-rw-r--r-- | js/script.js | 229 | ||||
-rw-r--r-- | l10n/de.js | 6 | ||||
-rw-r--r-- | l10n/de.json | 6 | ||||
-rw-r--r-- | l10n/de_DE.js | 6 | ||||
-rw-r--r-- | l10n/de_DE.json | 6 | ||||
-rw-r--r-- | l10n/es.js | 11 | ||||
-rw-r--r-- | l10n/es.json | 11 | ||||
-rw-r--r-- | l10n/et_EE.js | 1 | ||||
-rw-r--r-- | l10n/et_EE.json | 1 | ||||
-rw-r--r-- | l10n/is.js | 1 | ||||
-rw-r--r-- | l10n/is.json | 1 | ||||
-rw-r--r-- | l10n/it.js | 6 | ||||
-rw-r--r-- | l10n/it.json | 6 | ||||
-rw-r--r-- | l10n/ja.js | 11 | ||||
-rw-r--r-- | l10n/ja.json | 11 | ||||
-rw-r--r-- | l10n/nb.js | 1 | ||||
-rw-r--r-- | l10n/nb.json | 1 | ||||
-rw-r--r-- | l10n/pt_BR.js | 6 | ||||
-rw-r--r-- | l10n/pt_BR.json | 6 | ||||
-rw-r--r-- | l10n/ru.js | 5 | ||||
-rw-r--r-- | l10n/ru.json | 5 | ||||
-rw-r--r-- | l10n/tr.js | 6 | ||||
-rw-r--r-- | l10n/tr.json | 6 | ||||
-rw-r--r-- | l10n/zh_CN.js | 1 | ||||
-rw-r--r-- | l10n/zh_CN.json | 1 | ||||
-rw-r--r-- | lib/Settings/AdminSection.php | 4 | ||||
-rw-r--r-- | templates/settings-admin.php | 8 | ||||
-rw-r--r-- | tests/bootstrap.php | 2 |
29 files changed, 275 insertions, 106 deletions
diff --git a/css/style.css b/css/style.css index 1c3e835..b2aaefc 100644 --- a/css/style.css +++ b/css/style.css @@ -1,4 +1,20 @@ .barchart { max-width: 700px; max-height: 350px; +} + +.clipboardButton { + display: inline-block; + position: relative; + top: 2px; + margin-left: 5px; +} + +#ocsEndPoint { + margin-bottom: 10px; +} + +#monitoring-endpoint-url { + width: 80%; + max-width: 415px; }
\ No newline at end of file diff --git a/js/script.js b/js/script.js index 87e1acf..5367cfe 100644 --- a/js/script.js +++ b/js/script.js @@ -39,6 +39,11 @@ setHumanReadableSizeToElement("phpMemLimit"); setHumanReadableSizeToElement("phpUploadMaxSize"); + initMonitoringLinkToClipboard(); + $("#monitoring-endpoint-url").on('click', function() { + $(this).select(); + }); + function updateInfo() { var url = OC.generateUrl('/apps/serverinfo/update'); @@ -62,14 +67,14 @@ if (typeof cpuLoadChart === 'undefined') { cpuLoadChart = new SmoothieChart( { - millisPerPixel:250, - minValue:0, - grid:{fillStyle:'rgba(0,0,0,0.03)',strokeStyle:'transparent'}, - labels:{fillStyle:'rgba(0,0,0,0.4)', fontSize:12} + millisPerPixel: 250, + minValue: 0, + grid: { fillStyle: 'rgba(0,0,0,0.03)', strokeStyle: 'transparent' }, + labels: { fillStyle: 'rgba(0,0,0,0.4)', fontSize: 12 } }); cpuLoadChart.streamTo(document.getElementById("cpuloadcanvas"), 1000/*delay*/); cpuLoadLine = new TimeSeries(); - cpuLoadChart.addTimeSeries(cpuLoadLine, {lineWidth:1, strokeStyle:'rgb(0, 0, 255)', fillStyle:'rgba(0, 0, 255, 0.2)'}); + cpuLoadChart.addTimeSeries(cpuLoadLine, { lineWidth: 1, strokeStyle: 'rgb(0, 0, 255)', fillStyle: 'rgba(0, 0, 255, 0.2)' }); } $('#cpuFooterInfo').text(t('serverinfo', 'Load average')+": "+cpu1+" ("+t('serverinfo', 'Last minute')+")"); @@ -102,11 +107,11 @@ if (typeof memoryUsageChart === 'undefined') { memoryUsageChart = new SmoothieChart( { - millisPerPixel:250, - maxValue:maxValueOfChart, - minValue:0, - grid:{fillStyle:'rgba(0,0,0,0.03)',strokeStyle:'transparent'}, - labels:{fillStyle:'rgba(0,0,0,0.4)', fontSize:12} + millisPerPixel: 250, + maxValue: maxValueOfChart, + minValue: 0, + grid: { fillStyle: 'rgba(0,0,0,0.03)', strokeStyle: 'transparent' }, + labels: { fillStyle: 'rgba(0,0,0,0.4)', fontSize: 12 } }); memoryUsageChart.streamTo(document.getElementById("memorycanvas"), 1000/*delay*/); memoryUsageLine = new TimeSeries(); @@ -127,50 +132,54 @@ shares_data = [shares.num_shares_user, shares.num_shares_groups, shares.num_shares_link, shares.num_fed_shares_sent, shares.num_fed_shares_received], stepSize = 0; - if (Math.max.apply(null, shares_data) < 10) {stepSize = 1;} + if (Math.max.apply(null, shares_data) < 10) { + stepSize = 1; + } if (typeof sharesChart === 'undefined') { var ctx = document.getElementById("sharecanvas"); sharesChart = new Chart(ctx, { - type: 'bar', - data: { - labels: [t('serverinfo', 'Users'), - t('serverinfo', 'Groups'), - t('serverinfo', 'Links'), - t('serverinfo', 'Federated sent'), - t('serverinfo', 'Federated received')], - datasets: [{ - label: " ", - data: shares_data, - backgroundColor: [ - 'rgba(0, 0, 255, 0.2)', - 'rgba(0, 255, 0, 0.2)', - 'rgba(255, 0, 0, 0.2)', - 'rgba(0, 255, 255, 0.2)', - 'rgba(255, 0, 255, 0.2)' - ], - borderColor: [ - 'rgba(0, 0, 255, 1)', - 'rgba(0, 255, 0, 1)', - 'rgba(255, 0, 0, 1)', - 'rgba(0, 255, 255, 1)', - 'rgba(255, 0, 255, 1)' - ], - borderWidth: 1 - }] - }, - options: { - legend: {display:false}, - scales: { - yAxes: [{ - ticks: { - min: 0, - stepSize: stepSize - } - }] - } - } + type: 'bar', + data: { + labels: [ + t('serverinfo', 'Users'), + t('serverinfo', 'Groups'), + t('serverinfo', 'Links'), + t('serverinfo', 'Federated sent'), + t('serverinfo', 'Federated received') + ], + datasets: [{ + label: " ", + data: shares_data, + backgroundColor: [ + 'rgba(0, 0, 255, 0.2)', + 'rgba(0, 255, 0, 0.2)', + 'rgba(255, 0, 0, 0.2)', + 'rgba(0, 255, 255, 0.2)', + 'rgba(255, 0, 255, 0.2)' + ], + borderColor: [ + 'rgba(0, 0, 255, 1)', + 'rgba(0, 255, 0, 1)', + 'rgba(255, 0, 0, 1)', + 'rgba(0, 255, 255, 1)', + 'rgba(255, 0, 255, 1)' + ], + borderWidth: 1 + }] + }, + options: { + legend: { display:false }, + scales: { + yAxes: [{ + ticks: { + min: 0, + stepSize: stepSize + } + }] + } + } }); } @@ -183,48 +192,52 @@ activeUsers_data = [activeUsers.last24hours, activeUsers.last1hour, activeUsers.last5minutes], stepSize = 0; - if (Math.max.apply(null, activeUsers_data) < 10) {stepSize = 1;} + if (Math.max.apply(null, activeUsers_data) < 10) { + stepSize = 1; + } if (typeof activeusersChart === 'undefined') { var ctx = document.getElementById("activeuserscanvas"); activeusersChart = new Chart(ctx, { - type: 'line', - data: { - labels: [t('serverinfo', 'Last 24 hours'), - t('serverinfo', 'Last 1 hour'), - t('serverinfo', 'Last 5 mins')], - datasets: [{ - label: " ", - data: activeUsers_data, - fill: false, - borderColor: ['rgba(0, 0, 255, 1)'], - borderWidth: 1, - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: 'rgba(0, 0, 255, 1)', - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "rgba(0,0,255,0.6)", - pointHoverBorderColor: "rgba(0, 0, 255, 1)", - pointHoverBorderWidth: 1, - pointRadius: 5, - pointHitRadius: 10, - lineTension:0 - }] - }, - options: { - legend: {display:false}, - scales: { - yAxes: [{ - ticks: { - min: 0, - stepSize: stepSize - } - }] - } - } + type: 'line', + data: { + labels: [ + t('serverinfo', 'Last 24 hours'), + t('serverinfo', 'Last 1 hour'), + t('serverinfo', 'Last 5 mins') + ], + datasets: [{ + label: " ", + data: activeUsers_data, + fill: false, + borderColor: [ 'rgba(0, 0, 255, 1)' ], + borderWidth: 1, + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: 'rgba(0, 0, 255, 1)', + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "rgba(0,0,255,0.6)", + pointHoverBorderColor: "rgba(0, 0, 255, 1)", + pointHoverBorderWidth: 1, + pointRadius: 5, + pointHitRadius: 10, + lineTension: 0 + }] + }, + options: { + legend: { display:false }, + scales: { + yAxes: [{ + ticks: { + min: 0, + stepSize: stepSize + } + }] + } + } }); } } @@ -255,4 +268,48 @@ mem_canvas.height = newHeight; } + function initMonitoringLinkToClipboard() { + var monAPIBox = $("#ocsEndPoint"); + /* reused from settings/js/authtoken_view.js */ + monAPIBox.find('.clipboardButton').tooltip({placement: 'bottom', title: t('core', 'Copy'), trigger: 'hover'}); + + // Clipboard! + var clipboard = new Clipboard('.clipboardButton'); + clipboard.on('success', function(e) { + var $input = $(e.trigger); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copied!')) + .tooltip('fixTitle') + .tooltip({placement: 'bottom', trigger: 'manual'}) + .tooltip('show'); + _.delay(function() { + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copy')) + .tooltip('fixTitle'); + }, 3000); + }); + clipboard.on('error', function (e) { + var $input = $(e.trigger); + var actionMsg = ''; + if (/iPhone|iPad/i.test(navigator.userAgent)) { + actionMsg = t('core', 'Not supported!'); + } else if (/Mac/i.test(navigator.userAgent)) { + actionMsg = t('core', 'Press ⌘-C to copy.'); + } else { + actionMsg = t('core', 'Press Ctrl-C to copy.'); + } + + $input.tooltip('hide') + .attr('data-original-title', actionMsg) + .tooltip('fixTitle') + .tooltip({placement: 'bottom', trigger: 'manual'}) + .tooltip('show'); + _.delay(function () { + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copy')) + .tooltip('fixTitle'); + }, 3000); + }); + } + })(jQuery, OC); @@ -14,6 +14,11 @@ OC.L10N.register( "Last 24 hours" : "Letzte 24 Stunden", "Last 1 hour" : "Letzte Stunde", "Last 5 mins" : "Letzte 5 Minuten", + "Copy" : "Kopieren", + "Copied!" : "Kopiert!", + "Not supported!" : "Nicht unterstützt!", + "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.", + "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.", "Monitoring" : "Information", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Zeigt nütztliche Informationen des Servers an wie z.B. CPU-Last, Arbeitsspeicherauslastung, Massenspeicherauslastung, Anzahl der Benutzer, usw.", "CPU load" : "CPU-Auslastung", @@ -32,6 +37,7 @@ OC.L10N.register( "Type:" : "Art:", "Size:" : "Größe:", "External monitoring tool" : "Externes Überwachungsprogramm", + "You can connect an external monitoring tool by using this end point:" : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:", "You can connect an external monitoring tool by using this end point: " : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de.json b/l10n/de.json index afb0e6b..33533d4 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -12,6 +12,11 @@ "Last 24 hours" : "Letzte 24 Stunden", "Last 1 hour" : "Letzte Stunde", "Last 5 mins" : "Letzte 5 Minuten", + "Copy" : "Kopieren", + "Copied!" : "Kopiert!", + "Not supported!" : "Nicht unterstützt!", + "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.", + "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.", "Monitoring" : "Information", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Zeigt nütztliche Informationen des Servers an wie z.B. CPU-Last, Arbeitsspeicherauslastung, Massenspeicherauslastung, Anzahl der Benutzer, usw.", "CPU load" : "CPU-Auslastung", @@ -30,6 +35,7 @@ "Type:" : "Art:", "Size:" : "Größe:", "External monitoring tool" : "Externes Überwachungsprogramm", + "You can connect an external monitoring tool by using this end point:" : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:", "You can connect an external monitoring tool by using this end point: " : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/l10n/de_DE.js b/l10n/de_DE.js index fc4f1d8..9a91da2 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -14,6 +14,11 @@ OC.L10N.register( "Last 24 hours" : "Letzte 24 Stunden", "Last 1 hour" : "Letzte Stunde", "Last 5 mins" : "Letzte 5 Minuten", + "Copy" : "Kopieren", + "Copied!" : "Kopiert!", + "Not supported!" : "Nicht unterstützt!", + "Press ⌘-C to copy." : "Zum Kopieren ⌘-C drücken.", + "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.", "Monitoring" : "Information", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Zeigt nütztliche Informationen des Servers an wie z.B. CPU-Last, Arbeitsspeicherauslastung, Massenspeicherauslastung, Anzahl der Benutzer, usw.", "CPU load" : "CPU-Auslastung", @@ -32,6 +37,7 @@ OC.L10N.register( "Type:" : "Art:", "Size:" : "Größe:", "External monitoring tool" : "Externes Überwachungsprogramm", + "You can connect an external monitoring tool by using this end point:" : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:", "You can connect an external monitoring tool by using this end point: " : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de_DE.json b/l10n/de_DE.json index afb0e6b..e948fd9 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -12,6 +12,11 @@ "Last 24 hours" : "Letzte 24 Stunden", "Last 1 hour" : "Letzte Stunde", "Last 5 mins" : "Letzte 5 Minuten", + "Copy" : "Kopieren", + "Copied!" : "Kopiert!", + "Not supported!" : "Nicht unterstützt!", + "Press ⌘-C to copy." : "Zum Kopieren ⌘-C drücken.", + "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.", "Monitoring" : "Information", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Zeigt nütztliche Informationen des Servers an wie z.B. CPU-Last, Arbeitsspeicherauslastung, Massenspeicherauslastung, Anzahl der Benutzer, usw.", "CPU load" : "CPU-Auslastung", @@ -30,6 +35,7 @@ "Type:" : "Art:", "Size:" : "Größe:", "External monitoring tool" : "Externes Überwachungsprogramm", + "You can connect an external monitoring tool by using this end point:" : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:", "You can connect an external monitoring tool by using this end point: " : "Durch Verwendung des folgenden Zugangspunktes, kann ein externes Überwachungsprogramm verwendet werden:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file @@ -14,9 +14,13 @@ OC.L10N.register( "Last 24 hours" : "Últimas 24 horas", "Last 1 hour" : "Última hora", "Last 5 mins" : "Últimos 5 minutos", + "Copy" : "Copiar", + "Copied!" : "Copiado.", + "Not supported!" : "No está soportado.", + "Press Ctrl-C to copy." : "Pulsa Ctrl-C para copiar.", "Monitoring" : "Monitorización", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Provee información útil como la carga de la CPU, el uso de RAM y disco, el número de usuarios, etc.", - "CPU load" : "Carga del CPU", + "CPU load" : "Carga de la CPU", "Memory usage" : "Uso de memoria", "Active users" : "Usuarios activos", "Shares" : "Recursos compartidos", @@ -27,11 +31,12 @@ OC.L10N.register( "Version:" : "Versión:", "Memory Limit:" : "Límite de memoria:", "Max Execution Time:" : "Máximo tiempo de ejecución:", - "Upload max size:" : "Máximo tamaño de subida:", + "Upload max size:" : "Tamaño máximo de subida:", "Database" : "Base de datos", "Type:" : "Tipo:", "Size:" : "Tamaño:", "External monitoring tool" : "Herramienta externa de monitorización", - "You can connect an external monitoring tool by using this end point: " : "Puede conectar una herramienta externa de monitorización usando este punto de comunicación:" + "You can connect an external monitoring tool by using this end point:" : "Puedes conectar una herramienta de monitorización externa usando este endpoint:", + "You can connect an external monitoring tool by using this end point: " : "Puede conectar una herramienta externa de monitorización usando este punto de comunicación: " }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/es.json b/l10n/es.json index e078132..1d938e3 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -12,9 +12,13 @@ "Last 24 hours" : "Últimas 24 horas", "Last 1 hour" : "Última hora", "Last 5 mins" : "Últimos 5 minutos", + "Copy" : "Copiar", + "Copied!" : "Copiado.", + "Not supported!" : "No está soportado.", + "Press Ctrl-C to copy." : "Pulsa Ctrl-C para copiar.", "Monitoring" : "Monitorización", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Provee información útil como la carga de la CPU, el uso de RAM y disco, el número de usuarios, etc.", - "CPU load" : "Carga del CPU", + "CPU load" : "Carga de la CPU", "Memory usage" : "Uso de memoria", "Active users" : "Usuarios activos", "Shares" : "Recursos compartidos", @@ -25,11 +29,12 @@ "Version:" : "Versión:", "Memory Limit:" : "Límite de memoria:", "Max Execution Time:" : "Máximo tiempo de ejecución:", - "Upload max size:" : "Máximo tamaño de subida:", + "Upload max size:" : "Tamaño máximo de subida:", "Database" : "Base de datos", "Type:" : "Tipo:", "Size:" : "Tamaño:", "External monitoring tool" : "Herramienta externa de monitorización", - "You can connect an external monitoring tool by using this end point: " : "Puede conectar una herramienta externa de monitorización usando este punto de comunicación:" + "You can connect an external monitoring tool by using this end point:" : "Puedes conectar una herramienta de monitorización externa usando este endpoint:", + "You can connect an external monitoring tool by using this end point: " : "Puede conectar una herramienta externa de monitorización usando este punto de comunicación: " },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/l10n/et_EE.js b/l10n/et_EE.js index 114ee06..be01238 100644 --- a/l10n/et_EE.js +++ b/l10n/et_EE.js @@ -15,6 +15,7 @@ OC.L10N.register( "Last 1 hour" : "Viimane 1 tund", "Last 5 mins" : "Viimased 5 minutit", "Monitoring" : "Monitooring", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Näitab kasulikku infot serveri kohta, näiteks protsessori koormus, mälukasutus, kettaruum, kasutajate arv jne.", "CPU load" : "CPU koormus", "Memory usage" : "Mälukasutus", "Active users" : "Aktiivseid kasutajaid", diff --git a/l10n/et_EE.json b/l10n/et_EE.json index d3b79f7..0ce1ba3 100644 --- a/l10n/et_EE.json +++ b/l10n/et_EE.json @@ -13,6 +13,7 @@ "Last 1 hour" : "Viimane 1 tund", "Last 5 mins" : "Viimased 5 minutit", "Monitoring" : "Monitooring", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Näitab kasulikku infot serveri kohta, näiteks protsessori koormus, mälukasutus, kettaruum, kasutajate arv jne.", "CPU load" : "CPU koormus", "Memory usage" : "Mälukasutus", "Active users" : "Aktiivseid kasutajaid", @@ -15,6 +15,7 @@ OC.L10N.register( "Last 1 hour" : "Síðustu klst", "Last 5 mins" : "Síðustu 5 mín", "Monitoring" : "Vöktun", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Gefur nytsamlegar upplýsingar um vefþjón, svo sem álag á örgjörva, diskanotkun, fjölda notenda, o.s.frv.", "CPU load" : "Örgjörvaálag", "Memory usage" : "Minnisnotkun", "Active users" : "Virkir notendur", diff --git a/l10n/is.json b/l10n/is.json index 4be9c2f..47705ed 100644 --- a/l10n/is.json +++ b/l10n/is.json @@ -13,6 +13,7 @@ "Last 1 hour" : "Síðustu klst", "Last 5 mins" : "Síðustu 5 mín", "Monitoring" : "Vöktun", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Gefur nytsamlegar upplýsingar um vefþjón, svo sem álag á örgjörva, diskanotkun, fjölda notenda, o.s.frv.", "CPU load" : "Örgjörvaálag", "Memory usage" : "Minnisnotkun", "Active users" : "Virkir notendur", @@ -14,6 +14,11 @@ OC.L10N.register( "Last 24 hours" : "Ultime 24 ore", "Last 1 hour" : "Ultima ora", "Last 5 mins" : "Ultimi 5 minuti", + "Copy" : "Copia", + "Copied!" : "Copiati!", + "Not supported!" : "Non supportato!", + "Press ⌘-C to copy." : "Premi ⌘-C per copiare.", + "Press Ctrl-C to copy." : "Premi Ctrl-C per copiare.", "Monitoring" : "Monitoraggio", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Fornisce informazioni utili sul server, come carico della CPU, utilizzo della memoria, utilizzo del disco, numero di utenti, ecc.", "CPU load" : "Carico CPU", @@ -32,6 +37,7 @@ OC.L10N.register( "Type:" : "Tipo:", "Size:" : "Dimensione:", "External monitoring tool" : "Strumento di controllo esterno", + "You can connect an external monitoring tool by using this end point:" : "Puoi collegare uno strumento di controllo esterno utilizzando questo terminatore: ", "You can connect an external monitoring tool by using this end point: " : "Puoi collegare uno strumento di controllo esterno utilizzando questo terminatore: " }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/it.json b/l10n/it.json index 9c00bb5..031c615 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -12,6 +12,11 @@ "Last 24 hours" : "Ultime 24 ore", "Last 1 hour" : "Ultima ora", "Last 5 mins" : "Ultimi 5 minuti", + "Copy" : "Copia", + "Copied!" : "Copiati!", + "Not supported!" : "Non supportato!", + "Press ⌘-C to copy." : "Premi ⌘-C per copiare.", + "Press Ctrl-C to copy." : "Premi Ctrl-C per copiare.", "Monitoring" : "Monitoraggio", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Fornisce informazioni utili sul server, come carico della CPU, utilizzo della memoria, utilizzo del disco, numero di utenti, ecc.", "CPU load" : "Carico CPU", @@ -30,6 +35,7 @@ "Type:" : "Tipo:", "Size:" : "Dimensione:", "External monitoring tool" : "Strumento di controllo esterno", + "You can connect an external monitoring tool by using this end point:" : "Puoi collegare uno strumento di controllo esterno utilizzando questo terminatore: ", "You can connect an external monitoring tool by using this end point: " : "Puoi collegare uno strumento di controllo esterno utilizzando questo terminatore: " },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file @@ -15,18 +15,19 @@ OC.L10N.register( "Last 1 hour" : "1時間以内", "Last 5 mins" : "5分以内", "Monitoring" : "モニタリング", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "CPU負荷、メモリ使用量、ディスク使用量、ユーザー数などの役に立つサーバー情報を提供します。", "CPU load" : "CPU負荷", "Memory usage" : "メモリ使用量", "Active users" : "アクティブユーザー数", "Shares" : "共有数", "Storage" : "ストレージ", "Users:" : "ユーザー数:", - "Files:" : "ファイル数", + "Files:" : "ファイル数:", "PHP" : "PHP", - "Version:" : "バージョン", - "Memory Limit:" : "メモリ制限", - "Max Execution Time:" : "最大実行時間", - "Upload max size:" : "最大アップロードサイズ", + "Version:" : "バージョン:", + "Memory Limit:" : "メモリ制限:", + "Max Execution Time:" : "最大実行時間:", + "Upload max size:" : "最大アップロードサイズ:", "Database" : "データベース", "Type:" : "タイプ:", "Size:" : "サイズ:", diff --git a/l10n/ja.json b/l10n/ja.json index ae1cb9b..ff3ba48 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -13,18 +13,19 @@ "Last 1 hour" : "1時間以内", "Last 5 mins" : "5分以内", "Monitoring" : "モニタリング", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "CPU負荷、メモリ使用量、ディスク使用量、ユーザー数などの役に立つサーバー情報を提供します。", "CPU load" : "CPU負荷", "Memory usage" : "メモリ使用量", "Active users" : "アクティブユーザー数", "Shares" : "共有数", "Storage" : "ストレージ", "Users:" : "ユーザー数:", - "Files:" : "ファイル数", + "Files:" : "ファイル数:", "PHP" : "PHP", - "Version:" : "バージョン", - "Memory Limit:" : "メモリ制限", - "Max Execution Time:" : "最大実行時間", - "Upload max size:" : "最大アップロードサイズ", + "Version:" : "バージョン:", + "Memory Limit:" : "メモリ制限:", + "Max Execution Time:" : "最大実行時間:", + "Upload max size:" : "最大アップロードサイズ:", "Database" : "データベース", "Type:" : "タイプ:", "Size:" : "サイズ:", @@ -15,6 +15,7 @@ OC.L10N.register( "Last 1 hour" : "Siste time", "Last 5 mins" : "Siste 5 minutter", "Monitoring" : "Overvåker", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Gir nyttig serverinformasjon, som CPU-belastning, RAM-bruk, diskbruk, antall brukere, ned mere.", "CPU load" : "CPU last", "Memory usage" : "Minnebruk", "Active users" : "Aktive brukere", diff --git a/l10n/nb.json b/l10n/nb.json index 2e6c63f..ec21db5 100644 --- a/l10n/nb.json +++ b/l10n/nb.json @@ -13,6 +13,7 @@ "Last 1 hour" : "Siste time", "Last 5 mins" : "Siste 5 minutter", "Monitoring" : "Overvåker", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Gir nyttig serverinformasjon, som CPU-belastning, RAM-bruk, diskbruk, antall brukere, ned mere.", "CPU load" : "CPU last", "Memory usage" : "Minnebruk", "Active users" : "Aktive brukere", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 020da20..bea8ea0 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -14,6 +14,11 @@ OC.L10N.register( "Last 24 hours" : "Últimas 24 horas", "Last 1 hour" : "Última 1 hora", "Last 5 mins" : "Últimos 5 minutos", + "Copy" : "Copiar", + "Copied!" : "Copiado!", + "Not supported!" : "Não suportado!", + "Press ⌘-C to copy." : "Pressione ⌘-C para copiar.", + "Press Ctrl-C to copy." : "Pressione Ctrl-C para copiar.", "Monitoring" : "Monitoramento", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Fornece informações úteis do servidor, como carga de CPU, uso de RAM, uso do disco, número de usuários, etc.", "CPU load" : "Carga da CPU", @@ -32,6 +37,7 @@ OC.L10N.register( "Type:" : "Tipo:", "Size:" : "Tamanho:", "External monitoring tool" : "Ferramenta de monitoramento externo", + "You can connect an external monitoring tool by using this end point:" : "Você pode conectar uma ferramenta de monitoramento externa usando este ponto final:", "You can connect an external monitoring tool by using this end point: " : "Você pode conectar uma ferramenta de monitoramento externa usando este ponto: " }, "nplurals=2; plural=(n > 1);"); diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index a9b21f4..cd0ee62 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -12,6 +12,11 @@ "Last 24 hours" : "Últimas 24 horas", "Last 1 hour" : "Última 1 hora", "Last 5 mins" : "Últimos 5 minutos", + "Copy" : "Copiar", + "Copied!" : "Copiado!", + "Not supported!" : "Não suportado!", + "Press ⌘-C to copy." : "Pressione ⌘-C para copiar.", + "Press Ctrl-C to copy." : "Pressione Ctrl-C para copiar.", "Monitoring" : "Monitoramento", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Fornece informações úteis do servidor, como carga de CPU, uso de RAM, uso do disco, número de usuários, etc.", "CPU load" : "Carga da CPU", @@ -30,6 +35,7 @@ "Type:" : "Tipo:", "Size:" : "Tamanho:", "External monitoring tool" : "Ferramenta de monitoramento externo", + "You can connect an external monitoring tool by using this end point:" : "Você pode conectar uma ferramenta de monitoramento externa usando este ponto final:", "You can connect an external monitoring tool by using this end point: " : "Você pode conectar uma ferramenta de monitoramento externa usando este ponto: " },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file @@ -14,6 +14,10 @@ OC.L10N.register( "Last 24 hours" : "За 24 часа", "Last 1 hour" : "За 1 час", "Last 5 mins" : "За 5 минут", + "Copy" : "Копировать", + "Copied!" : "Скопировано!", + "Not supported!" : "Не поддерживается!", + "Press Ctrl-C to copy." : "Нажмите Ctrl-C для копирования.", "Monitoring" : "Мониторинг", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Предоставляет полезную информацию о сервере, такую как загрузка процессора, использование ОЗУ, диска, количество пользователей и т.д.", "CPU load" : "Загрузка процессора", @@ -32,6 +36,7 @@ OC.L10N.register( "Type:" : "Тип:", "Size:" : "Размер:", "External monitoring tool" : "Внешний мониторинг", + "You can connect an external monitoring tool by using this end point:" : "Вы можете подключить внешний мониторинг используя этот адрес:", "You can connect an external monitoring tool by using this end point: " : "Вы можете подключить внешний мониторинг используя этот адрес:" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/l10n/ru.json b/l10n/ru.json index 297fc29..eba1314 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -12,6 +12,10 @@ "Last 24 hours" : "За 24 часа", "Last 1 hour" : "За 1 час", "Last 5 mins" : "За 5 минут", + "Copy" : "Копировать", + "Copied!" : "Скопировано!", + "Not supported!" : "Не поддерживается!", + "Press Ctrl-C to copy." : "Нажмите Ctrl-C для копирования.", "Monitoring" : "Мониторинг", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "Предоставляет полезную информацию о сервере, такую как загрузка процессора, использование ОЗУ, диска, количество пользователей и т.д.", "CPU load" : "Загрузка процессора", @@ -30,6 +34,7 @@ "Type:" : "Тип:", "Size:" : "Размер:", "External monitoring tool" : "Внешний мониторинг", + "You can connect an external monitoring tool by using this end point:" : "Вы можете подключить внешний мониторинг используя этот адрес:", "You can connect an external monitoring tool by using this end point: " : "Вы можете подключить внешний мониторинг используя этот адрес:" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file @@ -14,6 +14,11 @@ OC.L10N.register( "Last 24 hours" : "Son 24 saat", "Last 1 hour" : "Son 1 saat", "Last 5 mins" : "Son 5 dakika", + "Copy" : "Kopyala", + "Copied!" : "Kopyalandı!", + "Not supported!" : "Desteklenmiyor!", + "Press ⌘-C to copy." : "Kopyalamak için ⌘-C tuşlarına basın.", + "Press Ctrl-C to copy." : "Kopyalamak için Ctrl-C tuşlarına basın.", "Monitoring" : "İzleniyor", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "İşlemci yükü, bellek ve disk kullanımı, kullanıcı sayısı gibi sunucu hakkında çeşitli bilgiler sağlar. ", "CPU load" : "İşlemci yükü", @@ -32,6 +37,7 @@ OC.L10N.register( "Type:" : "Tür:", "Size:" : "Boyut:", "External monitoring tool" : "Dış izleme aracı", + "You can connect an external monitoring tool by using this end point:" : "Bu uç noktasını kullanarak bir dış izleme aracı bağlayabilirsiniz:", "You can connect an external monitoring tool by using this end point: " : "Bu uç noktasını kullanarak bir dış izleme aracı bağlayabilirsiniz:" }, "nplurals=2; plural=(n > 1);"); diff --git a/l10n/tr.json b/l10n/tr.json index 3fffd59..707c7a6 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -12,6 +12,11 @@ "Last 24 hours" : "Son 24 saat", "Last 1 hour" : "Son 1 saat", "Last 5 mins" : "Son 5 dakika", + "Copy" : "Kopyala", + "Copied!" : "Kopyalandı!", + "Not supported!" : "Desteklenmiyor!", + "Press ⌘-C to copy." : "Kopyalamak için ⌘-C tuşlarına basın.", + "Press Ctrl-C to copy." : "Kopyalamak için Ctrl-C tuşlarına basın.", "Monitoring" : "İzleniyor", "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "İşlemci yükü, bellek ve disk kullanımı, kullanıcı sayısı gibi sunucu hakkında çeşitli bilgiler sağlar. ", "CPU load" : "İşlemci yükü", @@ -30,6 +35,7 @@ "Type:" : "Tür:", "Size:" : "Boyut:", "External monitoring tool" : "Dış izleme aracı", + "You can connect an external monitoring tool by using this end point:" : "Bu uç noktasını kullanarak bir dış izleme aracı bağlayabilirsiniz:", "You can connect an external monitoring tool by using this end point: " : "Bu uç noktasını kullanarak bir dış izleme aracı bağlayabilirsiniz:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index d7c54ec..c41ba48 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -15,6 +15,7 @@ OC.L10N.register( "Last 1 hour" : "最近 1 小时", "Last 5 mins" : "最近 5 分钟", "Monitoring" : "监控器", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "提供有用的服务器信息,例如 CPU 负载、内存占用、硬盘占用、在线用户数等。", "CPU load" : "CPU 负载", "Memory usage" : "内存使用", "Active users" : "活跃用户", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index 8887a0d..d6352fb 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -13,6 +13,7 @@ "Last 1 hour" : "最近 1 小时", "Last 5 mins" : "最近 5 分钟", "Monitoring" : "监控器", + "Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc." : "提供有用的服务器信息,例如 CPU 负载、内存占用、硬盘占用、在线用户数等。", "CPU load" : "CPU 负载", "Memory usage" : "内存使用", "Active users" : "活跃用户", diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php index 5f61267..eb74dfa 100644 --- a/lib/Settings/AdminSection.php +++ b/lib/Settings/AdminSection.php @@ -63,10 +63,10 @@ class AdminSection implements IIconSection { * the settings navigation. The sections are arranged in ascending order of * the priority values. It is required to return a value between 0 and 99. * - * keep the server setting at the top, right after "server settings" + * keep the server setting at the top, right after "overview" and "basic settings" */ public function getPriority() { - return 0; + return 1; } /** diff --git a/templates/settings-admin.php b/templates/settings-admin.php index abef20b..efca313 100644 --- a/templates/settings-admin.php +++ b/templates/settings-admin.php @@ -25,6 +25,7 @@ script('serverinfo', 'smoothie'); script('serverinfo', 'Chart.min'); style('serverinfo', 'style'); + ?> <div class="section" id="cpuSection"> @@ -70,5 +71,10 @@ style('serverinfo', 'style'); <div class="section" id="ocsEndPoint"> <h2><?php p($l->t('External monitoring tool'));?></h2> <p> - <?php p($l->t('You can connect an external monitoring tool by using this end point: ') . $_['ocs']);?> + <?php p($l->t('You can connect an external monitoring tool by using this end point:')); ?> + </p> + <div> + <input type="text" readonly="readonly" id="monitoring-endpoint-url" value="<?php echo p($_['ocs']); ?>" /> + <a class="clipboardButton icon icon-clippy" data-clipboard-target="#monitoring-endpoint-url"></a> + </div> </div> diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 7a1d136..c8d7a7b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -6,7 +6,7 @@ if (!defined('PHPUNIT_RUN')) { require_once __DIR__ . '/../../../lib/base.php'; -if(!class_exists('PHPUnit_Framework_TestCase')) { +if(!class_exists('\PHPUnit\Framework\TestCase')) { require_once('PHPUnit/Autoload.php'); } \OC_App::loadApp('serverinfo'); |