diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 5e51b301e1..c2017cd220 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -184,6 +184,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
)$$(call addfield,Section,$(SECTION)
)$$(call addfield,Require-User,$(USERID)
)$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH)
+)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1))
)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
)$(if $(filter essential,$(PKG_FLAGS)),Essential: yes
diff --git a/package/ctcgfw/cdnspeedtest/Makefile b/package/ctcgfw/cdnspeedtest/Makefile
index 8b97e50d9b..b8afc7728f 100644
--- a/package/ctcgfw/cdnspeedtest/Makefile
+++ b/package/ctcgfw/cdnspeedtest/Makefile
@@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=CloudflareSpeedTest
-PKG_VERSION:=1.4.8
+PKG_VERSION:=1.4.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5e822fb24348dbb75aeb33c3e9f558d629892089bc918186d5e68c3341e70049
+PKG_HASH:=7b7a18b54eae74d70f18105cc9c74822ce05336b2b894c59a388f46430733dcd
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE
diff --git a/package/ctcgfw/luci-app-argon-config/Makefile b/package/ctcgfw/luci-app-argon-config/Makefile
index 1c94acc93c..3cf0201804 100644
--- a/package/ctcgfw/luci-app-argon-config/Makefile
+++ b/package/ctcgfw/luci-app-argon-config/Makefile
@@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-argon-config
-PKG_VERSION:=0.7
-PKG_RELEASE:=beta
+PKG_VERSION:=0.9
+PKG_RELEASE:=20210309
LUCI_TITLE:=LuCI page for Argon Config
LUCI_DEPENDS:=+luci-theme-argonv3
diff --git a/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua b/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua
index 5af5374521..f1f0ec7f62 100644
--- a/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua
+++ b/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua
@@ -23,6 +23,7 @@ if nxfs.access('/etc/config/argon') then
blur_opacity = uci:get_first('argon', 'global', 'transparency')
blur_opacity_dark = uci:get_first('argon', 'global', 'transparency_dark')
mode = uci:get_first('argon', 'global', 'mode')
+ bing_background = uci:get_first('argon', 'global', 'bing_background')
end
function glob(...)
@@ -49,10 +50,16 @@ local transparency_sets = {
}
-- [[ 模糊设置 ]]--
-br = SimpleForm('config', translate('Argon Config'), translate('Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.'))
+br = SimpleForm('config', translate('Argon Config'), translate('Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.[Chrome is recommended]'))
br.reset = false
br.submit = false
-s = br:section(SimpleSection)
+s = br:section(SimpleSection)
+
+o = s:option(ListValue, 'bing_background', translate('Wallpaper Source'))
+o:value('0', translate('Built-in'))
+o:value('1', translate('Bing Wallpapers'))
+o.default = bing_background
+o.rmempty = false
o = s:option(ListValue, 'mode', translate('Theme mode'))
o:value('normal', translate('Follow System'))
@@ -63,7 +70,7 @@ o.rmempty = false
o.description = translate('You can choose Theme color mode here')
o = s:option(Value, 'primary', translate('[Light mode] Primary Color'), translate('A HEX Color ; ( Default: #5e72e4 )'))
-o.value = primary
+o.default = primary
o.datatype = ufloat
o.rmempty = false
@@ -78,12 +85,12 @@ o.datatype = ufloat
o.rmempty = false
o = s:option(Value, 'blur', translate('[Light mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )'))
-o.value = blur_radius
+o.default = blur_radius
o.datatype = ufloat
o.rmempty = false
o = s:option(Value, 'dark_primary', translate('[Dark mode] Primary Color'), translate('A HEX Color ; ( Default: #483d8b )'))
-o.value = dark_primary
+o.default = dark_primary
o.datatype = ufloat
o.rmempty = false
@@ -96,7 +103,7 @@ o.datatype = ufloat
o.rmempty = false
o = s:option(Value, 'blur_dark', translate('[Dark mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )'))
-o.value = blur_radius_dark
+o.default = blur_radius_dark
o.datatype = ufloat
o.rmempty = false
diff --git a/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po b/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po
index 1ba67fcff4..1d25348e5f 100644
--- a/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po
+++ b/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po
@@ -14,8 +14,17 @@ msgstr ""
msgid "Argon Config"
msgstr "Argon 主题设置"
-msgid "Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos."
-msgstr "在这里你可以设置 argon 主题的登录页面的模糊和透明度,并管理背景图片与视频。"
+msgid "Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.[Chrome is recommended]"
+msgstr "在这里你可以设置argon 主题的登录页面的模糊和透明度,并管理背景图片与视频。[建议使用 Chrome]"
+
+msgid "Wallpaper Source"
+msgstr "壁纸来源"
+
+msgid "Built-in"
+msgstr "内建"
+
+msgid "Bing Wallpapers"
+msgstr "Bing 壁纸"
msgid "Theme mode"
msgstr "主题模式"
diff --git a/package/ctcgfw/luci-app-argon-config/root/etc/config/argon b/package/ctcgfw/luci-app-argon-config/root/etc/config/argon
index 11fb00f5b9..fb7f35d9c7 100644
--- a/package/ctcgfw/luci-app-argon-config/root/etc/config/argon
+++ b/package/ctcgfw/luci-app-argon-config/root/etc/config/argon
@@ -5,4 +5,5 @@ config global
option blur_dark '10'
option transparency '0.5'
option transparency_dark '0.5'
- option mode 'normal'
\ No newline at end of file
+ option mode 'normal'
+ option bing_background '0'
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
+ %>