diff options
| author | Steven Barth <steven@midlink.org> | 2008-05-25 17:41:51 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-05-25 17:41:51 +0000 |
| commit | 328c83ce3b74a09a3904352cfec2089b95770bd6 (patch) | |
| tree | b589344c8bfd2eaa94f53ea287008a827734ec09 /core/src | |
| parent | 365d80765d3f08c457b0a373c395c8e1940e44be (diff) | |
* core: Fixed a bug in the dispatcher
* core: Move cbi.js to general resource directory
* core: Removed Freifunk references
* core: Updated Fledermaus theme
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/dispatcher.lua | 4 | ||||
| -rw-r--r-- | core/src/sys.lua | 5 | ||||
| -rw-r--r-- | core/src/view/cbi/header.htm | 2 | ||||
| -rw-r--r-- | core/src/view/header.htm | 10 |
4 files changed, 12 insertions, 9 deletions
diff --git a/core/src/dispatcher.lua b/core/src/dispatcher.lua index daf975e9d..3e8b4d6b6 100644 --- a/core/src/dispatcher.lua +++ b/core/src/dispatcher.lua @@ -128,8 +128,8 @@ function createindex() local suff = ".lua" local controllers = luci.util.combine( - luci.fs.glob(root .. "*" .. suff), - luci.fs.glob(root .. "*/*" .. suff) + luci.fs.glob(root .. "*" .. suff) or {}, + luci.fs.glob(root .. "*/*" .. suff) or {} ) for i,c in ipairs(controllers) do diff --git a/core/src/sys.lua b/core/src/sys.lua index d174c8e74..0399d0e5f 100644 --- a/core/src/sys.lua +++ b/core/src/sys.lua @@ -28,12 +28,15 @@ module("luci.sys", package.seeall) require("posix") require("luci.bits") require("luci.util") +require("luci.fs") -- Returns whether a system is bigendian function bigendian() local fp = io.open("/bin/sh") fp:seek("set", 5) - return (fp:read(1):byte() ~= 1) + local be = (fp:read(1):byte() ~= 1) + fp:close() + return be end -- Runs "command" and returns its output diff --git a/core/src/view/cbi/header.htm b/core/src/view/cbi/header.htm index a66d28fee..4229aaf0d 100644 --- a/core/src/view/cbi/header.htm +++ b/core/src/view/cbi/header.htm @@ -1,7 +1,7 @@ <%+header%> <form method="post" action="<%=luci.http.env.REQUEST_URI%>"> <div> - <script type="text/javascript" src="<%=media%>/cbi.js"></script> + <script type="text/javascript" src="<%=resource%>/cbi.js"></script> <input type="hidden" name="cbi.submit" value="1" /> <input type="submit" value="<%:save Speichern%>" class="hidden" /> </div> diff --git a/core/src/view/header.htm b/core/src/view/header.htm index 126eb3696..1a09ad304 100644 --- a/core/src/view/header.htm +++ b/core/src/view/header.htm @@ -31,16 +31,16 @@ require("luci.http").prepare_content("text/html") </head> <body> <div id="header"> - <div class="headerlogo left"><img src="<%=media%>/logo.png" alt="Freifunk" /></div> + <div class="headerlogo left"><img src="<%=media%>/logo.png" alt="<%=luci.config.brand.title%>" /></div> <div class="whitetext smalltext right"> - OpenWRT Kamikaze<br /> - Freifunk Firmware 2.0-dev<br /> + <%=luci.config.brand.firmware%><br /> + <%=luci.config.brand.distribution%><br /> <%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br /> <%:hostname Hostname%>: <%=luci.sys.hostname()%> </div> <div> - <span class="headertitle"><%~luci.main.title%></span><br /> - <span class="whitetext bold"><%~luci.main.subtitle%></span> + <span class="headertitle"><%=luci.config.brand.title%></span><br /> + <span class="whitetext bold"><%=luci.config.brand.subtitle%></span> </div> </div> |