diff --git a/package/ctcgfw/luci-theme-argonv3/Makefile b/package/ctcgfw/luci-theme-argonv3/Makefile index 5c6383b01d..e7b235b85d 100644 --- a/package/ctcgfw/luci-theme-argonv3/Makefile +++ b/package/ctcgfw/luci-theme-argonv3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=1.1 -PKG_RELEASE:=01-20190809 +PKG_VERSION:=1.3 +PKG_RELEASE:=01-20191111 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css index c10fa81ab7..990adf7cbc 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css @@ -2912,7 +2912,7 @@ header > .container > .pull-right > * { border-radius: 60px; border: #fff 3px solid; - background-image:url(../img/head-icon.png); + background-image:url(../head-icon.jpg); background-size:cover; box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(156, 39, 176, 0.4); diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/head-icon.jpg b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/head-icon.jpg new file mode 100644 index 0000000000..dbb2abd430 Binary files /dev/null and b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/head-icon.jpg differ diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg index 00adf6378b..87641a8e4b 100644 Binary files a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg and b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg differ diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg index 2fd939574e..d9699ea49b 100644 Binary files a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg and b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg differ diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg index d32ddef24a..16f7bd7ded 100644 Binary files a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg and b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg differ diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg index c4f768455c..26a52a5351 100644 Binary files a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg and b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg differ diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/head-icon.png b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/head-icon.png deleted file mode 100644 index 21c155d954..0000000000 Binary files a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/img/head-icon.png and /dev/null differ diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/launch.png b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/launch.png deleted file mode 100644 index 9d0fe522e8..0000000000 Binary files a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/launch.png and /dev/null differ diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/header.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/header.htm index 43c4f0a66b..e6efcff1e6 100644 --- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/header.htm +++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/header.htm @@ -1,5 +1,5 @@ <%# - Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template + Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template luci-theme-argon Copyright 2019 Jerrykuku @@ -14,19 +14,10 @@ MUI: https://github.com/muicss/mui - - luci-theme-material: - https://github.com/LuttyYang/luci-theme-material/ Agron Theme https://demos.creative-tim.com/argon-dashboard/index.html - Login background - https://unsplash.com/ - - Font generate by Icomoon - https://icomoon.io/ - Licensed to the public under the Apache License 2.0 -%> @@ -35,6 +26,8 @@ local util = require "luci.util" local http = require "luci.http" local disp = require "luci.dispatcher" + local fs = require "nixio.fs" + local nutil = require "nixio.util" local boardinfo = util.ubus("system", "board") @@ -54,6 +47,15 @@ local c = tree local i, r + function glob(...) + local iter, code, msg = fs.glob(...) + if iter then + return nutil.consume(iter) + else + return nil, code, msg + end + end + -- tag all nodes leading to this page for i, r in ipairs(request) do if c.nodes and c.nodes[r] then @@ -189,6 +191,13 @@ end math.randomseed(os.time()) + + local bgcount = 0 + for f in ipairs(glob("/www/luci-static/argon/img/*")) do + bgcount = bgcount + 1 + end + + -%> @@ -212,7 +221,6 @@ - @@ -270,7 +278,7 @@
-
+
<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>