diff --git a/Makefile b/Makefile index 5c6383b..95a88f1 100644 --- a/Makefile +++ b/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.2 +PKG_RELEASE:=01-20191109 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/htdocs/luci-static/argon/img/bg1.jpg b/htdocs/luci-static/argon/img/bg1.jpg index 00adf63..87641a8 100644 Binary files a/htdocs/luci-static/argon/img/bg1.jpg and b/htdocs/luci-static/argon/img/bg1.jpg differ diff --git a/htdocs/luci-static/argon/img/bg2.jpg b/htdocs/luci-static/argon/img/bg2.jpg index 2fd9395..d9699ea 100644 Binary files a/htdocs/luci-static/argon/img/bg2.jpg and b/htdocs/luci-static/argon/img/bg2.jpg differ diff --git a/htdocs/luci-static/argon/img/bg3.jpg b/htdocs/luci-static/argon/img/bg3.jpg index d32ddef..16f7bd7 100644 Binary files a/htdocs/luci-static/argon/img/bg3.jpg and b/htdocs/luci-static/argon/img/bg3.jpg differ diff --git a/htdocs/luci-static/argon/img/bg4.jpg b/htdocs/luci-static/argon/img/bg4.jpg index c4f7684..26a52a5 100644 Binary files a/htdocs/luci-static/argon/img/bg4.jpg and b/htdocs/luci-static/argon/img/bg4.jpg differ diff --git a/htdocs/luci-static/argon/img/head-icon.png b/htdocs/luci-static/argon/img/head-icon.png deleted file mode 100644 index 21c155d..0000000 Binary files a/htdocs/luci-static/argon/img/head-icon.png and /dev/null differ diff --git a/htdocs/luci-static/argon/launch.png b/htdocs/luci-static/argon/launch.png deleted file mode 100644 index 9d0fe52..0000000 Binary files a/htdocs/luci-static/argon/launch.png and /dev/null differ diff --git a/luasrc/view/themes/argon/header.htm b/luasrc/view/themes/argon/header.htm index 43c4f0a..89fe6c4 100644 --- a/luasrc/view/themes/argon/header.htm +++ b/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,7 @@ local util = require "luci.util" local http = require "luci.http" local disp = require "luci.dispatcher" + local fs = require "luci.fs" local boardinfo = util.ubus("system", "board") @@ -189,6 +181,13 @@ end math.randomseed(os.time()) + + local bgcount = 0 + for f in ipairs(fs.glob("/www/luci-static/argon/img/*")) do + bgcount = bgcount + 1 + end + + -%> @@ -212,7 +211,6 @@ - @@ -270,7 +268,7 @@
-
+
<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>