Add possibility to show execution time in the footer

diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua
index 3fec6969b8b1c8a50b15a047eee64a5aba829e19..04ae9aa5926b44d12d27d4ebef4d4171e0c99ead 100644 (file)
--- a/libs/sgi-cgi/luasrc/sgi/cgi.lua
+++ b/libs/sgi-cgi/luasrc/sgi/cgi.lua
@@ -23,6 +23,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 ]]--
+exectime = os.clock()
 module("luci.sgi.cgi", package.seeall)
 local ltn12 = require("luci.ltn12")
 require("nixio.util")

diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
index 19ac29bf9cf3a305c025878debc4aec3f3831781..c00c65a274c93339e2d6e06e4a087a6aefacfd69 100644 (file)
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
+++ b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
@@ -9,13 +9,17 @@ html {
 
 body {
        color: #cccccc;
-       background:#fff url(bg.jpg) repeat-x bottom center;
+       background:#e5eef5 url(bg.jpg) repeat-x top left;
        font-family: Verdana, Arial, sans-serif;
        font-size: 100%;
        line-height: 100%;
        padding-bottom: 1.5em;
 }
 
+html, body {
+height: 99%;
+}
+
 * {
        margin: 0;
        padding: 0;
@@ -359,7 +363,7 @@ textarea#syslog {
        padding: 0.5em;
        color: #000000;
        font-size: 80%;
-       background: #fff url(bg.jpg) repeat-x center bottom;
+       background: #ffffff url(bg.jpg) repeat-x center bottom;
        border: 1px dashed #CCCCCC;
 }
 
@@ -810,16 +814,25 @@ td.cbi-value-error {
        text-align: right;
 }
 
-.luci {
-       position: fixed;
-       bottom: 0;
-       left: 0;
-       text-align: right;
+.footer, .push {
+height: 2em;
+}
+
+.footer {
+width: 99%;
+padding: 0.3em;
+}
+
+.wrapper {
+min-height: 100%;
+height: auto !important;
+height: 100%;
+margin: 0 auto -2em;
 }
 
 .luci a:link,
-.luci a:visited {
-       background-color: transparent;
+.luci a:visited,
+.exectime {
        color: #666666;
        text-decoration: none;
        font-size: 70%;

diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
index 98d48ad85e9f6ba4ef6ea9b1e8c729cec7064af4..f8f8c20110a56a27ad8d457d4ff1e26212b495ba 100644 (file)
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
+++ b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
@@ -12,10 +12,17 @@ You may obtain a copy of the License at
 $Id: footer.htm 4185 2009-01-30 14:00:35Z jow $
 
 -%>
+<% local xtime = (string.format("%.2fs", os.clock() - exectime)) %>
+</div>
 <div class="clear"></div>
+<div class="push"></div>
 </div>
 
+<div class="footer">
 <p class="luci"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " (v" .. luci.__version__ .. ")" %></a></p>
+<p class="exectime">Script execution time: <%=xtime%></p>
+</div>
+
 </body>
 </html>