diff options
| -rw-r--r-- | contrib/package/luci/Makefile | 2 | ||||
| -rw-r--r-- | i18n/english/luasrc/i18n/default.en.lua | 2 | ||||
| -rw-r--r-- | i18n/german/luasrc/i18n/default.de.lua | 2 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/network.lua | 5 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/system.lua | 2 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/passwd.htm | 2 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/reboot.htm | 2 |
7 files changed, 11 insertions, 6 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 47a0275a1..6482ad7ac 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -61,7 +61,7 @@ endef define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI - Freifunk Support + SUBMENU:=LuCI - Freifunk Support (GERMAN ONLY) DEPENDS:=+luci-mod-freifunk endef diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua index eb6ce8c4d..70a839c39 100644 --- a/i18n/english/luasrc/i18n/default.en.lua +++ b/i18n/english/luasrc/i18n/default.en.lua @@ -4,6 +4,8 @@ all = "all" administration = "Administration" apply = "Apply" +basicsettings = "Basic Settings" + changes = "Changes" channel = "Channel" code = "Code" diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua index c88e94134..249fadde8 100644 --- a/i18n/german/luasrc/i18n/default.de.lua +++ b/i18n/german/luasrc/i18n/default.de.lua @@ -4,6 +4,8 @@ all = "alle" administration = "Administration" apply = "Anwenden" +basicsettings = "Grundeinstellungen" + changes = "Änderungen" channel = "Kanal" code = "Code" 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> |