mirror of
				https://github.com/kenzok8/openwrt-packages.git
				synced 2025-10-30 07:50:37 +08:00 
			
		
		
		
	update 2023-05-09 15:56:25
This commit is contained in:
		| @ -166,13 +166,14 @@ function getip(){ | ||||
| 			local ipv4_URL=`echo "$ipv4_urllist"| sed -n "${1}p"|sed -e 's/\r//g'` | ||||
| 			[ ! -z "$ipv4_interface" ] && local tmp_hostIP=$(curl -k -s -4 --interface ${ipv4_interface} -m 5 ${ipv4_URL}) || local tmp_hostIP=$(curl -k -s -4 -m 5 ${ipv4_URL}) | ||||
| 			[ -z "$tmp_hostIP" ] && echo "`date "+%Y-%m-%d %H:%M:%S"`  【info】IP 获取失败,当前使用的 API 为 $ipv4_URL" >> ${logfile} | ||||
| 			echo $tmp_hostIP|grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'|head -n1 | ||||
| 			local tmp_hostIP=`echo $tmp_hostIP|grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'|head -n1` | ||||
| 			echo "{\"IP\":\"${tmp_hostIP}\", \"URL\":\"${ipv4_URL}\"}" | ||||
| 		} | ||||
| 		local hostIP=`get_hostipv4 ${rand_number}` | ||||
| 		[ -z $hostIP ] && local rand_number=`expr $rand_number + 1` && [ $rand_number -gt $url_number ] && local rand_number=1;[ -z $hostIP ] && local hostIP=`get_hostipv4 ${rand_number}` | ||||
| 		[ -z $hostIP ] && local rand_number=`expr $rand_number + 1` && [ $rand_number -gt $url_number ] && local rand_number=1;[ -z $hostIP ] && local hostIP=`get_hostipv4 ${rand_number}` | ||||
| 		[ -z $hostIP ] && [ `expr $(date +%s) - $(date -r /usr/share/serverchan/api/ipv4.list +%s)` -gt "86400" ] && wget --no-check-certificate -t 3 -T 15 -O /usr/share/serverchan/api/ipv4.list https://raw.githubusercontent.com/tty228/luci-app-serverchan/master/root/usr/share/serverchan/api/ipv4.list >/dev/null 2>&1 && ipv4_urllist=`cat /usr/share/serverchan/api/ipv4.list` 2>/dev/null && echo "`date "+%Y-%m-%d %H:%M:%S"`  【info】多次获取 IP 失败,重新同步 API 列表" >> ${logfile} | ||||
| 		[ ! -z $hostIP ] && echo $hostIP | ||||
| 		[ -z `echo $hostIP|jq -r '.IP'` ] && local rand_number=`expr $rand_number + 1` && [ $rand_number -gt $url_number ] && local rand_number=1;[ -z `echo $hostIP|jq -r '.IP'` ] && local hostIP=`get_hostipv4 ${rand_number}` | ||||
| 		[ -z `echo $hostIP|jq -r '.IP'` ] && local rand_number=`expr $rand_number + 1` && [ $rand_number -gt $url_number ] && local rand_number=1;[ -z `echo $hostIP|jq -r '.IP'` ] && local hostIP=`get_hostipv4 ${rand_number}` | ||||
| 		[ -z `echo $hostIP|jq -r '.IP'` ] && [ `expr $(date +%s) - $(date -r /usr/share/serverchan/api/ipv4.list +%s)` -gt "86400" ] && wget --no-check-certificate -t 3 -T 15 -O /usr/share/serverchan/api/ipv4.list https://raw.githubusercontent.com/tty228/luci-app-serverchan/master/root/usr/share/serverchan/api/ipv4.list >/dev/null 2>&1 && ipv4_urllist=`cat /usr/share/serverchan/api/ipv4.list` 2>/dev/null && echo "`date "+%Y-%m-%d %H:%M:%S"`  【info】多次获取 IP 失败,重新同步 API 列表" >> ${logfile} | ||||
| 		echo $hostIP | ||||
| 		 | ||||
| 	# 从接口获取 IPv6 | ||||
| 	elif [ $1 == "wanipv6" ] ;then | ||||
| @ -189,13 +190,14 @@ function getip(){ | ||||
| 			local ipv6_URL=`echo "$ipv6_urllist"| sed -n "${1}p"|sed -e 's/\r//g'` | ||||
| 			[ ! -z "$ipv6_interface" ] && local tmp_hostIPv6=$(curl -k -s -6 --interface ${ipv6_interface} -m 5 ${ipv6_URL}) || local tmp_hostIPv6=$(curl -k -s -6 -m 5 ${ipv6_URL}) | ||||
| 			[ -z "$tmp_hostIPv6" ] && echo "`date "+%Y-%m-%d %H:%M:%S"`  【info】IP 获取失败,当前使用的 API 为 $ipv6_URL" >> ${logfile} | ||||
| 			echo $tmp_hostIPv6|grep -oE "([\da-fA-F0-9]{1,4}(:{1,2})){1,15}[\da-fA-F0-9]{1,4}"|head -n1 | ||||
| 			local tmp_hostIPv6=`echo $tmp_hostIPv6|grep -oE "([\da-fA-F0-9]{1,4}(:{1,2})){1,15}[\da-fA-F0-9]{1,4}"|head -n1` | ||||
| 			echo "{\"IP\":\"${tmp_hostIPv6}\", \"URL\":\"${ipv6_URL}\"}" | ||||
| 		} | ||||
| 		local hostIPv6=`get_hostipv6 ${rand_numberv6}` | ||||
| 		[ -z $hostIPv6 ] && local rand_numberv6=`expr $rand_numberv6 + 1` && [ $rand_numberv6 -gt $urlv6_number ] && local rand_numberv6=1;[ -z $hostIPv6 ] && local hostIPv6=`get_hostipv6 ${rand_numberv6}` | ||||
| 		[ -z $hostIPv6 ] && local rand_numberv6=`expr $rand_numberv6 + 1` && [ $rand_numberv6 -gt $urlv6_number ] && local rand_numberv6=1;[ -z $hostIPv6 ] && local hostIPv6=`get_hostipv6 ${rand_numberv6}` | ||||
| 		[ -z $hostIPv6 ] && [ `expr $(date +%s) - $(date -r /usr/share/serverchan/api/ipv4.list +%s)` -gt "86400" ] && wget --no-check-certificate -t 3 -T 15 -O /usr/share/serverchan/api/ipv6.list https://raw.githubusercontent.com/tty228/luci-app-serverchan/master/root/usr/share/serverchan/api/ipv6.list >/dev/null 2>&1 && ipv6_urllist=`cat /usr/share/serverchan/api/ipv4.list` 2>/dev/null && echo "`date "+%Y-%m-%d %H:%M:%S"`  【info】多次获取 IP 失败,重新同步 API 列表" >> ${logfile} | ||||
| 		[ ! -z $hostIPv6 ] && echo $hostIPv6 | ||||
| 		[ -z `echo $hostIPv6|jq -r '.IP'` ] && local rand_numberv6=`expr $rand_numberv6 + 1` && [ $rand_numberv6 -gt $urlv6_number ] && local rand_numberv6=1;[ -z `echo $hostIPv6|jq -r '.IP'` ] && local hostIPv6=`get_hostipv6 ${rand_numberv6}` | ||||
| 		[ -z `echo $hostIPv6|jq -r '.IP'` ] && local rand_numberv6=`expr $rand_numberv6 + 1` && [ $rand_numberv6 -gt $urlv6_number ] && local rand_numberv6=1;[ -z `echo $hostIPv6|jq -r '.IP'` ] && local hostIPv6=`get_hostipv6 ${rand_numberv6}` | ||||
| 		[ -z `echo $hostIPv6|jq -r '.IP'` ] && [ `expr $(date +%s) - $(date -r /usr/share/serverchan/api/ipv4.list +%s)` -gt "86400" ] && wget --no-check-certificate -t 3 -T 15 -O /usr/share/serverchan/api/ipv6.list https://raw.githubusercontent.com/tty228/luci-app-serverchan/master/root/usr/share/serverchan/api/ipv6.list >/dev/null 2>&1 && ipv6_urllist=`cat /usr/share/serverchan/api/ipv4.list` 2>/dev/null && echo "`date "+%Y-%m-%d %H:%M:%S"`  【info】多次获取 IP 失败,重新同步 API 列表" >> ${logfile} | ||||
| 		echo $hostIPv6 | ||||
| 	fi | ||||
| } | ||||
|  | ||||
| @ -661,16 +663,16 @@ function unattended(){ | ||||
| 	if [ ! -z "$public_ip_event" ] && [ ! -z "$public_ip_retry_count" ] && [ "$public_ip_count" -le "$public_ip_retry_count" ]; then | ||||
| 		public_ip_count=`expr $public_ip_count + 1` | ||||
| 		local wanIP=`getip wanipv4` | ||||
| 		local hostIP=`getip hostipv4` | ||||
| 		local hostIP=`getip hostipv4|jq -r '.IP'` | ||||
| 		if [ ! -z "$wanIP" ] && [ ! -z "$hostIP" ] && ( ! echo "$wanIP"|grep -q -w ${hostIP} );then | ||||
| 			echo "`date "+%Y-%m-%d %H:%M:%S"` 【无人值守任务】重拨尝试获取公网 ip,当前第 $public_ip_count 次 " >> ${logfile} | ||||
| 			ifup wan >/dev/null 2>&1 | ||||
| 			sleep 60 | ||||
| 			local wanIP=`getip wanipv4` && local hostIP=`getip hostipv4` | ||||
| 			local wanIP=`getip wanipv4` && local hostIP=`getip hostipv4|jq -r '.IP'` | ||||
| 			[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -eq "1" ] && local IPv4=${wanIP} | ||||
| 			[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -eq "2" ] && local IPv4=${hostIP} | ||||
| 			[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "1" ] && local IPv6=`getip wanipv6` | ||||
| 			[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "2" ] && local IPv6=`getip hostipv6` | ||||
| 			[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "2" ] && local IPv6=`getip hostipv6|jq -r '.IP'` | ||||
| 			[ ! -z "$wanIP" ] && [ ! -z "$hostIP" ] && ( ! echo "$wanIP"|grep -q -w ${hostIP} ) && echo IPv4 $IPv4 > ${dir}ip && echo -e IPv6 $last_IPv6 >> ${dir}ip | ||||
| 		fi | ||||
| 	fi | ||||
| @ -776,24 +778,24 @@ function rand_geturl(){ | ||||
|  | ||||
| # 检测 ip 状况 | ||||
| function ip_changes(){ | ||||
| 	[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -eq "1" ] && local IPv4=`getip wanipv4` | ||||
| 	[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -eq "2" ] && local IPv4=`getip hostipv4` | ||||
| 	[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "1" ] && local IPv6=`getip wanipv6` | ||||
| 	[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "2" ] && local IPv6=`getip hostipv6` | ||||
| 	[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -eq "1" ] && local IPv4=`getip wanipv4` && local IPv4_URL="网络接口" | ||||
| 	[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -eq "2" ] && local IPv4=`getip hostipv4` && local IPv4_URL=`echo ${IPv4}|jq -r '.URL'` && local IPv4=`echo ${IPv4}|jq -r '.IP'` | ||||
| 	[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "1" ] && local IPv6=`getip wanipv6` && local IPv6_URL="网络接口" | ||||
| 	[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -eq "2" ] && local IPv6=`getip hostipv6` && local IPv6_URL=`echo ${IPv6}|jq -r '.URL'` && local IPv6=`echo ${IPv6}|jq -r '.IP'` | ||||
| 	 | ||||
| 	# 存在临时文件 | ||||
| 	if [ -f ${dir}ip ]; then | ||||
| 		local last_IPv4=$(cat "${dir}ip"|grep IPv4|awk '{print $2}'|grep -v "^$"|sort -u|head -n1) | ||||
| 		local last_IPv6=$(cat "${dir}ip"|grep IPv6|awk '{print $2}'|grep -v "^$"|sort -u|head -n1) | ||||
| 		if [ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -ne "0" ] && [ ! -z "$IPv4" ] && ( ! echo ${IPv4}|grep -w -q ${last_IPv4} ); then | ||||
| 			echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}当前IP:${IPv4}" >> ${logfile} | ||||
| 			echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}当前 IP:${IPv4}    from:${IPv4_URL}" >> ${logfile} | ||||
| 			echo IPv4 $IPv4 > ${dir}ip && echo -e IPv6 $last_IPv6 >> ${dir}ip | ||||
| 			title="IP 地址变化" | ||||
| 			content="${content}${str_splitline}${str_title_start} IP 地址变化${str_title_end}${str_linefeed}${str_tab}当前 IP:${IPv4}" | ||||
| 		fi | ||||
|  | ||||
| 		if [ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -ne "0" ] && [ ! -z "$IPv6" ] && ( ! echo "$IPv6"|grep -w -q ${last_IPv6} ); then | ||||
| 			echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}当前IPv6:${IPv6}" >> ${logfile} | ||||
| 			echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}当前 IPv6:${IPv6}    from:${IPv6_URL}" >> ${logfile} | ||||
| 			echo IPv4 $IPv4 > ${dir}ip && echo -e IPv6 $IPv6 >> ${dir}ip | ||||
| 			[ -z "$title" ] && title="IPv6 地址变化" | ||||
| 			[ ! -z "$title" ] && title="IP 地址变化" | ||||
| @ -803,8 +805,8 @@ function ip_changes(){ | ||||
| 	# 临时文件目录为空 | ||||
| 	else | ||||
| 		echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}路由器已经重启!" >> ${logfile} | ||||
| 		[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"`  当前IP: ${IPv4}" >> ${logfile} | ||||
| 		[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"`  当前IPv6: ${IPv6}" >> ${logfile} | ||||
| 		[ ! -z "$serverchan_ipv4" ] && [ "$serverchan_ipv4" -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}当前 IP: ${IPv4}    from:${IPv4_URL}" >> ${logfile} | ||||
| 		[ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}当前 IPv6: ${IPv6}    from:${IPv6_URL}" >> ${logfile} | ||||
| 		echo IPv4 $IPv4 > ${dir}ip && echo -e IPv6 $IPv6 >> ${dir}ip | ||||
| 		title="路由器重新启动" | ||||
| 		content="${content}${str_splitline}${str_title_start} 路由器重新启动${str_title_end}" | ||||
| @ -1090,6 +1092,7 @@ function login_send(){ | ||||
| 		local login_time=`cat ${dir}web_login|grep -w ${login_ip}|awk '{print $1}'|grep -v "^$"|sort -u|head -n1` | ||||
| 		local login_mode=`cat ${dir}web_login|grep -w ${login_ip}|awk '{print $2}'|grep -v "^$"|sort -u|head -n1` | ||||
| 		echo "$ip_white_list"|grep -w -q "$login_ip" && echo "`date "+%Y-%m-%d"` ${login_time} 【info】设备 ${login_ip} 通过 Web ${login_mode} 登陆了路由器 " >> ${logfile} && continue | ||||
| 		[ ! -z "$login_mode" ] && local content_mode="${str_linefeed}${str_tab}登录方式: ${str_space}${str_space}${str_space}${str_space}${login_mode}" | ||||
| 		if [ ! -z "$web_logged" ] && [ "$web_logged" -eq "1" ]; then | ||||
| 			if [ -z "$title" ]; then | ||||
| 				title="${login_ip} 通过 Web 登陆了路由器" | ||||
| @ -1353,11 +1356,11 @@ function send(){ | ||||
| 	fi | ||||
|  | ||||
| 	if [ -z "$1" ] && [ ! -z "$router_wan" ] && [ "$router_wan" -eq "1" ]; then | ||||
| 		local send_wanIP=`getip wanipv4`;local send_hostIP=`getip hostipv4` | ||||
| 		local send_wanIP=`getip wanipv4`;local send_hostIP=`getip hostipv4|jq -r '.IP'` | ||||
| 		local send_content="${send_content}${str_splitline}${str_title_start} WAN 口信息${str_title_end}${str_linefeed}${str_tab}接口 IPv4:${send_wanIP}" | ||||
| 		local send_content="${send_content}${str_linefeed}${str_tab}外网 IPv4:${send_hostIP}" | ||||
| 		if [ ! -z "$serverchan_ipv6" ] && [ "$serverchan_ipv6" -ne "0" ]; then | ||||
| 			local send_wanIPv6=`getip wanipv6`;local send_hostIPv6=`getip hostipv6` | ||||
| 			local send_wanIPv6=`getip wanipv6`;local send_hostIPv6=`getip hostipv6|jq -r '.IP'` | ||||
| 			local send_content="${send_content}${str_linefeed}${str_tab}接口 IPv6:${send_wanIPv6}" | ||||
| 			local send_content="${send_content}${str_linefeed}${str_tab}外网 IPv6:${send_hostIPv6}" | ||||
| 		fi | ||||
|  | ||||
| @ -9,16 +9,16 @@ include $(TOPDIR)/rules.mk | ||||
| LUCI_TITLE:=Argone kenzo | ||||
| LUCI_DEPENDS:=+curl +jsonfilter | ||||
| PKG_VERSION:=1.7.7 | ||||
| PKG_RELEASE:=3 | ||||
| PKG_RELEASE:=4 | ||||
|  | ||||
| include $(TOPDIR)/feeds/luci/luci.mk | ||||
|  | ||||
|  | ||||
| define Package/luci-theme-Argone/postinst | ||||
| define Package/luci-theme-argone/postinst | ||||
| #!/bin/sh | ||||
| sed -i ":a;$!N;s/tmpl.render.*sysauth_template.*return/local scope = { duser = default_user, fuser = user }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua | ||||
| sed -i ":a;$!N;s/t.render.*sysauth_template.*return/local scope = { duser = h, fuser = a }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua | ||||
| [ -f /usr/lib/lua/luci/view/themes/Argone/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/Argone/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm | ||||
| [ -f /usr/lib/lua/luci/view/themes/argone/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argone/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm | ||||
| rm -Rf /var/luci-modulecache | ||||
| rm -Rf /var/luci-indexcache | ||||
| exit 0 | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  ```bash | ||||
| git clone https://github.com/kenzok78/luci-theme-argone | ||||
| ``` | ||||
| + 21.02分支支持最新luci | ||||
| + 23 分支支持最新luci | ||||
|  ```bash | ||||
| git clone -b 21.02 https://github.com/kenzok78/luci-theme-argone | ||||
| git clone -b 23 https://github.com/kenzok78/luci-theme-argone | ||||
| ``` | ||||
|  | ||||
| @ -1,11 +1,10 @@ | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2020 Jerryk <jerrykuku@gmail.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -18,7 +17,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/ | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  * | ||||
|  *  Login background | ||||
| @ -315,7 +314,7 @@ li { | ||||
|   position: relative; | ||||
| } | ||||
| .login-page .login-container .login-form .form-login .input-group::before { | ||||
|   font-family: 'argon' !important; | ||||
|   font-family: 'argone' !important; | ||||
|   font-style: normal; | ||||
|   font-weight: normal; | ||||
|   font-variant: normal; | ||||
| @ -633,7 +632,7 @@ footer a { | ||||
|   position: relative; | ||||
| } | ||||
| .main .main-left .nav li.slide .menu::before { | ||||
|   font-family: 'argon' !important; | ||||
|   font-family: 'argone' !important; | ||||
|   font-style: normal; | ||||
|   font-weight: normal; | ||||
|   font-variant: normal; | ||||
| @ -652,7 +651,7 @@ footer a { | ||||
|   position: absolute; | ||||
|   right: 0.5rem; | ||||
|   top: 0.8rem; | ||||
|   font-family: 'argon' !important; | ||||
|   font-family: 'argone' !important; | ||||
|   font-style: normal; | ||||
|   font-weight: normal; | ||||
|   font-variant: normal; | ||||
| @ -949,31 +948,31 @@ form.inline + form.inline, | ||||
| } | ||||
| /* Replace LuCI's default file and folder type icons */ | ||||
| img[src="/luci-static/resources/cbi/reload.gif"] { | ||||
|   content: url("/luci-static/argon/img/reload.webp"); | ||||
|   content: url("/luci-static/argone/img/reload.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/file.gif"] { | ||||
|   content: url("/luci-static/argon/img/file.webp"); | ||||
|   content: url("/luci-static/argone/img/file.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/add.gif"] { | ||||
|   content: url("/luci-static/argon/img/add.webp"); | ||||
|   content: url("/luci-static/argone/img/add.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/remove.gif"] { | ||||
|   content: url("/luci-static/argon/img/remove.webp"); | ||||
|   content: url("/luci-static/argone/img/remove.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/edit.gif"] { | ||||
|   content: url("/luci-static/argon/img/edit.webp"); | ||||
|   content: url("/luci-static/argone/img/edit.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/fieldadd.gif"] { | ||||
|   content: url("/luci-static/argon/img/fieldadd.webp"); | ||||
|   content: url("/luci-static/argone/img/fieldadd.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/link.gif"] { | ||||
|   content: url("/luci-static/argon/img/link.webp"); | ||||
|   content: url("/luci-static/argone/img/link.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/find.gif"] { | ||||
|   content: url("/luci-static/argon/img/find.webp"); | ||||
|   content: url("/luci-static/argone/img/find.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/folder.gif"] { | ||||
|   content: url("/luci-static/argon/img/folder.webp"); | ||||
|   content: url("/luci-static/argone/img/folder.webp"); | ||||
| } | ||||
| /* input */ | ||||
| .cbi-value input[type="password"], | ||||
| @ -1754,7 +1753,7 @@ body.lang_pl.node-main-login .cbi-value-title { | ||||
| .cbi-value-helpicon, | ||||
| .showSide, | ||||
| .main > .loading > span { | ||||
|   font-family: 'argon' !important; | ||||
|   font-family: 'argone' !important; | ||||
|   font-style: normal !important; | ||||
|   font-weight: normal !important; | ||||
|   font-variant: normal !important; | ||||
|  | ||||
| @ -1,11 +1,10 @@ | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2020 Jerryk <jerrykuku@gmail.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -18,7 +17,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/ | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  * | ||||
|  *  Login background | ||||
|  | ||||
| Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB | 
| @ -1,11 +1,10 @@ | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2023 Jerrykuku <jerrykuku@qq.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues
 | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues
 | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -18,7 +17,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/
 | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html
 | ||||
|  * | ||||
|  *  Login background | ||||
| @ -1,11 +1,10 @@ | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2023 Jerrykuku <jerrykuku@qq.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues
 | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues
 | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -18,7 +17,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/
 | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html
 | ||||
|  * | ||||
|  *  Login background | ||||
| @ -1,11 +1,10 @@ | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2023 Jerrykuku <jerrykuku@qq.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues
 | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues
 | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -18,7 +17,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/
 | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html
 | ||||
|  * | ||||
|  *  Login background | ||||
| @ -1,12 +1,11 @@ | ||||
| //  compress: false | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2020 Jerryk <jerrykuku@gmail.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -19,7 +18,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/ | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  * | ||||
|  *  Login background | ||||
| @ -362,7 +361,7 @@ li { | ||||
|                     position: relative; | ||||
|  | ||||
|                     &::before { | ||||
|                         font-family: 'argon' !important; | ||||
|                         font-family: 'argone' !important; | ||||
|                         font-style: normal; | ||||
|                         font-weight: normal; | ||||
|                         font-variant: normal; | ||||
| @ -745,7 +744,7 @@ footer { | ||||
|                         position: relative; | ||||
|  | ||||
|                         &::before { | ||||
|                             font-family: 'argon' !important; | ||||
|                             font-family: 'argone' !important; | ||||
|                             font-style: normal; | ||||
|                             font-weight: normal; | ||||
|                             font-variant: normal; | ||||
| @ -765,7 +764,7 @@ footer { | ||||
|                             position: absolute; | ||||
|                             right: 0.5rem; | ||||
|                             top: 0.8rem; | ||||
|                             font-family: 'argon' !important; | ||||
|                             font-family: 'argone' !important; | ||||
|                             font-style: normal; | ||||
|                             font-weight: normal; | ||||
|                             font-variant: normal; | ||||
| @ -1136,31 +1135,31 @@ form.inline+form.inline, | ||||
|  | ||||
| /* Replace LuCI's default file and folder type icons */ | ||||
| img[src="/luci-static/resources/cbi/reload.gif"] { | ||||
|     content: url("/luci-static/argon/img/reload.webp"); | ||||
|     content: url("/luci-static/argone/img/reload.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/file.gif"] { | ||||
|     content: url("/luci-static/argon/img/file.webp"); | ||||
|     content: url("/luci-static/argone/img/file.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/add.gif"] { | ||||
|     content: url("/luci-static/argon/img/add.webp"); | ||||
|     content: url("/luci-static/argone/img/add.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/remove.gif"] { | ||||
|     content: url("/luci-static/argon/img/remove.webp"); | ||||
|     content: url("/luci-static/argone/img/remove.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/edit.gif"] { | ||||
|     content: url("/luci-static/argon/img/edit.webp"); | ||||
|     content: url("/luci-static/argone/img/edit.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/fieldadd.gif"] { | ||||
|     content: url("/luci-static/argon/img/fieldadd.webp"); | ||||
|     content: url("/luci-static/argone/img/fieldadd.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/link.gif"] { | ||||
|     content: url("/luci-static/argon/img/link.webp"); | ||||
|     content: url("/luci-static/argone/img/link.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/find.gif"] { | ||||
|     content: url("/luci-static/argon/img/find.webp"); | ||||
|     content: url("/luci-static/argone/img/find.webp"); | ||||
| } | ||||
| img[src="/luci-static/resources/cbi/folder.gif"] { | ||||
|     content: url("/luci-static/argon/img/folder.webp"); | ||||
|     content: url("/luci-static/argone/img/folder.webp"); | ||||
| } | ||||
|  | ||||
| /* input */ | ||||
| @ -2120,7 +2119,7 @@ body.lang_pl.node-main-login .cbi-value-title { | ||||
| .cbi-value-helpicon, | ||||
| .showSide, | ||||
| .main>.loading>span { | ||||
|     font-family: 'argon' !important; | ||||
|     font-family: 'argone' !important; | ||||
|     font-style: normal !important; | ||||
|     font-weight: normal !important; | ||||
|     font-variant: normal !important; | ||||
|  | ||||
| @ -1,12 +1,11 @@ | ||||
| //  compress: true | ||||
| /** | ||||
|  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template | ||||
|  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template | ||||
|  * | ||||
|  *  luci-theme-argon | ||||
|  *      Copyright 2020 Jerryk <jerrykuku@gmail.com> | ||||
|  *  luci-theme-argone | ||||
|  * | ||||
|  *  Have a bug? Please create an issue here on GitHub! | ||||
|  *      https://github.com/jerrykuku/luci-theme-argon/issues | ||||
|  *      https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  * | ||||
|  *  luci-theme-bootstrap: | ||||
|  *      Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -19,7 +18,7 @@ | ||||
|  *  luci-theme-material: | ||||
|  *      https://github.com/LuttyYang/luci-theme-material/ | ||||
|  * | ||||
|  *  Argon Theme | ||||
|  *  Argone Theme | ||||
|  *	    https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  * | ||||
|  *  Login background | ||||
|  | ||||
| @ -1,11 +1,10 @@ | ||||
| <%# | ||||
| 	Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material Argon Template | ||||
| 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material Argone Template | ||||
|  | ||||
| 	luci-theme-argon | ||||
| 	Copyright 2020 Jerrykuku <jerrykuku@qq.com> | ||||
| 	luci-theme-argone | ||||
|  | ||||
| 	Have a bug? Please create an issue here on GitHub! | ||||
| 	https://github.com/jerrykuku/luci-theme-argon/issues | ||||
| 	https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  | ||||
| 	luci-theme-bootstrap: | ||||
| 	Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -18,7 +17,7 @@ | ||||
| 	luci-theme-material: | ||||
| 	https://github.com/LuttyYang/luci-theme-material/ | ||||
|  | ||||
| 	Argon Theme | ||||
| 	Argone Theme | ||||
| 	https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  | ||||
| 	Login background | ||||
| @ -43,7 +42,7 @@ | ||||
| 	<div class="ftc"> | ||||
| 		<a class="luci-link" href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %> | ||||
| 			(<%= ver.luciversion %>)</a> / | ||||
| 		<a href="https://github.com/jerrykuku/luci-theme-argon">ArgonTheme <%# vPKG_VERSION %></a> / | ||||
| 		<a href="https://github.com/kenzok78/luci-theme-argone">ArgonTheme <%# vPKG_VERSION %></a> / | ||||
| 		<%= ver.distversion %> | ||||
| 		<% if #categories > 1 then %> | ||||
| 		<ul class="breadcrumb pull-right" id="modemenu"> | ||||
| @ -80,6 +79,6 @@ | ||||
| 		} | ||||
| 	</script> | ||||
|  | ||||
| 	<script src="<%=media%>/js/styles-argon.js<%# ?v=PKG_VERSION %>"></script> | ||||
| 	<script src="<%=media%>/js/styles-argone.js<%# ?v=PKG_VERSION %>"></script> | ||||
| </body> | ||||
| </html> | ||||
|  | ||||
| @ -1,11 +1,10 @@ | ||||
| <%# | ||||
| 	Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template | ||||
| 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argone Template | ||||
|  | ||||
| 	luci-theme-argon | ||||
| 	Copyright 2020 Jerryk <jerrykuku@gmail.com> | ||||
| 	luci-theme-argone | ||||
|  | ||||
| 	Have a bug? Please create an issue here on GitHub! | ||||
| 	https://github.com/jerrykuku/luci-theme-argon/issues | ||||
| 	https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  | ||||
| 	luci-theme-bootstrap: | ||||
| 	Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -15,7 +14,7 @@ | ||||
| 	MUI: | ||||
| 	https://github.com/muicss/mui | ||||
| 	 | ||||
| 	Argon Theme | ||||
| 	Argone Theme | ||||
| 	https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  | ||||
| 	Licensed to the public under the Apache License 2.0 | ||||
| @ -189,17 +188,17 @@ | ||||
|  | ||||
| 	-- Custom settings | ||||
| 	local mode = 'normal' | ||||
| 	local dark_css = fs.readfile('/www/luci-static/argon/css/dark.css') | ||||
| 	local dark_css = fs.readfile('/www/luci-static/argone/css/dark.css') | ||||
| 	local bar_color = '#5e72e4' | ||||
| 	local primary, dark_primary, blur_radius, blur_radius_dark, blur_opacity | ||||
| 	if fs.access('/etc/config/argon') then | ||||
| 		primary = uci:get_first('argon', 'global', 'primary') | ||||
| 		dark_primary = uci:get_first('argon', 'global', 'dark_primary') | ||||
| 		blur_radius = uci:get_first('argon', 'global', 'blur') | ||||
| 		blur_radius_dark = uci:get_first('argon', 'global', 'blur_dark') | ||||
| 		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') | ||||
| 	if fs.access('/etc/config/argone') then | ||||
| 		primary = uci:get_first('argone', 'global', 'primary') | ||||
| 		dark_primary = uci:get_first('argone', 'global', 'dark_primary') | ||||
| 		blur_radius = uci:get_first('argone', 'global', 'blur') | ||||
| 		blur_radius_dark = uci:get_first('argone', 'global', 'blur_dark') | ||||
| 		blur_opacity = uci:get_first('argone', 'global', 'transparency') | ||||
| 		blur_opacity_dark = uci:get_first('argone', 'global', 'transparency_dark') | ||||
| 		mode = uci:get_first('argone', 'global', 'mode') | ||||
| 		bar_color = mode == 'dark' and dark_primary or primary | ||||
| 	end | ||||
| 	 | ||||
| @ -246,7 +245,7 @@ | ||||
| 	<% elseif mode == 'dark' then %> | ||||
| 		<%=dark_css%> | ||||
| 	<% end -%> | ||||
| 	<% if fs.access('/etc/config/argon') then %> | ||||
| 	<% if fs.access('/etc/config/argone') then %> | ||||
| 	:root { | ||||
| 		--primary: <%=primary%>; | ||||
| 		--dark-primary: <%=dark_primary%>; | ||||
| @ -325,6 +324,6 @@ | ||||
| 		var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>; | ||||
| 	</script> | ||||
|  | ||||
| 	<script src="<%=media%>/js/menu-argon.js<%# ?v=PKG_VERSION %>"></script> | ||||
| 	<script src="<%=media%>/js/menu-argone.js<%# ?v=PKG_VERSION %>"></script> | ||||
|  | ||||
| 	<script src="<%=media%>/js/sidebar-argon.js<%# ?v=PKG_VERSION %>"></script> | ||||
| 	<script src="<%=media%>/js/sidebar-argone.js<%# ?v=PKG_VERSION %>"></script> | ||||
|  | ||||
| @ -1,11 +1,10 @@ | ||||
| <%# | ||||
| 	Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template | ||||
| 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argone Template | ||||
|  | ||||
| 	luci-theme-argon | ||||
| 	Copyright 2020 Jerrykuku <jerrykuku@qq.com> | ||||
| 	luci-theme-argone | ||||
|  | ||||
| 	Have a bug? Please create an issue here on GitHub! | ||||
| 	https://github.com/jerrykuku/luci-theme-argon/issues | ||||
| 	https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  | ||||
| 	luci-theme-bootstrap: | ||||
| 	Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -15,7 +14,7 @@ | ||||
| 	MUI: | ||||
| 	https://github.com/muicss/mui | ||||
| 	 | ||||
| 	Argon Theme | ||||
| 	Argone Theme | ||||
| 	https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  | ||||
| 	Licensed to the public under the Apache License 2.0 | ||||
| @ -52,17 +51,17 @@ | ||||
|  | ||||
| 	-- Custom settings | ||||
| 	local mode = 'normal' | ||||
| 	local dark_css = fs.readfile('/www/luci-static/argon/css/dark.css') | ||||
| 	local dark_css = fs.readfile('/www/luci-static/argone/css/dark.css') | ||||
| 	local bar_color = '#5e72e4' | ||||
| 	local primary, dark_primary, blur_radius, blur_radius_dark, blur_opacity | ||||
| 	if fs.access('/etc/config/argon') then | ||||
| 		primary = uci:get_first('argon', 'global', 'primary') | ||||
| 		dark_primary = uci:get_first('argon', 'global', 'dark_primary') | ||||
| 		blur_radius = uci:get_first('argon', 'global', 'blur') | ||||
| 		blur_radius_dark = uci:get_first('argon', 'global', 'blur_dark') | ||||
| 		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') | ||||
| 	if fs.access('/etc/config/argone') then | ||||
| 		primary = uci:get_first('argone', 'global', 'primary') | ||||
| 		dark_primary = uci:get_first('argone', 'global', 'dark_primary') | ||||
| 		blur_radius = uci:get_first('argone', 'global', 'blur') | ||||
| 		blur_radius_dark = uci:get_first('argone', 'global', 'blur_dark') | ||||
| 		blur_opacity = uci:get_first('argone', 'global', 'transparency') | ||||
| 		blur_opacity_dark = uci:get_first('argone', 'global', 'transparency_dark') | ||||
| 		mode = uci:get_first('argone', 'global', 'mode') | ||||
| 		bar_color = mode == 'dark' and dark_primary or primary | ||||
| 	end | ||||
| -%> | ||||
| @ -106,7 +105,7 @@ | ||||
|         <% elseif mode == 'dark' then %> | ||||
|             <%=dark_css%> | ||||
|         <% end -%> | ||||
|         <% if fs.access('/etc/config/argon') then %> | ||||
|         <% if fs.access('/etc/config/argone') then %> | ||||
|         :root { | ||||
|             --primary: <%=primary%>; | ||||
|             --dark-primary: <%=dark_primary%>; | ||||
|  | ||||
| @ -1,11 +1,10 @@ | ||||
| <%# | ||||
| 	Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template | ||||
| 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argone Template | ||||
|  | ||||
| 	luci-theme-argon | ||||
| 	Copyright 2021 Jerryk <jerrykuku@gmail.com> | ||||
| 	luci-theme-argone | ||||
|  | ||||
| 	Have a bug? Please create an issue here on GitHub! | ||||
| 	https://github.com/jerrykuku/luci-theme-argon/issues | ||||
| 	https://github.com/kenzok78/luci-theme-argone/issues | ||||
|  | ||||
| 	luci-theme-bootstrap: | ||||
| 	Copyright 2008 Steven Barth <steven@midlink.org> | ||||
| @ -15,7 +14,7 @@ | ||||
| 	MUI: | ||||
| 	https://github.com/muicss/mui | ||||
|  | ||||
| 	Argon Theme | ||||
| 	Argone Theme | ||||
| 	https://demos.creative-tim.com/argon-dashboard/index.html | ||||
|  | ||||
| 	Licensed to the public under the Apache License 2.0 | ||||
| @ -71,10 +70,10 @@ | ||||
| 		local backgroundType	= "Image" | ||||
| 		local mimeType			= "" | ||||
|  | ||||
| 		if fs.access("/etc/config/argon") then | ||||
| 			local online_wallpaper = uci:get_first('argon', 'global', 'online_wallpaper') or (uci:get_first('argon', 'global', 'bing_background') == '1' and 'bing') | ||||
| 		if fs.access("/etc/config/argone") then | ||||
| 			local online_wallpaper = uci:get_first('argone', 'global', 'online_wallpaper') or (uci:get_first('argone', 'global', 'bing_background') == '1' and 'bing') | ||||
| 			if (online_wallpaper and online_wallpaper ~= "none") then | ||||
| 				local picurl = sys.exec("/usr/libexec/argon/online_wallpaper") | ||||
| 				local picurl = sys.exec("/usr/libexec/argone/online_wallpaper") | ||||
| 				if (picurl and picurl ~= '') then | ||||
| 					return picurl, "Image", "" | ||||
| 				end | ||||
| @ -129,7 +128,7 @@ | ||||
| 	<div class="login-container"> | ||||
| 		<div class="login-form"> | ||||
| 			<!-- Logo Start --> | ||||
| 			<a class="brand" href="/"><img src="<%=media%>/img/argon.svg" class="icon"> | ||||
| 			<a class="brand" href="/"><img src="<%=media%>/img/argone.svg" class="icon"> | ||||
| 				<span class="brand-text"><%=striptags( (boardinfo.hostname or "?") ) %></span> | ||||
| 			</a> | ||||
| 			<!-- Logo End --> | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| #!/bin/sh | ||||
| sed -i ":a;$!N;s/tmpl.render.*sysauth_template.*return/local scope = { duser = default_user, fuser = user }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua | ||||
| sed -i ":a;$!N;s/t.render.*sysauth_template.*return/local scope = { duser = h, fuser = a }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua | ||||
| [ -f /usr/lib/lua/luci/view/themes/argon/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argon/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm | ||||
| [ -f /usr/lib/lua/luci/view/themes/argone/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argone/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm | ||||
| rm -Rf /var/luci-modulecache | ||||
| rm -Rf /var/luci-indexcache | ||||
| uci batch <<-EOF | ||||
|  | ||||
| @ -1,11 +1,11 @@ | ||||
| #!/bin/sh | ||||
| # author jjm2473 | ||||
|  | ||||
| # the script will be excuted when `argon.@global[0].bing_background == '1'` | ||||
| # the script will be excuted when `argone.@global[0].bing_background == '1'` | ||||
| # defaults to 'bing' to be compatible with old config | ||||
| WEB_PIC_SRC=$(uci -q get argon.@global[0].online_wallpaper || echo 'bing') | ||||
| CACHE=/var/run/argon_${WEB_PIC_SRC}.url | ||||
| WRLOCK=/var/lock/argon_${WEB_PIC_SRC}.lock | ||||
| WEB_PIC_SRC=$(uci -q get argone.@global[0].online_wallpaper || echo 'bing') | ||||
| CACHE=/var/run/argone_${WEB_PIC_SRC}.url | ||||
| WRLOCK=/var/lock/argone_${WEB_PIC_SRC}.lock | ||||
|  | ||||
| fetch_pic_url() { | ||||
|     case $WEB_PIC_SRC in | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	![41898282+github-actions[bot]@users.noreply.github.com](/assets/img/avatar_default.png) github-actions[bot]
					github-actions[bot]