Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* core: Fixed a bug in the dispatcher

Browse source 
* core: Move cbi.js to general resource directory
* core: Removed Freifunk references
* core: Updated Fledermaus theme
This commit is contained in:
Steven Barth 2008-05-25 17:41:51 +00:00
parent 365d80765d
commit 328c83ce3b
8 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
core/root/etc/config/luci
View file

@ -1,35 +1,39 @@
config core main config core main
option lang de option lang de
option mediaurlbase /luci/media option mediaurlbase /luci/fledermaus
option resourcebase /luci/images option resourcebase /luci/resources
option title "Freifunk Kamikaze"
option subtitle Fledermausedition config core brand
option title "OpenWRT Kamikaze"
option subtitle Freifunkedition
option firmware "OpenWRT Kamikaze"
option distro "Freifunk Firmware 2.x"
config extern flash_keep config extern flash_keep
option uci "/etc/config" option uci "/etc/config"
option dropbear "/etc/dropbear" option dropbear "/etc/dropbear"
option openvpn "/etc/openvpn" option openvpn "/etc/openvpn"
option passwd "/etc/passwd" option passwd "/etc/passwd"
option ipkg "/etc/ipkg.conf" option ipkg "/etc/ipkg.conf"
option httpd "/etc/httpd.conf" option httpd "/etc/httpd.conf"
option firewall "/etc/firewall.user" option firewall "/etc/firewall.user"
config event uci_oncommit config event uci_oncommit
option network "/etc/init.d/network restart" option network "/etc/init.d/network restart"
option wireless "/etc/init.d/network restart" option wireless "/etc/init.d/network restart"
option olsr "/sbin/reboot" option olsr "/sbin/reboot"
option dhcp "/etc/init.d/dnsmasq restart" option dhcp "/etc/init.d/dnsmasq restart"
option luci_fw "/etc/init.d/luci_fw restart" option luci_fw "/etc/init.d/luci_fw restart"
option dropbear "/etc/init.d/dropbear restart" option dropbear "/etc/init.d/dropbear restart"
option httpd "/etc/init.d/httpd restart" option httpd "/etc/init.d/httpd restart"
option fstab "/etc/init.d/fstab restart" option fstab "/etc/init.d/fstab restart"
option qos "/etc/init.d/qos restart" option qos "/etc/init.d/qos restart"
option luci_splash "/etc/init.d/luci_splash restart" option luci_splash "/etc/init.d/luci_splash restart"
option freifunk "/etc/init.d/luci_freifunk restart" option freifunk "/etc/init.d/luci_freifunk restart"
config internal languages config internal languages
option de "Deutsch" option de "Deutsch"
option en "English" option en "English"
config internal themes config internal themes
option Fledermaus "/luci/media" option Fledermaus "/luci/fledermaus"

0
themes/fledermaus/root/www/luci/media/cbi.js → core/root/www/resources/cbi.js
View file

4
core/src/dispatcher.lua
View file

@ -128,8 +128,8 @@ function createindex()
local suff = ".lua" local suff = ".lua"
local controllers = luci.util.combine( local controllers = luci.util.combine(
luci.fs.glob(root .. "*" .. suff), luci.fs.glob(root .. "*" .. suff) or {},
luci.fs.glob(root .. "*/*" .. suff) luci.fs.glob(root .. "*/*" .. suff) or {}
) )
for i,c in ipairs(controllers) do for i,c in ipairs(controllers) do

5
core/src/sys.lua
View file

@ -28,12 +28,15 @@ module("luci.sys", package.seeall)
require("posix") require("posix")
require("luci.bits") require("luci.bits")
require("luci.util") require("luci.util")
require("luci.fs")
-- Returns whether a system is bigendian -- Returns whether a system is bigendian
function bigendian() function bigendian()
local fp = io.open("/bin/sh") local fp = io.open("/bin/sh")
fp:seek("set", 5) fp:seek("set", 5)
return (fp:read(1):byte() ~= 1) local be = (fp:read(1):byte() ~= 1)
fp:close()
return be
end end
-- Runs "command" and returns its output -- Runs "command" and returns its output

2
core/src/view/cbi/header.htm
View file

@ -1,7 +1,7 @@
<%+header%> <%+header%>
<form method="post" action="<%=luci.http.env.REQUEST_URI%>"> <form method="post" action="<%=luci.http.env.REQUEST_URI%>">
<div> <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="hidden" name="cbi.submit" value="1" />
<input type="submit" value="<%:save Speichern%>" class="hidden" /> <input type="submit" value="<%:save Speichern%>" class="hidden" />
</div> </div>

10
core/src/view/header.htm
View file

@ -31,16 +31,16 @@ require("luci.http").prepare_content("text/html")
</head> </head>
<body> <body>
<div id="header"> <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"> <div class="whitetext smalltext right">
OpenWRT Kamikaze<br /> <%=luci.config.brand.firmware%><br />
Freifunk Firmware 2.0-dev<br /> <%=luci.config.brand.distribution%><br />
<%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br /> <%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br />
<%:hostname Hostname%>: <%=luci.sys.hostname()%> <%:hostname Hostname%>: <%=luci.sys.hostname()%>
</div> </div>
<div> <div>
<span class="headertitle"><%~luci.main.title%></span><br /> <span class="headertitle"><%=luci.config.brand.title%></span><br />
<span class="whitetext bold"><%~luci.main.subtitle%></span> <span class="whitetext bold"><%=luci.config.brand.subtitle%></span>
</div> </div>
</div> </div>

0
themes/fledermaus/root/www/luci/media/cascade.css → themes/fledermaus/root/www/luci/fledermaus/cascade.css
View file

0
themes/fledermaus/root/www/luci/media/logo.png → themes/fledermaus/root/www/luci/fledermaus/logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB