summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-07-16 15:19:05 +0000
committerSteven Barth <steven@midlink.org>2008-07-16 15:19:05 +0000
commit0a0712b9d953838c58b91bd0941770105f18ad64 (patch)
tree47fda2f89e1371327c321fc710c848427b04cef2 /modules
parent66a6492ae5aa9779af6d22eaddf0f5f253ed1189 (diff)
Added a note to the Freifunk menu for OpenWRT
modules/admin-mini: Several small fixes and improvements
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-mini/luasrc/controller/mini/network.lua5
-rw-r--r--modules/admin-mini/luasrc/controller/mini/system.lua2
-rw-r--r--modules/admin-mini/luasrc/view/mini/passwd.htm2
-rw-r--r--modules/admin-mini/luasrc/view/mini/reboot.htm2
4 files changed, 6 insertions, 5 deletions
diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/admin-mini/luasrc/controller/mini/network.lua
index 177afc978..3de052644 100644
--- a/modules/admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/admin-mini/luasrc/controller/mini/network.lua
@@ -19,6 +19,7 @@ function index()
luci.i18n.loadc("admin-core")
local i18n = luci.i18n.translate
- entry({"mini", "network"}, cbi("mini-network/basic"), i18n("network"))
- entry({"mini", "network", "dhcp"}, cbi("mini-network/dhcp"), "DHCP", 10)
+ entry({"mini", "network"}, alias("mini", "network", "basic"), i18n("network"), 20)
+ entry({"mini", "network", "basic"}, cbi("mini-network/basic"), i18n("basicsettings"), 10)
+ entry({"mini", "network", "dhcp"}, cbi("mini-network/dhcp"), "DHCP", 20)
end \ No newline at end of file
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 3b3fea228..e4541b45d 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -20,7 +20,7 @@ function index()
local i18n = luci.i18n.translate
entry({"mini", "system"}, call("action_reboot"), i18n("system"))
- entry({"admin", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw"), 10)
+ entry({"mini", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw"), 10)
entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash"), 20)
entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 30)
end
diff --git a/modules/admin-mini/luasrc/view/mini/passwd.htm b/modules/admin-mini/luasrc/view/mini/passwd.htm
index 176abaea2..ece9a5947 100644
--- a/modules/admin-mini/luasrc/view/mini/passwd.htm
+++ b/modules/admin-mini/luasrc/view/mini/passwd.htm
@@ -27,7 +27,7 @@ $Id$
<% end %>
<% end %>
<% if not stat or stat == 10 then %>
- <form method="post" action="<%=controller%>/admin/system/passwd">
+ <form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-section-node">
<div class="cbi-value">
<div class="cbi-value-title"><%:password%></div>
diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/admin-mini/luasrc/view/mini/reboot.htm
index 600da36fc..b0f64698d 100644
--- a/modules/admin-mini/luasrc/view/mini/reboot.htm
+++ b/modules/admin-mini/luasrc/view/mini/reboot.htm
@@ -25,7 +25,7 @@ if c and next(c) then
end
if not reboot then
-%>
-<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>
+<p><a href="<%=REQUEST_URI%>?reboot=1"><%:a_s_reboot_do%></a></p>
<%- else -%>
<p><%:a_s_reboot_running%></p>
<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>