From 7fd6296d1dbd8fcbeb93d4c05b958102187f53cc Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Sun, 22 Jan 2017 20:58:13 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Schm=C3=A4lerer=20Men=C3=BCbalken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/styles.css | 8 ++++---- html/responsive-menu.html | 2 +- html/start.html | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/css/styles.css b/css/styles.css index ec34e68..e8e9a95 100644 --- a/css/styles.css +++ b/css/styles.css @@ -34,7 +34,7 @@ h1 { } .brand { float: left; - height: 80px; + height: 20px; } .brand p { margin: 0; @@ -44,10 +44,10 @@ h1 { } .logo { font-size: 1.4em; - line-height: 40px; + line-height: 20px; margin: 20px 0 0; width: 50px; - height: 40px; + height: 20px; /* background-color: #3C97D5; */ text-align: center; font-weight: bold; @@ -60,7 +60,7 @@ h1 { } .rm-toggle.rm-button { - margin-top: 25px; + margin-top: 10px; } .rm-css-animate.rm-menu-expanded { diff --git a/html/responsive-menu.html b/html/responsive-menu.html index 7846d5b..3a1015c 100644 --- a/html/responsive-menu.html +++ b/html/responsive-menu.html @@ -155,7 +155,7 @@
-

+

diff --git a/html/start.html b/html/start.html index 7d1e1e5..026c827 100644 --- a/html/start.html +++ b/html/start.html @@ -47,9 +47,13 @@ for($i = 0; $i < count($othergw); ++$i) { echo "$othergw[$i]
"; } +$clients = file_get_contents('http://5.189.166.50/test.html'); +echo $clients; ?> + +
From 23fbd72fcf45eb946c6512ae6c9bd77d49ee1c3e Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Mon, 23 Jan 2017 00:27:29 +0000 Subject: [PATCH 2/2] =?UTF-8?q?mrtg=20hinzugef=C3=BCgt,=20babel-links=20im?= =?UTF-8?q?=20Men=C3=BC,=20andere=20Farben=20GW=20selection=20f=C3=BCr=20b?= =?UTF-8?q?eide=20Hoods,=20schm=C3=A4lerer=20Men=C3=BCbalken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 8 ++--- css/responsive-menu.css | 2 +- css/styles.css | 4 +-- html/responsive-menu.html | 63 ++++++++------------------------------- html/start.html | 47 +++++++++++++++-------------- 5 files changed, 44 insertions(+), 80 deletions(-) diff --git a/css/main.css b/css/main.css index e045e3e..b3f7635 100644 --- a/css/main.css +++ b/css/main.css @@ -5,7 +5,7 @@ html { } body { - background-color:#FBFBEF; + background-color:#FFFFFF; text-align:left; font-family:Arial, Helvetica, sans-serif; # font-family:Verdana, sans-serif; @@ -30,7 +30,7 @@ body { #bodybox { float:left; - background-color:#FBFBEF; +# background-color:#FBFBEF; width:100%; @@ -38,7 +38,7 @@ body { } #content { - background-color:#FBFBEF; +# background-color:#FBFBEF; margin-right:2.5em; margin-left:2.5em; margin-top:1em; @@ -110,7 +110,7 @@ div.mrtg img { } #content { - background-color:#FBFBEF; +# background-color:#FBFBEF; float:left; width:95%; margin-right:0.5em; diff --git a/css/responsive-menu.css b/css/responsive-menu.css index 1181562..3ff1c51 100644 --- a/css/responsive-menu.css +++ b/css/responsive-menu.css @@ -19,7 +19,7 @@ to work with the chosen theme. /* Set menu background color here */ .rm-nav ul, .rm-menu { - background-color: rgb(0, 0, 0); + background-color: rgb(128, 51, 0); margin-top: 0; } diff --git a/css/styles.css b/css/styles.css index e8e9a95..2166a30 100644 --- a/css/styles.css +++ b/css/styles.css @@ -7,7 +7,7 @@ height: 100%; } header { - background-color: #000; + background-color: rgb(128, 51, 0); } header:after { content: " "; @@ -29,7 +29,7 @@ h1 { .main .dev-output pre { overflow: auto; max-height: 500px; - background-color: #EBF4FD; + background-color: #FFFFFF; padding: 0 1em 1em; } .brand { diff --git a/html/responsive-menu.html b/html/responsive-menu.html index 3a1015c..8dc62e1 100644 --- a/html/responsive-menu.html +++ b/html/responsive-menu.html @@ -167,54 +167,21 @@
  • Die Gateways
    • -
  • Main Item 2 + +
  • Babel / olsr
  • Main Item 3
    • -
  • Main Item 4
    • -
  • Main Item 5 -
    • diff --git a/html/start.html b/html/start.html index 026c827..c16a03a 100644 --- a/html/start.html +++ b/html/start.html @@ -29,57 +29,60 @@ echo "DHCP:Leases in use: $leases
    -Aktuelle default Route table fff:
    +
    "; - $l2tp = shell_exec('ip l | grep -c l2tp'); -echo "Anzahl der l2tp Tunnel: $l2tp

    "; -$gwsel = shell_exec('sudo batctl gw'); -echo "Gateway-selection:
    "; -echo "$gwsel

    "; +echo "Anzahl der l2tp Tunnel
    has-sued: $l2tp

    "; -echo "Die anderen GW in der Hood
    "; -$other = shell_exec('sudo batctl gwl | grep MBit | tr -s " " | cut -f 2,3,8 -d" "'); -$othergw = explode(PHP_EOL, $other); -for($i = 0; $i < count($othergw); ++$i) { - echo "$othergw[$i]
    "; +$gwselsued = file_get_contents('http://10.50.60.22/bat0.dat'); +$gwselhas = file_get_contents('http://10.50.60.22/bat2.dat'); + +echo "Gatewayselection Hood has:
    "; +$gwsel_has = explode(PHP_EOL, $gwselhas); +for($i = 0; $i < count($gwsel_has); ++$i) { + echo "$gwsel_has[$i]
    "; +} + +echo "Gatewayselection Hood has-sued
    "; +$gwsel_sued = explode(PHP_EOL, $gwselsued); +for($i = 0; $i < count($gwsel_sued); ++$i) { + echo "$gwsel_sued[$i]
    "; } $clients = file_get_contents('http://5.189.166.50/test.html'); echo $clients; - - ?> -
    +
    + +Speedtest der has und has-sued GWs (Kabel, wr-841, l2tp) + + +
    +

    Durchsatz eth0

    GW has GW has1 - + GW has2 -GW has3 - +
    GW has3 - kein mrtg
    GW roffl - + GW rola1
    -Speedtest der has und has-sued GWs (Kabel, wr-841, l2tp) -