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

* origin/master:
  add.html: move"menu" div to end of document
This commit is contained in:
Vincent Riquer 2014-06-30 02:51:56 +02:00
commit 966244cb08

View File

@ -39,36 +39,6 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
</head>
<body>
<div class="container" style="width:$(( graph_width + 97 ))px">
<div class="menu">
<table style="width:$(( graph_width + 97 ))px" class="menu">
<tr>
<td class="menu"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td>
<td class="menu">
<table class="menu-nobrd">
<tr>
<td colspan="2" class="menu-nobrd">
<a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
History &amp; Trend
</a>
</td>
</tr>
<tr>
<td class="menu">
<a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
Medals
</a>
</td>
<td class="menu">
<a href="/cgi/$webuser/?hist&amp;show=all&amp;start=$start&amp;end=$end">
All
</a>
</td>
</tr>
</table>
</td>
<td class="menu-inv">Add data</td>
</tr>
</table>
EOHTML
if ! [ -w "$rrdfile" ]
then
@ -118,10 +88,6 @@ fi
readlast
medals
get_current_level
show_current_level
cat <<-EOHTML
</div>
EOHTML
cat <<-EOHTML
<div class="main">
<form method="post" action="add">
@ -169,6 +135,40 @@ cat <<-EOHTML
</td>
</tr>
</table>
</div>
<div class="menu">
<table style="width:$(( graph_width + 97 ))px" class="menu">
<tr>
<td class="menu"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td>
<td class="menu">
<table class="menu-nobrd">
<tr>
<td colspan="2" class="menu-nobrd">
<a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
History &amp; Trend
</a>
</td>
</tr>
<tr>
<td class="menu">
<a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
Medals
</a>
</td>
<td class="menu">
<a href="/cgi/$webuser/?hist&amp;show=all&amp;start=$start&amp;end=$end">
All
</a>
</td>
</tr>
</table>
</td>
<td class="menu-inv">Add data</td>
</tr>
</table>
EOHTML
show_current_level
cat <<-EOHTML
</div>
</div>
</body>