luci-theme-argon-mod: add package

CONTRIBUTED.md

@@ -48,7 +48,8 @@ luci-theme-argon-mc source: [sypopo/luci-theme-argon-mc](https://github.com/sypo
 luci-app-cupsd source: [F-Light/luci-app-cupsd](https://github.com/F-Light/luci-app-cupsd).<br/>
 ootoc-OpenWRT source: [ElonH/ootoc-OpenWRT](https://github.com/ElonH/ootoc-OpenWRT).<br/>
 r8168 source: [BROBIRD/openwrt-r8168](https://github.com/BROBIRD/openwrt-r8168).<br/>
-luci-theme-Butterfly-dark source: [Leo-Jo-My/luci-theme-Butterfly-dark](https://github.com/Leo-Jo-My/luci-theme-Butterfly-dark).
+luci-theme-Butterfly-dark source: [Leo-Jo-My/luci-theme-Butterfly-dark](https://github.com/Leo-Jo-My/luci-theme-Butterfly-dark).<br/>
+luci-theme-argon-mod source: [Leo-Jo-My/luci-theme-argon-mod](https://github.com/Leo-Jo-My/luci-theme-argon-mod).
 
 ## License
 ### Depending on their own License.

package/ctcgfw/luci-theme-argon-mod/Makefile

@@ -6,10 +6,10 @@
 
 include $(TOPDIR)/rules.mk
 
-LUCI_TITLE:=Argon Dark Mod Theme
+LUCI_TITLE:=Argon Mod Theme
 LUCI_DEPENDS:=
-PKG_VERSION:=1.4
-PKG_RELEASE:=02-20200101
+PKG_VERSION:=1.5
+PKG_RELEASE:=08-20191221
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

package/ctcgfw/luci-theme-argon-mod/htdocs/luci-static/argon_dark/css/style.css

@@ -800,16 +800,36 @@ header>.container>.brand {
 }
 .main > .main-left > .nav > .slide > .menu[data-title= Control ]:before{
     content: "\e90e";
-    color: #f3a4b5!important;
+    color: #afdd22!important;
 }
 .main > .main-left > .nav > .slide > .menu[data-title= VPN ]:before{
     content: "\e90b";
     color: #6de9ea!important;
 }
+.main > .main-left > .nav > .slide > .menu[data-title= QOS ]:before{
+    content: "\e905";
+    color: #FF00FF!important;
+    
+}
+.main > .main-left > .nav > .slide > a[data-title="Docker"]:before {
+    content: "\e907";
+    color: #66CC00!important;
+  
+}
+.main > .main-left > .nav > .slide > .menu[data-title= 新春版客户端 ]:before{
+    content: "\e904";
+    color: #FF00FF!important;
+    
+}
 .main > .main-left > .nav > .slide > .menu[data-title= Network ]:before{
     content: "\e908";
     color: #8965e0!important;
 }
+.main > .main-left > .nav > .slide > .menu[data-title= QOS ]:before{
+    content: "\e903";
+    color: #FF00FF!important;
+    
+}
 .main > .main-left > .nav > .slide > .menu[data-title= Bandwidth_Monitor ]:before{
     content: "\e90d";
     color: #2dce89!important;
@@ -2574,4 +2594,4 @@ body.lang_pl.node-main-login .cbi-value-title {
 	.cbi-value-field .cbi-input-select {
 		min-width: 25rem;
 	}
-}
+}

package/ctcgfw/luci-theme-argon-mod/htdocs/luci-static/argon_dark_purple/css/style.css

@@ -801,7 +801,21 @@ header>.container>.brand {
 }
 .main > .main-left > .nav > .slide > .menu[data-title= Control ]:before{
     content: "\e90e";
-    color: #f3a4b5!important;
+    color: #afdd22!important;
+}
+.main > .main-left > .nav > .slide > .menu[data-title= QOS ]:before{
+    content: "\e904";
+    color: #FF00FF!important;
+}  
+.main > .main-left > .nav > .slide > a[data-title="Docker"]:before {
+    content: "\e907";
+    color: #66CC00!important;
+  
+}
+.main > .main-left > .nav > .slide > .menu[data-title= 新春版客户端 ]:before{
+    content: "\e904";
+    color: #FF00FF!important;
+    
 }
 .main > .main-left > .nav > .slide > .menu[data-title= VPN ]:before{
     content: "\e90b";
@@ -836,13 +850,15 @@ header>.container>.brand:before {
 }
 
 .main>.main-left>.nav>.slide>.menu.active {
-	color: #e8c6c6;
+	color: #00e500;
 	background: #7764e43b;
 }
 
 .main>.main-left>.nav>.slide>.slide-menu>li {}
 
-.main>.main-left>.nav>.slide>.slide-menu>.active {}
+.main>.main-left>.nav>.slide>.slide-menu>.active {
+
+}
 
 .main>.main-left>.nav>.slide>.slide-menu>li>a {
 	margin: 0.1rem .5rem;
@@ -850,15 +866,16 @@ header>.container>.brand:before {
 	text-decoration: none;
 	border-radius: .375rem;
 	white-space: nowrap;
-	color: #be9e9e;
-	border-left: transparent 12px solid;
+	color: #c0ebd7;
+	border-left: transparent 3px solid;
 	transition: all 0.2s;
 }
 
 .main>.main-left>.nav>.slide>.slide-menu>.active>a {
-	/* border-left: #ffffff 15px solid; */
+	/* border-left: #ffffff 3px solid; */
+       
 	color: #FF9800;
-	background-color: #607d8b54;
+	background-color: #5e72e4;
 }
 
 .main>.main-left>.nav>.slide>.slide-menu>li>a:hover {
@@ -2571,4 +2588,4 @@ body.lang_pl.node-main-login .cbi-value-title {
 	.cbi-value-field .cbi-input-select {
 		min-width: 25rem;
 	}
-}
+}

package/ctcgfw/luci-theme-argon-mod/luasrc/view/themes/argon_light/header.htm

@@ -174,12 +174,9 @@
 		-- calculate the number of unsaved changes
 		if tree.nodes[category] and tree.nodes[category].ucidata then
 			local ucichanges = 0
+			local i, j
 			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
-				for k, l in pairs(j) do
-					for m, n in pairs(l) do
-						ucichanges = ucichanges + 1;
-					end
-				end
+				ucichanges = ucichanges + #j
 			end
 
 			if ucichanges > 0 then
@@ -196,7 +193,7 @@
 	math.randomseed(os.time())
 	
 	local bgcount = 0
-	for f in ipairs(glob("/www/luci-static/argon_light/img/*")) do
+	for f in ipairs(glob("/www/luci-static/argon_mc1/img/*")) do
 		bgcount = bgcount + 1
 	end
 	

package/ctcgfw/luci-theme-argon-mod/luasrc/view/themes/argon_light_green/header.htm

@@ -174,12 +174,9 @@
 		-- calculate the number of unsaved changes
 		if tree.nodes[category] and tree.nodes[category].ucidata then
 			local ucichanges = 0
+			local i, j
 			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
-				for k, l in pairs(j) do
-					for m, n in pairs(l) do
-						ucichanges = ucichanges + 1;
-					end
-				end
+				ucichanges = ucichanges + #j
 			end
 
 			if ucichanges > 0 then
@@ -196,7 +193,7 @@
 	math.randomseed(os.time())
 	
 	local bgcount = 0
-	for f in ipairs(glob("/www/luci-static/argon_light_green/img/*")) do
+	for f in ipairs(glob("/www/luci-static/argon_mc1/img/*")) do
 		bgcount = bgcount + 1
 	end
 	

package/ctcgfw/luci-theme-argon-mod/root/etc/uci-defaults/30_luci-theme-argon-mod

@@ -0,0 +1,11 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.themes.Argon_Light=/luci-static/argon_light
+	set luci.themes.Argon_Light_Green=/luci-static/argon_light_green
+	set luci.themes.Argon_Dark=/luci-static/argon_dark
+	set luci.themes.Argon_Dark_Purple=/luci-static/argon_dark_purple
+	delete luci.themes.Argon_MC1
+	delete luci.themes.Argon_MC2
+	commit luci
+EOF
+exit 0

package/lienol/luci-theme-argon-dark-mod/root/etc/uci-defaults/30_luci-theme-argon-dark-mod

@@ -1,7 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-	set luci.themes.Argon_Dark=/luci-static/argon_dark
-	set luci.themes.Argon_Dark_Purple=/luci-static/argon_dark_purple
-	commit luci
-EOF
-exit 0

package/lienol/luci-theme-argon-light-mod/Makefile

@@ -1,16 +0,0 @@
-# Copyright (C) 2008-2019 Jerrykuku
-# Copyright (C) 2019-2020 Lienol <lawlienol@gmail.com>
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=Argon Light Mod Theme
-LUCI_DEPENDS:=
-PKG_VERSION:=1.4
-PKG_RELEASE:=03-20200101
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature

package/lienol/luci-theme-argon-light-mod/root/etc/uci-defaults/30_luci-theme-argon-light-mod

@@ -1,7 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-	set luci.themes.Argon_Light=/luci-static/argon_light
-	set luci.themes.Argon_Light_Green=/luci-static/argon_light_green
-	commit luci
-EOF
-exit 0