From 809029169e3c80e2b555d9f3ded58d26176d2b96 Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 17:59:17 +0200 Subject: [PATCH 1/9] css introduced to monitorix file --- monitorix | 64 ++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/monitorix b/monitorix index 85c79e3..8322430 100755 --- a/monitorix +++ b/monitorix @@ -24,7 +24,7 @@ require 5.006; use strict; use warnings; use FindBin qw($Bin); -use lib $Bin . "/lib", "/usr/lib/monitorix"; +use lib $Bin . "/lib", "/usr/local/share/monitorix"; use Monitorix; use POSIX qw(WNOHANG LC_TIME setlocale uname pause setsid); @@ -223,51 +223,48 @@ EOF if(!open(OUT, "> $config{base_dir}/index.html")) { die "unable to create '${config{base_dir}}index.html': $!"; } + my $css = sprintf("%scss/monitorix-%s.css", $base_url, $config{theme_color}); print(OUT < $config{title} + - + $piwik_code $when_all_code


- - +
- -
+
+

v@{[VERSION]}

- +
- - - + + + EOF - print(OUT "
- - Hostname  - - - - Graph  - -
+  Hostname  + +  Graph  +
\n"); + print(OUT " \n"); print(OUT " \n"); + print(OUT " \n"); print(OUT "

- +
EOF if(lc($config{enable_hourly_view} || "") eq "y" ) { print(OUT < + EOF } print(OUT < + - - - @@ -472,10 +469,10 @@ EOF print(OUT " \n"); } print(OUT < + EOF @@ -490,7 +487,6 @@ EOF - From a84b77e57c98ad9fec5692a876229ba886329fe8 Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 18:07:55 +0200 Subject: [PATCH 2/9] css files added --- black.css | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ monitorix | 4 +-- white.css | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 black.css create mode 100644 white.css diff --git a/black.css b/black.css new file mode 100644 index 0000000..bfe5d9d --- /dev/null +++ b/black.css @@ -0,0 +1,101 @@ +body { + background-color: black; + font-family: Verdana, sans-serif; + color: white; +} + +.index-body { + background-color: black; + font-family: Verdana, sans-serif; + color: #888888; +} + +/* select, input { */ +/* border-radius: 0; */ +/* border: none; */ +/* padding: 10px; */ +/* } */ + +/* input[type=button], input[type=submit], input[type=reset] { */ +/* background-color: white; */ +/* border: none; */ +/* color: black; */ +/* padding: 10px 16px; */ +/* text-decoration: none; */ +/* margin: 4px 2px; */ +/* cursor: pointer; */ +/* } */ + +table { + background: #888888; + border: 1px black; + border-left: 1px outset #888888; + border-top: 1px outset #888888; + border-right: 1px outset black; + border-bottom: 1px outset black; + border-spacing: 5px; +} + +cgi-header-table { + border: 1px groove black; + border-spacing: 5px; +} + + +.startpage-header-table { + border: 0; + background: transparent; +} + +.table-module { + background: #cccccc; +} + +/* th { */ +/* background-color: #888888; */ +/* } */ + +th, td { + border: 1px inset #888888; + background-color: #333333; + padding: 0; +} + +.td-title { + background-color: #333333; + font-family: Verdana, sans-serif; + color: #888800; +} + +.td-title-host { + font-family: Verdana, sans-serif; + background-color: black; +} + +.td-note { + background-color: #333333; + font-family: Verdana, sans-serif; + color: #888800; +} + +.text-title { + font-family: Verdana, sans-serif; + color: #888800; +} + +.text-copyright { + font-size: 60%; + color: white; +} + +.text-size { + font-size: 5; +} + +.history01 { + color: #888888; + position: fixed; + left: 1em; + font-size: 32px; + letter-spacing: -1px; +} diff --git a/monitorix b/monitorix index 8322430..5844c1b 100755 --- a/monitorix +++ b/monitorix @@ -24,7 +24,7 @@ require 5.006; use strict; use warnings; use FindBin qw($Bin); -use lib $Bin . "/lib", "/usr/local/share/monitorix"; +use lib $Bin . "/lib", "/usr/lib/monitorix"; use Monitorix; use POSIX qw(WNOHANG LC_TIME setlocale uname pause setsid); @@ -223,7 +223,7 @@ EOF if(!open(OUT, "> $config{base_dir}/index.html")) { die "unable to create '${config{base_dir}}index.html': $!"; } - my $css = sprintf("%scss/monitorix-%s.css", $base_url, $config{theme_color}); + my $css = sprintf("%scss/%s.css", $base_url, $config{theme_color}); print(OUT < diff --git a/white.css b/white.css new file mode 100644 index 0000000..7d9f109 --- /dev/null +++ b/white.css @@ -0,0 +1,101 @@ +body { + background-color: white; + font-family: Verdana, sans-serif; +// color: white; +} + +/* .index-body { */ +/* background-color: black; */ +/* font-family: Verdana, sans-serif; */ +/* color: #888888; */ +/* } */ + +/* select, input { */ +/* border-radius: 0; */ +/* border: none; */ +/* padding: 10px; */ +/* } */ + +/* input[type=button], input[type=submit], input[type=reset] { */ +/* background-color: white; */ +/* border: none; */ +/* color: black; */ +/* padding: 10px 16px; */ +/* text-decoration: none; */ +/* margin: 4px 2px; */ +/* cursor: pointer; */ +/* } */ + +table { + background: #888888; + border: 1px black; + border-left: 1px outset #888888; + border-top: 1px outset #888888; + border-right: 1px outset black; + border-bottom: 1px outset black; + border-spacing: 5px; +} + +cgi-header-table { + border: 1px groove black; + border-spacing: 5px; +} + + +.startpage-header-table { + border: 0; + background: transparent; +} + +.table-module { + background: #cccccc; +} + +/* th { */ +/* background-color: #888888; */ +/* } */ + +th, td { + border: 1px inset #888888; + background-color: #777777; + padding: 0; +} + +.td-title { + background-color: #777777; + font-family: Verdana, sans-serif; + color: #cccc00; +} + +.td-title-host { + font-family: Verdana, sans-serif; + background-color: white; +} + +.td-note { + background-color: #777777; + font-family: Verdana, sans-serif; + color: #cccc00; +} + +.text-title { + font-family: Verdana, sans-serif; + color: #cccc00; +} + +.text-copyright { + font-size: 60%; +// color: white; +} + +.text-size { + font-size: 5; +} + +.history01 { + color: #888888; + position: fixed; + left: 1em; + font-size: 32px; + letter-spacing: -1px; +} From 85900e93eaf84c828550803b81fb35c29cf42c9c Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 19:03:47 +0200 Subject: [PATCH 3/9] white css fix --- white.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/white.css b/white.css index 7d9f109..55d0298 100644 --- a/white.css +++ b/white.css @@ -27,12 +27,12 @@ body { /* } */ table { - background: #888888; + background: #cccccc; border: 1px black; - border-left: 1px outset #888888; - border-top: 1px outset #888888; - border-right: 1px outset black; - border-bottom: 1px outset black; + border-left: 1px outset #b2b2b2; + border-top: 1px outset #b2b2b2; + border-right: 1px outset #4c4c4c; + border-bottom: 1px outset #4c4c4c; border-spacing: 5px; } From f445426633028e46d77cf0406d0de109df654472 Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 19:56:47 +0200 Subject: [PATCH 4/9] white css fix --- white.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/white.css b/white.css index 55d0298..b02890e 100644 --- a/white.css +++ b/white.css @@ -1,7 +1,7 @@ body { background-color: white; font-family: Verdana, sans-serif; -// color: white; + color: #888888; } /* .index-body { */ From 14ddc558c7ff162fc3e3d62bb0fb0e124db5f212 Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 20:13:41 +0200 Subject: [PATCH 5/9] white css fix --- white.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/white.css b/white.css index b02890e..a05236d 100644 --- a/white.css +++ b/white.css @@ -28,11 +28,11 @@ body { table { background: #cccccc; - border: 1px black; - border-left: 1px outset #b2b2b2; - border-top: 1px outset #b2b2b2; - border-right: 1px outset #4c4c4c; - border-bottom: 1px outset #4c4c4c; +// border: 1px black; + border-left: 1px outset #4c4c4c; + border-top: 1px outset #4c4c4c; + border-right: 1px outset #b2b2b2; + border-bottom: 1px outset #b2b2b2; border-spacing: 5px; } From d40f2bbca1acefd0ae747bf33c9b4301ed494279 Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 20:18:47 +0200 Subject: [PATCH 6/9] white css fix --- white.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/white.css b/white.css index a05236d..4808ab0 100644 --- a/white.css +++ b/white.css @@ -29,10 +29,10 @@ body { table { background: #cccccc; // border: 1px black; - border-left: 1px outset #4c4c4c; - border-top: 1px outset #4c4c4c; - border-right: 1px outset #b2b2b2; - border-bottom: 1px outset #b2b2b2; + border-left: 1px outset #b2b2b2; + border-top: 1px outset #b2b2b2; + border-right: 1px outset #4c4c4c; + border-bottom: 1px outset #4c4c4c; border-spacing: 5px; } From e85d55a577d92bb06c871c6f7618e814cf02dfc6 Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 20:32:37 +0200 Subject: [PATCH 7/9] white css fix --- white.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/white.css b/white.css index 4808ab0..fd0dd2c 100644 --- a/white.css +++ b/white.css @@ -31,8 +31,8 @@ table { // border: 1px black; border-left: 1px outset #b2b2b2; border-top: 1px outset #b2b2b2; - border-right: 1px outset #4c4c4c; - border-bottom: 1px outset #4c4c4c; + border-right: 1px outset #767676; + border-bottom: 1px outset #767676; border-spacing: 5px; } From 3e14c7e09458638a27e7d0c6a57aec94915d642c Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 20:38:10 +0200 Subject: [PATCH 8/9] white css fix --- white.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/white.css b/white.css index fd0dd2c..a914cd7 100644 --- a/white.css +++ b/white.css @@ -29,10 +29,10 @@ body { table { background: #cccccc; // border: 1px black; - border-left: 1px outset #b2b2b2; - border-top: 1px outset #b2b2b2; - border-right: 1px outset #767676; - border-bottom: 1px outset #767676; + border-left: 1px outset #888888; + border-top: 1px outset #888888; + border-right: 1px outset #5a5a5a; + border-bottom: 1px outset #5a5a5a; border-spacing: 5px; } From 167177b55f533e812395d902061d7147deece01c Mon Sep 17 00:00:00 2001 From: z-eos Date: Thu, 5 Nov 2020 20:44:42 +0200 Subject: [PATCH 9/9] css cleaned up --- black.css | 34 +++++++--------------------------- white.css | 42 +++++++----------------------------------- 2 files changed, 14 insertions(+), 62 deletions(-) diff --git a/black.css b/black.css index bfe5d9d..e4cca15 100644 --- a/black.css +++ b/black.css @@ -10,22 +10,6 @@ body { color: #888888; } -/* select, input { */ -/* border-radius: 0; */ -/* border: none; */ -/* padding: 10px; */ -/* } */ - -/* input[type=button], input[type=submit], input[type=reset] { */ -/* background-color: white; */ -/* border: none; */ -/* color: black; */ -/* padding: 10px 16px; */ -/* text-decoration: none; */ -/* margin: 4px 2px; */ -/* cursor: pointer; */ -/* } */ - table { background: #888888; border: 1px black; @@ -36,7 +20,13 @@ table { border-spacing: 5px; } -cgi-header-table { +th, td { + border: 1px inset #888888; + background-color: #333333; + padding: 0; +} + +.cgi-header-table { border: 1px groove black; border-spacing: 5px; } @@ -51,16 +41,6 @@ cgi-header-table { background: #cccccc; } -/* th { */ -/* background-color: #888888; */ -/* } */ - -th, td { - border: 1px inset #888888; - background-color: #333333; - padding: 0; -} - .td-title { background-color: #333333; font-family: Verdana, sans-serif; diff --git a/white.css b/white.css index a914cd7..7425965 100644 --- a/white.css +++ b/white.css @@ -4,31 +4,8 @@ body { color: #888888; } -/* .index-body { */ -/* background-color: black; */ -/* font-family: Verdana, sans-serif; */ -/* color: #888888; */ -/* } */ - -/* select, input { */ -/* border-radius: 0; */ -/* border: none; */ -/* padding: 10px; */ -/* } */ - -/* input[type=button], input[type=submit], input[type=reset] { */ -/* background-color: white; */ -/* border: none; */ -/* color: black; */ -/* padding: 10px 16px; */ -/* text-decoration: none; */ -/* margin: 4px 2px; */ -/* cursor: pointer; */ -/* } */ - table { background: #cccccc; -// border: 1px black; border-left: 1px outset #888888; border-top: 1px outset #888888; border-right: 1px outset #5a5a5a; @@ -36,7 +13,13 @@ table { border-spacing: 5px; } -cgi-header-table { +th, td { + border: 1px inset #888888; + background-color: #777777; + padding: 0; +} + +.cgi-header-table { border: 1px groove black; border-spacing: 5px; } @@ -51,16 +34,6 @@ cgi-header-table { background: #cccccc; } -/* th { */ -/* background-color: #888888; */ -/* } */ - -th, td { - border: 1px inset #888888; - background-color: #777777; - padding: 0; -} - .td-title { background-color: #777777; font-family: Verdana, sans-serif; @@ -85,7 +58,6 @@ th, td { .text-copyright { font-size: 60%; -// color: white; } .text-size {
+ + +