diff --git a/luci-app-argon-config/luasrc/model/cbi/argon-config.lua b/luci-app-argon-config/luasrc/model/cbi/argon-config.lua index 77480ec..c47b4be 100644 --- a/luci-app-argon-config/luasrc/model/cbi/argon-config.lua +++ b/luci-app-argon-config/luasrc/model/cbi/argon-config.lua @@ -23,7 +23,6 @@ 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(...) @@ -53,13 +52,7 @@ 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.[Chrome is recommended]')) br.reset = false br.submit = false -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 +s = br:section(SimpleSection) o = s:option(ListValue, 'mode', translate('Theme mode')) o:value('normal', translate('Follow System')) diff --git a/luci-app-argon-config/po/zh-cn/argon-config.po b/luci-app-argon-config/po/zh-cn/argon-config.po index 21aa9b4..1ebd0aa 100644 --- a/luci-app-argon-config/po/zh-cn/argon-config.po +++ b/luci-app-argon-config/po/zh-cn/argon-config.po @@ -17,15 +17,6 @@ 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/luci-app-argon-config/root/etc/config/argon b/luci-app-argon-config/root/etc/config/argon index e911f28..b265820 100644 --- a/luci-app-argon-config/root/etc/config/argon +++ b/luci-app-argon-config/root/etc/config/argon @@ -6,4 +6,3 @@ config global option transparency '0.2' option transparency_dark '0.2' option mode 'normal' - option bing_background '0' \ No newline at end of file diff --git a/luci-theme-argon/htdocs/luci-static/argon/background/README.md b/luci-theme-argon/htdocs/luci-static/argon/background/README.md index 918c452..b154d62 100644 --- a/luci-theme-argon/htdocs/luci-static/argon/background/README.md +++ b/luci-theme-argon/htdocs/luci-static/argon/background/README.md @@ -1,2 +1,3 @@ -Drop background here! -accept jpg png gif and mp4 +登录页面背景图片目录 + +支持格式:jpg、png、gif、webp、mp4 diff --git a/luci-theme-argon/htdocs/luci-static/argon/img/bg1.webp b/luci-theme-argon/htdocs/luci-static/argon/img/bg.webp similarity index 100% rename from luci-theme-argon/htdocs/luci-static/argon/img/bg1.webp rename to luci-theme-argon/htdocs/luci-static/argon/img/bg.webp diff --git a/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm b/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm index e0f3023..71e0125 100644 --- a/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm +++ b/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm @@ -83,18 +83,8 @@ }) <% else - local bg_url = media .. "/img/bg1.webp" - local bing = "123" - if (bgcount == 0 ) then - local sys = require "luci.sys" - local json = require "luci.jsonc" - local remote_bg_url="http://www.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=ZH-CN" - --bing = sys.httpget(remote_bg_url) - bing = sys.exec("wget --timeout=0.5 -qO- '%s'" %remote_bg_url) - if (bing and bing ~= '') then - bg_url = "https://www.bing.com" .. json.parse(bing).images[1].url - end - elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then + local bg_url = media .. "/img/bg.webp" + if (bgcount > 0 and currentBg["type"] ~= "mp4") then bg_url = currentBg.url end %>