* core: Fixed a bug in the dispatcher

* core: Move cbi.js to general resource directory * core: Removed Freifunk references * core: Updated Fledermaus theme
2008-05-25 17:41:51 +00:00 · 2008-05-25 17:41:51 +00:00 · 328c83ce3b
commit 328c83ce3b
parent 365d80765d
8 changed files with 42 additions and 35 deletions
--- a/core/root/etc/config/luci
+++ b/core/root/etc/config/luci
@ -1,9 +1,13 @@
 config core main
 	option lang de
-    option mediaurlbase /luci/media
-	option resourcebase /luci/images
-	option title		"Freifunk Kamikaze"
-	option subtitle		Fledermausedition
+	option mediaurlbase /luci/fledermaus
+	option resourcebase /luci/resources
+	
+config core brand
+	option title		"OpenWRT Kamikaze"
+	option subtitle		Freifunkedition
+	option firmware		"OpenWRT Kamikaze"
+	option distro		"Freifunk Firmware 2.x"
 		
 config extern flash_keep
 	option uci 		"/etc/config"
@ -32,4 +36,4 @@ config internal languages
 	option en "English"
 		
 config internal themes
-		option Fledermaus "/luci/media"
+	option Fledermaus "/luci/fledermaus"
--- a/themes/fledermaus/root/www/luci/media/cbi.js
+++ b/themes/fledermaus/root/www/luci/media/cbi.js
--- 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
--- 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
--- 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>
--- 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>

--- a/themes/fledermaus/root/www/luci/fledermaus/cascade.css
+++ b/themes/fledermaus/root/www/luci/fledermaus/cascade.css
--- a/themes/fledermaus/root/www/luci/fledermaus/logo.png
+++ b/themes/fledermaus/root/www/luci/fledermaus/logo.png