OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 05-04 22:18:42

This commit is contained in:
github-actions[bot] 2022-05-04 22:18:42 +08:00
parent 47148310a1
commit c85216f3ad
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-theme-argon/htdocs/luci-static/argon/css/cascade.css
View File

File diff suppressed because one or more lines are too long

2
luci-theme-argon/htdocs/luci-static/argon/less/cascade.less
View File

@ -804,7 +804,7 @@ header {
span[data-indicator="poll-status"] { span[data-indicator="poll-status"] {
color: #32325d; color: #32325d;
background-color: #fff !important; background-color: #fff;
} }
span[data-style="active"] { span[data-style="active"] {

32
luci-theme-argon/luasrc/view/themes/argon/sysauth.htm
View File

@ -32,7 +32,7 @@
-- Fetch Local Background Media -- Fetch Local Background Media
function glob(...) local function glob(...)
local iter, code, msg = fs.glob(...) local iter, code, msg = fs.glob(...)
if iter then if iter then
return nutil.consume(iter) return nutil.consume(iter)
@ -45,13 +45,16 @@
local imageTypes = " jpg png gif " local imageTypes = " jpg png gif "
local videoTypes = " mp4 webm " local videoTypes = " mp4 webm "
local allTypes = imageTypes .. videoTypes local allTypes = imageTypes .. videoTypes
function fetchMedia(path,themeDir) local function fetchMedia(path,themeDir)
local backgroundTable = {} local backgroundTable = {}
local backgroundCount = 0 local backgroundCount = 0
for i, f in ipairs(glob(path)) do for i, f in ipairs(glob(path)) do
attr = fs.stat(f) attr = fs.stat(f)
if attr then if attr then
local ext = fs.basename(f):match(".+%.(%w+)$") local ext = fs.basename(f):match(".+%.(%w+)$")
if ext ~= nil then
ext = ext:lower()
end
if ext ~= nil and string.match(allTypes, " "..ext.." ") ~= nil then if ext ~= nil and string.match(allTypes, " "..ext.." ") ~= nil then
local bg = {} local bg = {}
bg.type = ext bg.type = ext
@ -63,14 +66,21 @@
end end
return backgroundTable,backgroundCount return backgroundTable,backgroundCount
end end
local function selectBackground(themeDir)
local boardinfo = util.ubus("system", "board")
local themeDir = media .. "/background/"
local bgUrl = media .. "/img/bg1.jpg" local bgUrl = media .. "/img/bg1.jpg"
local backgroundTable, backgroundCount = fetchMedia("/www" .. themeDir .. "*",themeDir)
local backgroundType = "Image" local backgroundType = "Image"
local mimeType = "" local mimeType = ""
if fs.access("/etc/config/argon") then
if uci:get_first('argon', 'global', 'bing_background') == "1" then
local bing = sys.exec("/usr/libexec/argon/bing_wallpaper")
if (bing and bing ~= '') then
return bing, "Image", ""
end
end
end
local backgroundTable, backgroundCount = fetchMedia("/www" .. themeDir .. "*",themeDir)
if ( backgroundCount > 0 ) then if ( backgroundCount > 0 ) then
local currentBg = backgroundTable[math.random(1,backgroundCount)] local currentBg = backgroundTable[math.random(1,backgroundCount)]
bgUrl = currentBg.url bgUrl = currentBg.url
@ -78,12 +88,14 @@
backgroundType = "Video" backgroundType = "Video"
mimeType = "video/" .. currentBg.type mimeType = "video/" .. currentBg.type
end end
else
local bing = sys.exec("/usr/libexec/argon/bing_wallpaper")
if (bing and bing ~= '') then
bgUrl = bing
end end
return bgUrl,backgroundType,mimeType
end end
local boardinfo = util.ubus("system", "board")
local themeDir = media .. "/background/"
local bgUrl,backgroundType,mimeType = selectBackground(themeDir)
%> %>
<!-- Login Page Start --> <!-- Login Page Start -->
<div class="login-page"> <div class="login-page">

6
smartdns/Makefile
View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=smartdns PKG_NAME:=smartdns
PKG_VERSION:=Release36.1 PKG_VERSION:=1.2020.30
PKG_RELEASE:=22 PKG_RELEASE:=23
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git
PKG_SOURCE_VERSION:=24661c2419a81e660b11a0e3d35a3bc269cd4bfa PKG_SOURCE_VERSION:=34691154fb40fc9949aa7aabec3ec2045fc51059
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com> PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>