summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorManuel Munz <freifunk@somakoma.de>2010-11-23 01:02:21 +0000
committerManuel Munz <freifunk@somakoma.de>2010-11-23 01:02:21 +0000
commit450bdd5a401388ed709a178ef4561d87c21c323b (patch)
tree88f71d3be04bd4ecf6e7708ad948f7a43ed39efb
parent1aa676d501f806109d626665cd82390c175fd029 (diff)
Add possibility to show execution time in the footer
-rw-r--r--libs/sgi-cgi/luasrc/sgi/cgi.lua1
-rw-r--r--themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css31
-rw-r--r--themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm7
3 files changed, 30 insertions, 9 deletions
diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua
index 3fec6969b..04ae9aa59 100644
--- 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 19ac29bf9..c00c65a27 100644
--- 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 98d48ad85..f8f8c2011 100644
--- 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>