Merge remote-tracking branch 'origin/master' into prod

* origin/master:
  floating menu
This commit is contained in:
Vincent Riquer 2014-06-23 03:09:51 +02:00
commit 07135f0c14

9
index
View File

@ -84,6 +84,7 @@ then
if (( ! show_graphs )) if (( ! show_graphs ))
then then
cat <<-EOHTML cat <<-EOHTML
<div style="position:fixed; background:white">
<table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse"> <table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse">
<tr> <tr>
<td style="background:black; color:white">Overview</td> <td style="background:black; color:white">Overview</td>
@ -105,6 +106,8 @@ then
<td style="border:1px solid black"><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td> <td style="border:1px solid black"><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td>
</tr> </tr>
</table> </table>
</div>
<div style="position:absolute; top:3em">
EOHTML EOHTML
readarray -t lastupdatelines < <( readarray -t lastupdatelines < <(
rrdtool lastupdate $rrdfile rrdtool lastupdate $rrdfile
@ -390,6 +393,7 @@ then
EOHTML EOHTML
else else
cat <<-EOHTML cat <<-EOHTML
<div style="position:fixed; z-index:100; background:white">
<table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse"> <table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse">
<tr> <tr>
<td><a href="?start=$start&amp;end=$end">Overview</a></td> <td><a href="?start=$start&amp;end=$end">Overview</a></td>
@ -443,6 +447,8 @@ then
</td> </td>
</tr> </tr>
</table> </table>
</div>
<div style="position:absolute; top:4.5em">
EOHTML EOHTML
if (( show_all )) if (( show_all ))
@ -522,12 +528,13 @@ then
</td> </td>
<td style="text-align:right"> <td style="text-align:right">
<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html"> <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">
<img src="/AGPL.png" height="31" width="88" /> <img src="/AGPL.png" alt="AGPLv3" height="31" width="88" />
</a> </a>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div>
</body></html> </body></html>
EOHTML EOHTML
else else