diff --git a/package/ctcgfw/luci-theme-argonv3/Makefile b/package/ctcgfw/luci-theme-argonv3/Makefile index ffa9bd10be..1533ac997c 100644 --- a/package/ctcgfw/luci-theme-argonv3/Makefile +++ b/package/ctcgfw/luci-theme-argonv3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=1.7.1 -PKG_RELEASE:=20210215 +PKG_VERSION:=1.7.2 +PKG_RELEASE:=20210309 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css index 0ae7a4266f..ec12c7cd42 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css @@ -2731,6 +2731,9 @@ input[name="nslookup"] { .node-network-diagnostics input { margin: 0.25rem !important; } +.node-network-wireless .cbi-button-add { + margin-left: 0; +} /* fix nlbw/display*/ #detail-bubble.in { z-index: 500; diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js index a627f4e743..33478216bb 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js @@ -240,7 +240,7 @@ $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { var that = $(this); if (that.text().trim() == "") { - that.css("display", "none"); + that.css("padding", "0px"); } }); diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less index 330049272e..6d77ffd9ae 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less @@ -3388,6 +3388,9 @@ input[name="nslookup"] { margin: 0.25rem !important; } +.node-network-wireless .cbi-button-add{ + margin-left: 0; +} diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm index e194b3c2b9..f526fb8d2e 100644 --- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm +++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm @@ -27,7 +27,8 @@ local boardinfo = util.ubus("system", "board") local fs = require "nixio.fs" local nutil = require "nixio.util" - + local uci = require 'luci.model.uci'.cursor() + local theme_dir = media .. "/background/" function glob(...) local iter, code, msg = fs.glob(...) if iter then @@ -41,30 +42,42 @@ return str:match(".+%.(%w+)$") end - local bgcount = 0 - local currentBg = {} - local bgs,attr = {} - local theme_dir = media .. "/background/" - for i, f in ipairs(glob("/www" .. theme_dir .. "*")) do - attr = fs.stat(f) - if attr then - local ext = getExtension(fs.basename(f)) - if ext == "jpg" or ext == "png" or ext == "gif" or ext == "mp4" then - local bg = {} - bg.type = ext - bg.url = theme_dir .. fs.basename(f) - table.insert(bgs,bg) - bgcount = bgcount + 1 + function fetchMedia(path) + local bgArr = {} + local numBg = 0 + for i, f in ipairs(glob(path)) do + attr = fs.stat(f) + if attr then + local ext = getExtension(fs.basename(f)) + if ext == "jpg" or ext == "png" or ext == "gif" or ext == "mp4" then + local bg = {} + bg.type = ext + bg.url = theme_dir .. fs.basename(f) + table.insert(bgArr,bg) + numBg = numBg + 1 + end end end + return bgArr,numBg end - if bgcount > 0 then - currentBg = bgs[math.random(1,bgcount)] - end + local bgcount = 0 + local currentBg = {} + local bgs = {} + local theme_dir = media .. "/background/" + local bing_background = fs.access('/etc/config/argon') and uci:get_first('argon', 'global', 'bing_background') or 0 + bgs,bgcount=fetchMedia("/www" .. theme_dir .. "*") %>
- <% if (bgcount > 0 and currentBg.type == "mp4") then %> + + <% + local bg_url = media .. "/img/bg1.jpg" + if ( bing_background == "0" ) then + if bgcount > 0 then + currentBg = bgs[math.random(1,bgcount)] + end + if ( bgcount > 0 and currentBg.type == "mp4" ) then + %>