diff --git a/luci-theme-argonne/Makefile b/luci-theme-argonne/Makefile index 2758df01c..7b794a26e 100644 --- a/luci-theme-argonne/Makefile +++ b/luci-theme-argonne/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2019 Jerrykuku +# Copyright (C) 2008-2019 kenzok78 # # This is free software, licensed under the Apache License, Version 2.0 . # @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argonne kenzo LUCI_DEPENDS:=+curl +jsonfilter PKG_VERSION:=1.7.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.eot b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.eot index e28f6db55..c8dbc1ae5 100644 Binary files a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.eot and b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.eot differ diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.svg b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.svg index 1e12b5f6a..e683b615c 100644 --- a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.svg +++ b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.ttf b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.ttf index 3d062dcf2..5c818ff85 100644 Binary files a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.ttf and b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.ttf differ diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.woff b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.woff index ef1e9c2c4..470509b0e 100644 Binary files a/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.woff and b/luci-theme-argonne/htdocs/luci-static/argonne/fonts/argonne.woff differ diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/js/sidebar-argonne.js b/luci-theme-argonne/htdocs/luci-static/argonne/js/sidebar-argonne.js index 0be354086..0d774041c 100644 --- a/luci-theme-argonne/htdocs/luci-static/argonne/js/sidebar-argonne.js +++ b/luci-theme-argonne/htdocs/luci-static/argonne/js/sidebar-argonne.js @@ -1,63 +1,63 @@ -/** - * Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template - * - * luci-theme-argonne - * - * Have a bug? Please create an issue here on GitHub! - * https://github.com/kenzok78/luci-theme-argonne/issues - * - * luci-theme-bootstrap: - * Copyright 2008 Steven Barth - * Copyright 2008 Jo-Philipp Wich - * Copyright 2012 David Menting - * - * MUI: - * https://github.com/muicss/mui - * - * luci-theme-material: - * https://github.com/LuttyYang/luci-theme-material/ - * - * Argonne Theme - * https://demos.creative-tim.com/argon-dashboard/index.html - * - * Login background - * https://unsplash.com/ - * - * Licensed to the public under the Apache License 2.0 - */ - - /** - * Sidebar expand - */ - var showSide = false; - $(".showSide").click(function () { - if (showSide) { - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").width(0); - $(".main-right").css("overflow-y", "auto"); - showSide = false; - } else { - $(".darkMask").stop(true).fadeIn("fast"); - $(".main-left").width("15rem"); - $(".main-right").css("overflow-y", "hidden"); - showSide = true; - } - }); - - $(".darkMask").click(function () { - if (showSide) { - showSide = false; - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").width(0); - $(".main-right").css("overflow-y", "auto"); - } - }); - - $(window).resize(function () { - if ($(window).width() > 921) { - $(".main-left").css("width", ""); - $(".darkMask").stop(true); - $(".darkMask").css("display", "none"); - showSide = false; - } - }); +/** + * Argonne is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argonne Template + * + * luci-theme-argonne + * + * Have a bug? Please create an issue here on GitHub! + * https://github.com/kenzok78/luci-theme-argonne/issues + * + * luci-theme-bootstrap: + * Copyright 2008 Steven Barth + * Copyright 2008 Jo-Philipp Wich + * Copyright 2012 David Menting + * + * MUI: + * https://github.com/muicss/mui + * + * luci-theme-material: + * https://github.com/LuttyYang/luci-theme-material/ + * + * Argonne Theme + * https://demos.creative-tim.com/argon-dashboard/index.html + * + * Login background + * https://unsplash.com/ + * + * Licensed to the public under the Apache License 2.0 + */ + + /** + * Sidebar expand + */ + var showSide = false; + $(".showSide").click(function () { + if (showSide) { + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").width(0); + $(".main-right").css("overflow-y", "auto"); + showSide = false; + } else { + $(".darkMask").stop(true).fadeIn("fast"); + $(".main-left").width("15rem"); + $(".main-right").css("overflow-y", "hidden"); + showSide = true; + } + }); + + $(".darkMask").click(function () { + if (showSide) { + showSide = false; + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").width(0); + $(".main-right").css("overflow-y", "auto"); + } + }); + + $(window).resize(function () { + if ($(window).width() > 921) { + $(".main-left").css("width", ""); + $(".darkMask").stop(true); + $(".darkMask").css("display", "none"); + showSide = false; + } + }); diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/less/cascade.less b/luci-theme-argonne/htdocs/luci-static/argonne/less/cascade.less index 475bef82a..0fb11c8fc 100644 --- a/luci-theme-argonne/htdocs/luci-static/argonne/less/cascade.less +++ b/luci-theme-argonne/htdocs/luci-static/argonne/less/cascade.less @@ -5,7 +5,7 @@ * luci-theme-argonne * * Have a bug? Please create an issue here on GitHub! - * https://github.com/jerrykuku/luci-theme-argonne/issues + * https://github.com/kenzok78/luci-theme-argonne/issues * * luci-theme-bootstrap: * Copyright 2008 Steven Barth diff --git a/luci-theme-argonne/htdocs/luci-static/argonne/less/dark.less b/luci-theme-argonne/htdocs/luci-static/argonne/less/dark.less index b8397c15d..75b681527 100644 --- a/luci-theme-argonne/htdocs/luci-static/argonne/less/dark.less +++ b/luci-theme-argonne/htdocs/luci-static/argonne/less/dark.less @@ -5,7 +5,7 @@ * luci-theme-argonne * * Have a bug? Please create an issue here on GitHub! - * https://github.com/jerrykuku/luci-theme-argonne/issues + * https://github.com/kenzok78/luci-theme-argonne/issues * * luci-theme-bootstrap: * Copyright 2008 Steven Barth diff --git a/luci-theme-argonne/root/usr/libexec/argonne/online_wallpaper b/luci-theme-argonne/root/usr/libexec/argonne/online_wallpaper index 241c31d0b..ad9270c16 100755 --- a/luci-theme-argonne/root/usr/libexec/argonne/online_wallpaper +++ b/luci-theme-argonne/root/usr/libexec/argonne/online_wallpaper @@ -1,11 +1,11 @@ #!/bin/sh # author jjm2473 -# the script will be excuted when `argon.@global[0].bing_background == '1'` +# the script will be excuted when `argonne.@global[0].bing_background == '1'` # defaults to 'bing' to be compatible with old config -WEB_PIC_SRC=$(uci -q get argon.@global[0].online_wallpaper || echo 'bing') -CACHE=/var/run/argon_${WEB_PIC_SRC}.url -WRLOCK=/var/lock/argon_${WEB_PIC_SRC}.lock +WEB_PIC_SRC=$(uci -q get argonne.@global[0].online_wallpaper || echo 'bing') +CACHE=/var/run/argonne_${WEB_PIC_SRC}.url +WRLOCK=/var/lock/argonne_${WEB_PIC_SRC}.lock fetch_pic_url() { case $WEB_PIC_SRC in