diff --git a/package/ctcgfw/luci-theme-argon/Makefile b/package/ctcgfw/luci-theme-argon/Makefile index ad22b80701..c8833c4cfc 100644 --- a/package/ctcgfw/luci-theme-argon/Makefile +++ b/package/ctcgfw/luci-theme-argon/Makefile @@ -7,14 +7,15 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme -LUCI_DEPENDS:=+luasocket -PKG_VERSION:=2.2.3 -PKG_RELEASE:=20200820 +LUCI_DEPENDS:= +PKG_VERSION:=2.2.4 +PKG_RELEASE:=20200821 include $(TOPDIR)/feeds/luci/luci.mk define Package/luci-theme-argon/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 [ -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 diff --git a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css index 8e7e0862f7..c99a95f63e 100644 --- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css +++ b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css @@ -330,6 +330,18 @@ hr { .login-page .volume-control.mute { background-image: url(../img/volume_off.svg); } +.login-page .main-bg { + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + background-image: url(../img/blank.png); + background-repeat: no-repeat; + background-position: center; + background-size: cover; + transition: all 0.5s; +} .login-page .login-container { height: 100%; margin-left: 4.5rem; diff --git a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less index 07fc7f0b57..96e3864bea 100644 --- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less +++ b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less @@ -392,6 +392,19 @@ hr { } } + .main-bg{ + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + background-image: url(../img/blank.png); + background-repeat: no-repeat; + background-position: center; + background-size: cover; + transition: all 0.5s; + } + .login-container { height: 100%; margin-left: 4.5rem; diff --git a/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/footer.htm b/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/footer.htm index f9a7bbf7fc..cdb46bb85d 100644 --- a/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/footer.htm +++ b/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/footer.htm @@ -43,5 +43,4 @@ - - + \ No newline at end of file diff --git a/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm b/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm index 072829633f..f5f5ce57ce 100644 --- a/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm +++ b/package/ctcgfw/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm @@ -71,7 +71,6 @@
- + <% else %> +
+ style="background-image:url(<%=bg_url%>)" + <% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then %> + style="background-image:url(<%=currentBg.url%>)" + <% end %> + >
+ <% end %>
@@ -115,32 +133,6 @@ input.focus(); //]]> <% - if (bgcount == 0 ) then - local bingjson = "{}" - local http = require "socket.http" - local bing = http.request("http://www.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=en-US") - if (bing and bing ~= '') then - bingjson = bing - end - %> - - <% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then%> - - <% - end - local uci = require "luci.model.uci".cursor() local fs = require "nixio.fs" local https_key = uci:get("uhttpd", "main", "key")