mrtg hinzugefügt, babel-links im Menü, andere Farben

GW selection für beide Hoods, schmälerer Menübalken
This commit is contained in:
Robert Langhammer 2017-01-23 00:27:29 +00:00
parent 7fd6296d1d
commit 23fbd72fcf
5 changed files with 44 additions and 80 deletions

View File

@ -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;

View File

@ -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;
}

View File

@ -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 {

View File

@ -167,54 +167,21 @@
<li><a href="#">Die Gateways</a>
<ul>
<li><a href="http://78.47.36.148">fff-has</a></li>
<li><a href="http://78.47.161.124">fff-has1</a></li>
<li><a href="http://5.189.166.50">fff-has2</a></li>
<li><a href="http://78.47.36.148">fff-has</a></li>
<li><a href="http://78.47.36.148">fff-has</a></li>
<li><a href="http://78.47.36.148">fff-has</a></li>
<li><a href="http://163.172.161.233">fff-rola1</a></li>
<ul>
<li><a href="#">Sub Sub Item 1</a></li>
<li><a href="#">Sub Sub Item 2</a></li>
<li><a href="#">Sub Sub Item 3</a></li>
<li><a href="#">Sub Sub Item 4</a></li>
<li><a href="#">Sub Sub Item 5</a></li>
<li><a href="#">Sub Sub Item 6</a></li>
<li><a href="#">Sub Sub Item 7</a></li>
</ul></li>
<li><a href="#">Sub Item 4</a></li>
<li><a href="#">Sub Item 5</a></li>
<li><a href="#">Sub Item 6</a>
<ul>
<li><a href="#">Sub Sub Item 1</a></li>
<li><a href="#">Sub Sub Item 2</a></li>
<li><a href="#">Sub Sub Item 3</a></li>
<li><a href="#">Sub Sub Item 4</a></li>
<li><a href="#">Sub Sub Item 5</a></li>
<li><a href="#">Sub Sub Item 6</a></li>
<li><a href="#">Sub Sub Item 7</a></li>
</ul></li>
<li><a href="#">Sub Item 7</a></li>
<li><a href="#">Sub Item 8</a></li>
<li><a href="#">Sub Item 9</a></li>
<li><a href="http://213.136.93.106">fff-has3</a></li>
<li><a href="http://5.189.142.26">fff-roffl</a></li>
<li><a href="http://163.172.161.233/top">fff-rola1</a></li>
</ul></li>
<li><a href="#">Main Item 2</a>
<li><a href="#">Babel / olsr</a>
<ul>
<li><a href="#">Sub Item 1</a></li>
<li><a href="#">Sub Item 2</a></li>
<li><a href="#">Sub Item 3</a>
<ul>
<li><a href="#">Sub Sub Item 1</a></li>
<li><a href="#">Sub Sub Item 2</a></li>
<li><a href="#">Sub Sub Item 3</a></li>
<li><a href="#">Sub Sub Item 4</a></li>
<li><a href="#">Sub Sub Item 5</a></li>
<li><a href="#">Sub Sub Item 6</a></li>
<li><a href="#">Sub Sub Item 7</a></li>
</ul></li>
<li><a href="#">Sub Item 4</a></li>
<li><a href="#">Sub Item 5</a></li>
<li><a href="http://78.47.36.148:8080">fff-has</a></li>
<li><a href="http://78.47.161.124:8080">fff-has1</a></li>
<li><a href="http://5.189.166.50:8081">fff-has2</a></li>
<li><a href="http://213.136.93.106:8080">fff-has3</a></li>
<li><a href="http://5.189.142.26:8080">fff-roffl</a></li>
<li><a href="http://163.172.161.233:8082">fff-rola1</a></li>
</ul></li>
<li><a href="#">Main Item 3</a>
<ul>
@ -223,12 +190,6 @@
<li><a href="#">Sub Item 3</a></li>
<li><a href="#">Sub Item 4</a></li>
</ul></li>
<li><a href="#">Main Item 4</a></li>
<li><a href="#">Main Item 5</a>
<ul>
<li><a href="#">Sub Item 1</a></li>
<li><a href="#">Sub Item 2</a></li>
</ul></li>
</ul>
</nav>
</div><!-- .rm-container -->

View File

@ -29,57 +29,60 @@ echo "<tr><td>DHCP:</td><td>Leases in use: <b>$leases</b></td><td><img src=img/$
</table>
<hr />
<b>Aktuelle default Route table fff:</b><br>
<?php
$route = shell_exec('ip r s table fff | head -1');
echo "$route<br><br>";
$l2tp = shell_exec('ip l | grep -c l2tp');
echo "Anzahl der l2tp Tunnel: <b>$l2tp</b><br><br>";
$gwsel = shell_exec('sudo batctl gw');
echo "<b>Gateway-selection:</b><br>";
echo "$gwsel<br><br>";
echo "<b>Anzahl der l2tp Tunnel</b><br>has-sued: <b>$l2tp</b><br><br>";
echo "<b>Die anderen GW in der Hood</b><br>";
$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]<br>";
$gwselsued = file_get_contents('http://10.50.60.22/bat0.dat');
$gwselhas = file_get_contents('http://10.50.60.22/bat2.dat');
echo "<b>Gatewayselection Hood has:</b><br>";
$gwsel_has = explode(PHP_EOL, $gwselhas);
for($i = 0; $i < count($gwsel_has); ++$i) {
echo "$gwsel_has[$i]<br>";
}
echo "<b>Gatewayselection Hood has-sued</b><br>";
$gwsel_sued = explode(PHP_EOL, $gwselsued);
for($i = 0; $i < count($gwsel_sued); ++$i) {
echo "$gwsel_sued[$i]<br>";
}
$clients = file_get_contents('http://5.189.166.50/test.html');
echo $clients;
?>
<hr />
</div>
<div class=mrtg>
<b>Speedtest der has und has-sued GWs (Kabel, wr-841, l2tp)</b>
<img src="http://163.172.161.233/top/img/speed.png">
<hr />
<H1>Durchsatz eth0</H1>
<b>GW has</b>
<img src="http://78.47.36.148/localhost_eth0-day.png">
<b>GW has1</b>
<img src="img/ampelrot.jpg">
<img src="http://78.47.161.124/localhost_eth0-day.png">
<b>GW has2</b>
<img src="http://5.189.166.50/localhost_eth0-day.png">
<b>GW has3</b>
<img src="img/ampelrot.jpg">
<br><b>GW has3 - kein mrtg</b><br>
<b>GW roffl</b>
<img src="img/ampelrot.jpg">
<img src="http://5.189.142.26/localhost_eth0-day.png">
<b>GW rola1</b>
<img src="http://163.172.161.233/mrtg/localhost_eth0-day.png">
<hr />
<b>Speedtest der has und has-sued GWs (Kabel, wr-841, l2tp)</b>
<img src="http://163.172.161.233/top/img/speed.png">
</div>
</div></div>