projects
/
oweals
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
17b357a
)
* Minor bugfixes
author
Steven Barth
<steven@midlink.org>
Sun, 27 Apr 2008 22:57:29 +0000
(22:57 +0000)
committer
Steven Barth
<steven@midlink.org>
Sun, 27 Apr 2008 22:57:29 +0000
(22:57 +0000)
core/contrib/uci/luci
patch
|
blob
|
history
module/admin-core/src/controller/admin/uci.lua
patch
|
blob
|
history
module/admin-core/src/model/cbi/admin_network/dhcp.lua
patch
|
blob
|
history
module/public-core/src/view/public_index/contact.htm
patch
|
blob
|
history
diff --git
a/core/contrib/uci/luci
b/core/contrib/uci/luci
index 3e8dcc89aa864017860e30dab46c69a3fffff7f3..a2b61f483ae54f22e933afc7e8e12bceadb298f3 100644
(file)
--- a/
core/contrib/uci/luci
+++ b/
core/contrib/uci/luci
@@
-17,7
+17,7
@@
config extern flash_keep
config event uci_oncommit
option network "/etc/init.d/network restart"
option wireless "/etc/init.d/network restart"
config event uci_oncommit
option network "/etc/init.d/network restart"
option wireless "/etc/init.d/network restart"
- option olsr "reboot"
+ 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 dhcp "/etc/init.d/dnsmasq restart"
option luci_fw "/etc/init.d/luci_fw restart"
option dropbear "/etc/init.d/dropbear restart"
diff --git
a/module/admin-core/src/controller/admin/uci.lua
b/module/admin-core/src/controller/admin/uci.lua
index 1a3ae1279f30e5d43a2b09aa28eae635446b0cfd..251107dfe73c2a2db454d2840f6b6b540a83a26f 100644
(file)
--- a/
module/admin-core/src/controller/admin/uci.lua
+++ b/
module/admin-core/src/controller/admin/uci.lua
@@
-25,7
+25,7
@@
function action_apply()
if ffluci.config.uci_oncommit then
for i, cmd in ipairs(apply) do
if cmd then
if ffluci.config.uci_oncommit then
for i, cmd in ipairs(apply) do
if cmd then
- output = output .. cmd .. ":" .. ffluci.sys.exec(cmd)
+ output = output .. cmd .. ":" .. ffluci.sys.exec(cmd)
.. "\n"
end
end
end
end
end
end
diff --git
a/module/admin-core/src/model/cbi/admin_network/dhcp.lua
b/module/admin-core/src/model/cbi/admin_network/dhcp.lua
index 0c37b895520fee42d8d89703edc42aa37632093a..766d87da2f526a62b37363dd06cbc948bab61e54 100644
(file)
--- a/
module/admin-core/src/model/cbi/admin_network/dhcp.lua
+++ b/
module/admin-core/src/model/cbi/admin_network/dhcp.lua
@@
-18,7
+18,9
@@
end
s:option(Value, "start", "Start", "Erste vergebene Adresse (letztes Oktett)").rmempty = true
s:option(Value, "start", "Start", "Erste vergebene Adresse (letztes Oktett)").rmempty = true
-s:option(Value, "limit", "Limit", "Letzte vergebene Adresse (letztes Oktett)").rmempty = true
+s:option(Value, "limit", "Limit", "Anzahl zu vergebender Adressen -1").rmempty = true
+
+s:option(Value, "leasetime", "Laufzeit").rmempty = true
s:option(Flag, "dynamicdhcp", "Dynamisches DHCP").rmempty = true
s:option(Flag, "dynamicdhcp", "Dynamisches DHCP").rmempty = true
diff --git
a/module/public-core/src/view/public_index/contact.htm
b/module/public-core/src/view/public_index/contact.htm
index d19df7e4c09dde168e4d725024d7fcd5c2aaca16..df34812af946c1565d26927473d8a914db600afe 100644
(file)
--- a/
module/public-core/src/view/public_index/contact.htm
+++ b/
module/public-core/src/view/public_index/contact.htm
@@
-1,5
+1,5
@@
<%+header%>
<%+header%>
-<% local contact = ffluci.model.uci.show("freifunk"
, "contact"
).freifunk.contact %>
+<% local contact = ffluci.model.uci.show("freifunk").freifunk.contact %>
<h1><%:contact Kontakt%></h1>
<table cellspacing="0" cellpadding="6">
<tr><th><%:nickname Pseudonym%>:</th><td><%=contact.nickname%></td></tr>
<h1><%:contact Kontakt%></h1>
<table cellspacing="0" cellpadding="6">
<tr><th><%:nickname Pseudonym%>:</th><td><%=contact.nickname%></td></tr>