diff options
| -rw-r--r--[-rwxr-xr-x] | AUTHORS.md | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | COPYING | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | README.md | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | appinfo/app.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | appinfo/info.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | appinfo/routes.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | css/style.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | img/hdd-o.svg | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | img/server.svg | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | img/sort.svg | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/script.js | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | lib/Os.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | templates/settings-admin.php | 0 |
13 files changed, 4 insertions, 4 deletions
diff --git a/AUTHORS.md b/AUTHORS.md index 1f3a5e8..1f3a5e8 100755..100644 --- a/AUTHORS.md +++ b/AUTHORS.md diff --git a/README.md b/README.md index 01e9e3f..01e9e3f 100644..100755 --- a/README.md +++ b/README.md diff --git a/appinfo/app.php b/appinfo/app.php index 2abbec0..2abbec0 100644..100755 --- a/appinfo/app.php +++ b/appinfo/app.php diff --git a/appinfo/info.xml b/appinfo/info.xml index 65c52e3..65c52e3 100755..100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml diff --git a/appinfo/routes.php b/appinfo/routes.php index 7725e92..7725e92 100755..100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php diff --git a/css/style.css b/css/style.css index 9fbad5d..9fbad5d 100755..100644 --- a/css/style.css +++ b/css/style.css diff --git a/img/hdd-o.svg b/img/hdd-o.svg index 472a231..472a231 100755..100644 --- a/img/hdd-o.svg +++ b/img/hdd-o.svg diff --git a/img/server.svg b/img/server.svg index 37ac886..37ac886 100755..100644 --- a/img/server.svg +++ b/img/server.svg diff --git a/img/sort.svg b/img/sort.svg index af6e731..af6e731 100755..100644 --- a/img/sort.svg +++ b/img/sort.svg diff --git a/js/script.js b/js/script.js index cdf42ba..56a66f0 100755..100644 --- a/js/script.js +++ b/js/script.js @@ -30,7 +30,7 @@ $(document).ready(function () { var x = document.getElementById('rambox'); - x.style.backgroundColor = OCA.Theming.color; + x.style.backgroundColor = OCA.Theming ? OCA.Theming.color : 'rgb(54, 129, 195)'; var x = document.getElementById('swapbox'); x.style.backgroundColor = 'rgba(100, 100, 100, 0.8)'; @@ -91,7 +91,7 @@ }); cpuLoadChart.streamTo(document.getElementById("cpuloadcanvas"), 1000/*delay*/); cpuLoadLine = new TimeSeries(); - cpuLoadChart.addTimeSeries(cpuLoadLine, { lineWidth: 1, strokeStyle: 'rgb(180, 180, 180)', fillStyle: OCA.Theming.color }); + cpuLoadChart.addTimeSeries(cpuLoadLine, { lineWidth: 1, strokeStyle: 'rgb(180, 180, 180)', fillStyle: OCA.Theming ? OCA.Theming.color : 'rgb(54, 129, 195)' }); } $('#cpuFooterInfo').text(t('serverinfo', 'Load average')+": "+cpu1+" ("+t('serverinfo', 'Last minute')+")"); @@ -135,7 +135,7 @@ }); memoryUsageChart.streamTo(document.getElementById("memorycanvas"), 1000/*delay*/); memoryUsageLine = new TimeSeries(); - memoryUsageChart.addTimeSeries(memoryUsageLine, {lineWidth:1, strokeStyle:'rgb(180, 180, 180)', fillStyle:OCA.Theming.color}); + memoryUsageChart.addTimeSeries(memoryUsageLine, {lineWidth:1, strokeStyle:'rgb(180, 180, 180)', fillStyle:OCA.Theming ? OCA.Theming.color : 'rgb(54, 129, 195)'}); swapUsageLine = new TimeSeries(); memoryUsageChart.addTimeSeries(swapUsageLine, {lineWidth:1, strokeStyle:'rgb(100, 100, 100)', fillStyle:'rgba(100, 100, 100, 0.2)'}); } @@ -360,7 +360,7 @@ $(document).ready(function(){ datasets : [ { backgroundColor: [ - OCA.Theming.color, + OCA.Theming ? OCA.Theming.color : 'rgb(54, 129, 195)', 'rgb(249, 249, 249)', ], borderWidth: 0, diff --git a/lib/Os.php b/lib/Os.php index cf07560..cf07560 100755..100644 --- a/lib/Os.php +++ b/lib/Os.php diff --git a/templates/settings-admin.php b/templates/settings-admin.php index 0f46fd2..0f46fd2 100755..100644 --- a/templates/settings-admin.php +++ b/templates/settings-admin.php |
