* core: Fixed a bug in the dispatcher

* core: Move cbi.js to general resource directory
* core: Removed Freifunk references
* core: Updated Fledermaus theme

diff --git a/core/root/etc/config/luci b/core/root/etc/config/luci
index ded657823328254e5fc315a2d5c7c9d51e3f9cb8..87170a9b18c03ab47fcea460de8af82666156ebd 100644 (file)
--- a/core/root/etc/config/luci
+++ b/core/root/etc/config/luci
@@ -1,35 +1,39 @@
 config core main
-    option lang de
-    option mediaurlbase /luci/media
-       option resourcebase /luci/images
-       option title            "Freifunk Kamikaze"
-       option subtitle         Fledermausedition
+       option lang de
+       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"
-               option dropbear "/etc/dropbear"
-               option openvpn  "/etc/openvpn"
-               option passwd   "/etc/passwd"
-               option ipkg             "/etc/ipkg.conf"
-               option httpd    "/etc/httpd.conf"
-               option firewall "/etc/firewall.user"
+       option uci              "/etc/config"
+       option dropbear "/etc/dropbear"
+       option openvpn  "/etc/openvpn"
+       option passwd   "/etc/passwd"
+       option ipkg             "/etc/ipkg.conf"
+       option httpd    "/etc/httpd.conf"
+       option firewall "/etc/firewall.user"
 
 config event uci_oncommit
-        option network "/etc/init.d/network restart"
-        option wireless        "/etc/init.d/network restart"
-        option olsr            "/sbin/reboot"
-        option dhcp            "/etc/init.d/dnsmasq restart"
-        option luci_fw  "/etc/init.d/luci_fw restart"
-        option dropbear "/etc/init.d/dropbear restart"
-        option httpd   "/etc/init.d/httpd restart"
-        option fstab   "/etc/init.d/fstab restart"
-        option qos             "/etc/init.d/qos restart"
-        option luci_splash "/etc/init.d/luci_splash restart"
-        option freifunk "/etc/init.d/luci_freifunk restart"
+       option network  "/etc/init.d/network restart"
+       option wireless "/etc/init.d/network restart"
+       option olsr             "/sbin/reboot"
+       option dhcp             "/etc/init.d/dnsmasq restart"
+       option luci_fw  "/etc/init.d/luci_fw restart"
+       option dropbear "/etc/init.d/dropbear restart"
+       option httpd    "/etc/init.d/httpd restart"
+       option fstab    "/etc/init.d/fstab restart"
+       option qos              "/etc/init.d/qos restart"
+       option luci_splash "/etc/init.d/luci_splash restart"
+       option freifunk "/etc/init.d/luci_freifunk restart"
         
 config internal languages
-               option de "Deutsch"
-               option en "English"
+       option de "Deutsch"
+       option en "English"
                
 config internal themes
-               option Fledermaus "/luci/media"
+       option Fledermaus "/luci/fledermaus"

diff --git a/themes/fledermaus/root/www/luci/media/cbi.js b/core/root/www/resources/cbi.js
similarity index 100%
rename from themes/fledermaus/root/www/luci/media/cbi.js
rename to core/root/www/resources/cbi.js

diff --git a/core/src/dispatcher.lua b/core/src/dispatcher.lua
index daf975e9defa6d6506987bb3ef280e243c3af6b6..3e8b4d6b6c5fde95490d742a25d5aa73ca101e20 100644 (file)
--- 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 d174c8e741ccea12384864f011032d7f5d90c19e..0399d0e5f0a972fb362e6a75136673dec179ba25 100644 (file)
--- 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 a66d28fee58cc372f432fab191666c5063b614c9..4229aaf0dffdacc445d4fa5140de940dd7806e7e 100644 (file)
--- 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 126eb3696b7d02ddcacd2fd8fe062bb9db762b83..1a09ad30492f06adc7ffec7004da896adb6137ad 100644 (file)
--- 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>
 

diff --git a/themes/fledermaus/root/www/luci/media/cascade.css b/themes/fledermaus/root/www/luci/fledermaus/cascade.css
similarity index 100%
rename from themes/fledermaus/root/www/luci/media/cascade.css
rename to themes/fledermaus/root/www/luci/fledermaus/cascade.css

diff --git a/themes/fledermaus/root/www/luci/media/logo.png b/themes/fledermaus/root/www/luci/fledermaus/logo.png
similarity index 100%
rename from themes/fledermaus/root/www/luci/media/logo.png
rename to themes/fledermaus/root/www/luci/fledermaus/logo.png