projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1aa676d
)
Add possibility to show execution time in the footer
author
Manuel Munz
<freifunk@somakoma.de>
Tue, 23 Nov 2010 01:02:21 +0000
(
01:02
+0000)
committer
Manuel Munz
<freifunk@somakoma.de>
Tue, 23 Nov 2010 01:02:21 +0000
(
01:02
+0000)
libs/sgi-cgi/luasrc/sgi/cgi.lua
patch
|
blob
|
history
themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
patch
|
blob
|
history
themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
patch
|
blob
|
history
diff --git
a/libs/sgi-cgi/luasrc/sgi/cgi.lua
b/libs/sgi-cgi/luasrc/sgi/cgi.lua
index
3fec696
..
04ae9aa
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.
]]--
limitations under the License.
]]--
+exectime = os.clock()
module("luci.sgi.cgi", package.seeall)
local ltn12 = require("luci.ltn12")
require("nixio.util")
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
19ac29b
..
c00c65a
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;
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;
}
font-family: Verdana, Arial, sans-serif;
font-size: 100%;
line-height: 100%;
padding-bottom: 1.5em;
}
+html, body {
+height: 99%;
+}
+
* {
margin: 0;
padding: 0;
* {
margin: 0;
padding: 0;
@@
-359,7
+363,7
@@
textarea#syslog {
padding: 0.5em;
color: #000000;
font-size: 80%;
padding: 0.5em;
color: #000000;
font-size: 80%;
- background: #fff url(bg.jpg) repeat-x center bottom;
+ background: #fff
fff
url(bg.jpg) repeat-x center bottom;
border: 1px dashed #CCCCCC;
}
border: 1px dashed #CCCCCC;
}
@@
-810,16
+814,25
@@
td.cbi-value-error {
text-align: right;
}
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:link,
-.luci a:visited
{
- background-color: transparent;
+.luci a:visited
,
+.exectime {
color: #666666;
text-decoration: none;
font-size: 70%;
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
98d48ad
..
f8f8c20
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 $
-%>
$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="clear"></div>
+<div class="push"></div>
</div>
</div>
+<div class="footer">
<p class="luci"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " (v" .. luci.__version__ .. ")" %></a></p>
<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>
</body>
</html>