From 2bfa17e6f415a5d99a2f65dc37e4b8ceac1c3b6a Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sat, 14 Nov 2009 19:24:12 +0000
Subject: [PATCH] NIU: Initial wireless DDNS: Show current address only if
 domain name is saved Minor tweaks

---
 .../resources/icons32/network-wireless.png         | Bin 0 -> 2373 bytes
 modules/niu/luasrc/controller/niu/system.lua       |   2 +-
 modules/niu/luasrc/controller/niu/wireless.lua     |  28 +++++++++++++++++++++
 modules/niu/luasrc/model/cbi/niu/network/ddns1.lua |   7 ++++++
 modules/niu/luasrc/view/niu/network.htm            |   3 +--
 5 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 modules/niu/htdocs/luci-static/resources/icons32/network-wireless.png
 create mode 100644 modules/niu/luasrc/controller/niu/wireless.lua

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 0000000000000000000000000000000000000000..94e7546150239704a8005a5e8de5202485d23559
GIT binary patch
literal 2373
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

literal 0
HcmV?d00001

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>
-- 
2.11.0