Bump version to 1.2

1. Minimal background file size. 2. Automatically detect the number of background images. 3. Delete unused image and file.
lxmicode · Nov 9, 2019 · 782a7a4 · 782a7a4
1 parent 4b0d9c9
commit 782a7a4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git 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
diff --git a/htdocs/luci-static/argon/img/bg2.jpg b/htdocs/luci-static/argon/img/bg2.jpg
diff --git a/htdocs/luci-static/argon/img/bg3.jpg b/htdocs/luci-static/argon/img/bg3.jpg
diff --git a/htdocs/luci-static/argon/img/bg4.jpg b/htdocs/luci-static/argon/img/bg4.jpg
diff --git a/htdocs/luci-static/argon/img/head-icon.png b/htdocs/luci-static/argon/img/head-icon.png
diff --git a/htdocs/luci-static/argon/launch.png b/htdocs/luci-static/argon/launch.png
diff --git 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 <jerrykuku@qq.com>
@@ -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
+
+
 -%>
 <!DOCTYPE html>
 <html lang="<%=luci.i18n.context.lang%>">
@@ -212,7 +211,6 @@
         <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
         <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
         <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
-        <link rel="apple-touch-startup-image" href="<%=media%>/launch.png">
 	<link rel="stylesheet" href="<%=media%>/css/purecss.css">  
 	<link rel="stylesheet" href="<%=media%>/css/style.css?v=<%=math.random(1,100000)%>"> 
 	<link rel="shortcut icon" href="<%=media%>/favicon.ico"> 
@@ -270,7 +268,7 @@
                 </div>
             </header>
 		<div class="darkMask"></div>
-		<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,4)%>.jpg)"></div>
+		<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,bgcount)%>.jpg)"></div>
 		<div id="maincontent">
 			<div class="container">
 				<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>