update-01.11

This commit is contained in:
github-actions[bot] 2022-01-11 22:43:10 +08:00
parent 542da162b0
commit b68909b616
22 changed files with 10103 additions and 10109 deletions

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2008-2019 kenzok78uku
# Copyright (C) 2008-2019 Jerrykuku
#
# This is free software, licensed under the Apache License, Version 2.0 .
#
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Argonne kenzo
LUCI_DEPENDS:=
PKG_VERSION:=1.7.2
PKG_RELEASE:=20220109
PKG_RELEASE:=20211009
include $(TOPDIR)/feeds/luci/luci.mk
@ -18,7 +18,7 @@ define Package/luci-theme-argonne/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/argonne/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argonne/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm
[ -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
rm -Rf /var/luci-modulecache
rm -Rf /var/luci-indexcache
exit 0

View File

@ -2,10 +2,7 @@
* Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template
*
* luci-theme-argonne
* Copyright 2020 kenzok78 <jerrykuku@gmail.com>
*
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argonne/issues
* Copyright 2021 kenzo <kenzok78@gmail.com>
*
* luci-theme-bootstrap:
* Copyright 2008 Steven Barth <steven@midlink.org>
@ -19,7 +16,7 @@
* https://github.com/LuttyYang/luci-theme-material/
*
* Agron Theme
* https://demos.creative-tim.com/argonne-dashboard/index.html
* https://demos.creative-tim.com/argon-dashboard/index.html
*
* Login background
* https://unsplash.com/
@ -315,7 +312,7 @@ li {
position: relative;
}
.login-page .login-container .login-form .form-login .input-group::before {
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
@ -633,7 +630,7 @@ footer a {
position: relative;
}
.main .main-left .nav li.slide .menu::before {
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
@ -652,7 +649,7 @@ footer a {
position: absolute;
right: 0.5rem;
top: 0.8rem;
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
@ -1634,7 +1631,7 @@ body.lang_pl.node-main-login .cbi-value-title {
.cbi-value-helpicon,
.showSide,
.main > .loading > span {
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;

View File

@ -1,11 +1,11 @@
/**
* Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template
* Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
*
* luci-theme-argonne
* Copyright 2020 kenzok78 <jerrykuku@gmail.com>
* luci-theme-argon
* Copyright 2020 Jerryk <jerrykuku@gmail.com>
*
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argonne/issues
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-bootstrap:
* Copyright 2008 Steven Barth <steven@midlink.org>
@ -19,7 +19,7 @@
* https://github.com/LuttyYang/luci-theme-material/
*
* Agron Theme
* https://demos.creative-tim.com/argonne-dashboard/index.html
* https://demos.creative-tim.com/argon-dashboard/index.html
*
* Login background
* https://unsplash.com/
@ -47,12 +47,12 @@
/* ICON Font */
@font-face {
font-family: 'argonne';
src: url('../fonts/argonne.eot?u6kthm');
src: url('../fonts/argonne.eot?u6kthm#iefix') format('embedded-opentype'),
url('../fonts/argonne.ttf?u6kthm') format('truetype'),
url('../fonts/argonne.woff?u6kthm') format('woff'),
url('../fonts/argonne.svg?u6kthm#argonne') format('svg');
font-family: 'argon';
src: url('../fonts/argon.eot?u6kthm');
src: url('../fonts/argon.eot?u6kthm#iefix') format('embedded-opentype'),
url('../fonts/argon.ttf?u6kthm') format('truetype'),
url('../fonts/argon.woff?u6kthm') format('woff'),
url('../fonts/argon.svg?u6kthm#argon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@ -61,7 +61,7 @@
[class^="icon-"],
[class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;

View File

@ -3,7 +3,7 @@
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="argonne" horiz-adv-x="1024">
<font id="argon" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
<missing-glyph horiz-adv-x="1024" />
<glyph unicode="&#x20;" horiz-adv-x="512" d="" />

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -1,11 +1,11 @@
/**
* Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template
* Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
*
* luci-theme-argonne
* Copyright 2019 kenzok78uku <jerrykuku@qq.com>
* luci-theme-argon
* Copyright 2019 Jerrykuku <jerrykuku@qq.com>
*
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argonne/issues
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-bootstrap:
* Copyright 2008 Steven Barth <steven@midlink.org>
@ -19,7 +19,7 @@
* https://github.com/LuttyYang/luci-theme-material/
*
* Agron Theme
* https://demos.creative-tim.com/argonne-dashboard/index.html
* https://demos.creative-tim.com/argon-dashboard/index.html
*
* Login background
* https://unsplash.com/

View File

@ -1,12 +1,12 @@
// compress: false
/**
* Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template
* Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
*
* luci-theme-argonne
* Copyright 2020 kenzok78 <jerrykuku@gmail.com>
* luci-theme-argon
* Copyright 2020 Jerryk <jerrykuku@gmail.com>
*
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argonne/issues
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-bootstrap:
* Copyright 2008 Steven Barth <steven@midlink.org>
@ -20,7 +20,7 @@
* https://github.com/LuttyYang/luci-theme-material/
*
* Agron Theme
* https://demos.creative-tim.com/argonne-dashboard/index.html
* https://demos.creative-tim.com/argon-dashboard/index.html
*
* Login background
* https://unsplash.com/
@ -362,7 +362,7 @@ li {
position: relative;
&::before {
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
@ -745,7 +745,7 @@ footer {
position: relative;
&::before {
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
@ -765,7 +765,7 @@ footer {
position: absolute;
right: 0.5rem;
top: 0.8rem;
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
@ -1989,7 +1989,7 @@ body.lang_pl.node-main-login .cbi-value-title {
.cbi-value-helpicon,
.showSide,
.main>.loading>span {
font-family: 'argonne' !important;
font-family: 'argon' !important;
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;

View File

@ -1,12 +1,12 @@
// compress: true
/**
* Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template
* Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
*
* luci-theme-argonne
* Copyright 2020 kenzok78 <jerrykuku@gmail.com>
* luci-theme-argon
* Copyright 2020 Jerryk <jerrykuku@gmail.com>
*
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argonne/issues
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-bootstrap:
* Copyright 2008 Steven Barth <steven@midlink.org>
@ -20,7 +20,7 @@
* https://github.com/LuttyYang/luci-theme-material/
*
* Agron Theme
* https://demos.creative-tim.com/argonne-dashboard/index.html
* https://demos.creative-tim.com/argon-dashboard/index.html
*
* Login background
* https://unsplash.com/

View File

@ -1,11 +1,8 @@
<%#
Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template
argonnene is a clean HTML5 theme for LuCI. It is based on luci-theme-material and argonnene Template
luci-theme-argonne
Copyright 2019 kenzok78uku <kenzok78@qq.com>
Have a bug? Please create an issue here on GitHub!
https://github.com/kenzok78/luci-theme-argonne/issues
luci-theme-argonnene
Copyright 2021 kenzo <kenzok78@gmail.com>
luci-theme-bootstrap:
Copyright 2008 Steven Barth <steven@midlink.org>
@ -19,7 +16,7 @@
https://github.com/LuttyYang/luci-theme-material/
Agron Theme
https://demos.creative-tim.com/argonne-dashboard/index.html
https://demos.creative-tim.com/argonnene-dashboard/index.html
Login background
https://unsplash.com/
@ -43,7 +40,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/kenzok78/luci-theme-argonne">ArgonneTheme <%# vPKG_VERSION %></a> /
<a href="https://github.com/kenzok78/luci-theme-argonne">argonneTheme <%# vPKG_VERSION %></a> /
<%= ver.distversion %>
<% if #categories > 1 then %>
<ul class="breadcrumb pull-right" id="modemenu">

View File

@ -1,11 +1,11 @@
<%#
Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argonne Template
Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and argonne Template
luci-theme-argonne
Copyright 2020 kenzok78 <kenzok78@gmail.com>
Copyright 2021 kenzo <kenzok78@gmail.com>
Have a bug? Please create an issue here on GitHub!
https://github.com/kenzok78/luci-theme-argonne/issues
https://github.com/jerrykuku/luci-theme-argonne/issues
luci-theme-bootstrap:
Copyright 2008 Steven Barth <steven@midlink.org>

View File

@ -1,11 +1,11 @@
<%#
Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argonne Template
Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and argonne Template
luci-theme-argonne
Copyright 2020 kenzok78 <kenzok78@gmail.com>
Copyright 2021 kenzo <kenzok78@gmail.com>
Have a bug? Please create an issue here on GitHub!
https://github.com/kenzok78/luci-theme-argonne/issues
https://github.com/jerrykuku/luci-theme-argonne/issues
luci-theme-bootstrap:
Copyright 2008 Steven Barth <steven@midlink.org>

View File

@ -2,10 +2,10 @@
Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argonne Template
luci-theme-argonne
Copyright 2020 kenzok78 <kenzok78@gmail.com>
Copyright 2021 kenzo <kenzok78@gmail.com>
Have a bug? Please create an issue here on GitHub!
https://github.com/kenzok78/luci-theme-argonne/issues
https://github.com/jerrykuku/luci-theme-argonne/issues
luci-theme-bootstrap:
Copyright 2008 Steven Barth <steven@midlink.org>

View File

@ -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/argonne/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argonne/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm
[ -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
rm -Rf /var/luci-modulecache
rm -Rf /var/luci-indexcache
uci batch <<-EOF