projects / project / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 4580faa)
Merge pull request #735 from kdarbyshirebryant/srcdietfix
authorJo-Philipp Wich <jo@mein.io>
Wed, 8 Jun 2016 08:47:39 +0000 (10:47 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 8 Jun 2016 08:47:39 +0000 (10:47 +0200)
luci-base: fix lua interpreter location

applications/luci-app-adblock/luasrc/model/cbi/adblock.lua patch | blob | history
themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm patch | blob | history

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index c8af73a..1932837 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -59,6 +59,10 @@ o5.datatype = "directory"
 e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
        translate("Options for further tweaking in case the defaults are not suitable for you."))
 
+a0 = e:option(Flag, "adb_restricted", translate("Do not write status info to flash"),
+       translate("Skip writing update status information to the config file. Status fields on this page will not be updated."))
+a0.default = 0
+
 a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance"))
 a1.optional = true
 a1.default = 65535
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index d4d0a2b..6f09bfc 100644 (file)
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -172,7 +172,6 @@
                        <style title="text/css"><%= css %></style>
                <% end -%>
                <script src="<%=resource%>/xhr.js"></script>
-               <script src="<%=resource%>/jql.min.js"></script>
        </head>
 
        <body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %>">
Lua Configuration Interface (mirror)