From df0590972345e6862817e53a38c73925596aaf63 Mon Sep 17 00:00:00 2001 From: Christian Schoenebeck Date: Sun, 1 Mar 2015 20:08:45 +0100 Subject: luci-app-ddns: patches for #298 #334 #335 * remove usage of opkg via system call for version handling thanks to Jo-Philipp Wich #335 * remove special handling of bootstrap theme #298 #334 Signed-off-by: Christian Schoenebeck --- applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua | 3 +-- applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'applications/luci-app-ddns/luasrc/model/cbi') diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index 602bc159af..40a66ef152 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -1,7 +1,7 @@ -- Copyright 2008 Steven Barth -- Copyright 2008 Jo-Philipp Wich -- Copyright 2013 Manuel Munz --- Copyright 2014 Christian Schoenebeck +-- Copyright 2014-2015 Christian Schoenebeck -- Licensed to the public under the Apache License 2.0. local NX = require "nixio" @@ -25,7 +25,6 @@ local has_dnstcp = DDNS.check_bind_host() -- DNS TCP support local has_force = has_ssl and has_dnstcp -- Force IP Protocoll -- html constants -- ########################################################### -local LFLF = (DDNS.get_theme() == "Bootstrap") and [[

]] or [[]] local font_red = "" local font_off = "" local bold_on = "" diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua index 32ca5418ef..e1718739f9 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua @@ -7,9 +7,6 @@ local DISP = require "luci.dispatcher" local SYS = require "luci.sys" local DDNS = require "luci.tools.ddns" -- ddns multiused functions --- Bootstrap theme needs 2 or 3 additional linefeeds for tab description for better optic -local LFLF = (DDNS.get_theme() == "Bootstrap") and [[

]] or [[]] - -- cbi-map definition -- ####################################################### local m = Map("ddns") @@ -38,7 +35,7 @@ local ns = m:section( NamedSection, "global", "ddns", .. [[]] .. translate("For detailed information about parameter settings look here.") .. [[]] - .. LFLF ) + -- section might not exist function ns.cfgvalue(self, section) if not self.map:get(section) then -- cgit v1.2.3