summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-10-29 13:09:31 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-10-29 13:09:31 +0000
commit431d4e8eff513622eaa1b6e3f0803913c0abb975 (patch)
tree57fab0a350fd1aa29e4fe283163166fbb7e30c91 /applications
parent94784db12b33d53c6da1b2a9195d40319766361c (diff)
merge branch changes into trunk
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua7
-rw-r--r--applications/luci-transmission/luasrc/model/cbi/transmission.lua2
2 files changed, 7 insertions, 2 deletions
diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index 0deb72776f..42fb4a61dc 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -13,6 +13,8 @@ You may obtain a copy of the License at
$Id$
]]--
+require("luci.tools.webadmin")
+
local is_mini = (luci.dispatcher.context.path[1] == "mini")
@@ -27,6 +29,10 @@ s.anonymous = false
s:option(Flag, "enabled", translate("Enable"))
+interface = s:option(ListValue, "interface", translate("Event interface"), translate("On which interface up should start the ddns script process."))
+luci.tools.webadmin.cbi_add_networks(interface)
+interface.default = "wan"
+
svc = s:option(ListValue, "service_name", translate("Service"))
svc.rmempty = false
@@ -81,7 +87,6 @@ if is_mini then
s.defaults.ip_source = "network"
s.defaults.ip_network = "wan"
else
- require("luci.tools.webadmin")
src = s:option(ListValue, "ip_source",
translate("Source of IP address"))
diff --git a/applications/luci-transmission/luasrc/model/cbi/transmission.lua b/applications/luci-transmission/luasrc/model/cbi/transmission.lua
index e727a0de38..4f9e3c5476 100644
--- a/applications/luci-transmission/luasrc/model/cbi/transmission.lua
+++ b/applications/luci-transmission/luasrc/model/cbi/transmission.lua
@@ -22,7 +22,7 @@ local running = (luci.sys.call("pidof transmission-daemon > /dev/null") == 0)
local webinstalled = luci.model.ipkg.installed("transmission-web")
local button = ""
if running and webinstalled then
- button = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\" " .. translate("Open Web Interface") .. " \" onclick=\"window.open('http://'+window.location.host+':" .. trport .. "')\"/>"
+ button = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\" " .. translate("Open Web Interface") .. " \" onclick=\"window.open('http://'+window.location.hostname+':" .. trport .. "')\"/>"
end
m = Map("transmission", "Transmission", translate("Transmission daemon is a simple bittorrent client, here you can configure the settings.") .. button)