summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--modules/niu/htdocs/luci-static/resources/icons32/network-wireless.pngbin0 -> 2373 bytes
-rw-r--r--modules/niu/luasrc/controller/niu/system.lua2
-rw-r--r--modules/niu/luasrc/controller/niu/wireless.lua28
-rw-r--r--modules/niu/luasrc/model/cbi/niu/network/ddns1.lua7
-rw-r--r--modules/niu/luasrc/view/niu/network.htm3
5 files changed, 37 insertions, 3 deletions
diff --git a/modules/niu/htdocs/luci-static/resources/icons32/network-wireless.png b/modules/niu/htdocs/luci-static/resources/icons32/network-wireless.png
new file mode 100644
index 000000000..94e754615
--- /dev/null
+++ b/modules/niu/htdocs/luci-static/resources/icons32/network-wireless.png
Binary files differ
diff --git a/modules/niu/luasrc/controller/niu/system.lua b/modules/niu/luasrc/controller/niu/system.lua
index 2adf1d762..e9e767a1d 100644
--- a/modules/niu/luasrc/controller/niu/system.lua
+++ b/modules/niu/luasrc/controller/niu/system.lua
@@ -18,7 +18,7 @@ module "luci.controller.niu.system"
function index()
local toniu = {on_success_to={"niu"}}
- local e = entry({"niu", "system"}, alias("niu"), "System", 20)
+ local e = entry({"niu", "system"}, alias("niu"), "System", 30)
e.niu_dbtemplate = "niu/system"
e.niu_dbtasks = true
e.niu_dbicon = "icons32/preferences-system.png"
diff --git a/modules/niu/luasrc/controller/niu/wireless.lua b/modules/niu/luasrc/controller/niu/wireless.lua
new file mode 100644
index 000000000..f508abad5
--- /dev/null
+++ b/modules/niu/luasrc/controller/niu/wireless.lua
@@ -0,0 +1,28 @@
+--[[
+LuCI - Lua Development Framework
+
+Copyright 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local require = require
+module "luci.controller.niu.wireless"
+
+function index()
+ local toniu = {on_success_to={"niu"}}
+
+ local e = entry({"niu", "wireless"}, alias("niu"), "Wireless", 20)
+ --e.niu_dbtemplate = "niu/wireless"
+ e.niu_dbtasks = true
+ e.niu_dbicon = "icons32/network-wireless.png"
+
+ entry({"niu", "wireless", "ap"},
+ cbi("niu/network/ap", toniu), "Configure Private Access Point", 1)
+end \ No newline at end of file
diff --git a/modules/niu/luasrc/model/cbi/niu/network/ddns1.lua b/modules/niu/luasrc/model/cbi/niu/network/ddns1.lua
index 497a9c025..5fb74ac2e 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/ddns1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/ddns1.lua
@@ -40,6 +40,13 @@ pw.password = true
local dom = s:taboption("general", Value, "domain", translate("Hostname"))
local current = s:taboption("general", DummyValue, "_current", "Current IP-Address")
+
+function current.render(self, section, ...)
+ if dom:cfgvalue(section) then
+ return DummyValue.render(self, section, ...)
+ end
+end
+
function current.value(self, section)
local dns = nxo.getaddrinfo(dom:cfgvalue(section))
if dns then
diff --git a/modules/niu/luasrc/view/niu/network.htm b/modules/niu/luasrc/view/niu/network.htm
index 0e057f199..f61e3e1f6 100644
--- a/modules/niu/luasrc/view/niu/network.htm
+++ b/modules/niu/luasrc/view/niu/network.htm
@@ -58,8 +58,7 @@ end
<tr>
<% if wanup then %>
<th>Uplink Address</th>
-<td><span style="color: darkgreen"><%=wanip%></span>
-</td>
+<td><%=wanip%></td>
<% else %>
<th>Uplink</th>
<td><span style="color: darkred"><em>offline</em></span>