diff --git a/themes/luci-theme-argon/Makefile b/themes/luci-theme-argon-mod/Makefile similarity index 92% rename from themes/luci-theme-argon/Makefile rename to themes/luci-theme-argon-mod/Makefile index 3a21984d..658d58ee 100644 --- a/themes/luci-theme-argon/Makefile +++ b/themes/luci-theme-argon-mod/Makefile @@ -6,15 +6,15 @@ include $(TOPDIR)/rules.mk -LUCI_TITLE:=Argon Theme +LUCI_TITLE:=Argon Mod Theme LUCI_DEPENDS:= PKG_VERSION:=1.7.3 -PKG_RELEASE:=20220615 +PKG_RELEASE:=20220421 include $(TOPDIR)/feeds/luci/luci.mk -define Package/luci-theme-argon/postinst +define Package/luci-theme-argon-mod/postinst #!/bin/sh sed -i ":a;$!N;s/tmpl.render.*sysauth_template.*return/local scope = { duser = default_user, fuser = user }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua sed -i ":a;$!N;s/t.render.*sysauth_template.*return/local scope = { duser = h, fuser = a }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/cascade.css similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/cascade.css diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/css/dark.css b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/dark.css similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/css/dark.css rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/dark.css diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/css/fonts.css b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/fonts.css similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/css/fonts.css rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/fonts.css diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/css/pure-min.css b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/pure-min.css similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/css/pure-min.css rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/css/pure-min.css diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/favicon.ico b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/favicon.ico similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/favicon.ico rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/favicon.ico diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.eot b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.eot similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.eot rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.eot diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.svg b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.svg similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.svg rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.svg diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.ttf b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.ttf similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.ttf rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.ttf diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.woff b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.woff similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/TypoGraphica.woff rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/TypoGraphica.woff diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.eot b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.eot similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.eot rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.eot diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.svg b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.svg similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.svg rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.svg diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.ttf b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.ttf similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.ttf rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.ttf diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.woff b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.woff similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.woff rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/fonts/argon.woff diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/android-icon-192x192.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/android-icon-192x192.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/android-icon-192x192.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/android-icon-192x192.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/apple-icon-144x144.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/apple-icon-144x144.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/apple-icon-144x144.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/apple-icon-144x144.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/apple-icon-60x60.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/apple-icon-60x60.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/apple-icon-60x60.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/apple-icon-60x60.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/apple-icon-72x72.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/apple-icon-72x72.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/apple-icon-72x72.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/apple-icon-72x72.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/browserconfig.xml b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/browserconfig.xml similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/browserconfig.xml rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/browserconfig.xml diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/favicon-16x16.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/favicon-16x16.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/favicon-16x16.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/favicon-16x16.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/favicon-32x32.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/favicon-32x32.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/favicon-32x32.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/favicon-32x32.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/favicon-96x96.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/favicon-96x96.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/favicon-96x96.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/favicon-96x96.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/manifest.json b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/manifest.json similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/manifest.json rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/manifest.json diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/icon/ms-icon-144x144.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/ms-icon-144x144.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/icon/ms-icon-144x144.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/icon/ms-icon-144x144.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/img/argon.svg b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/argon.svg similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/img/argon.svg rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/argon.svg diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/img/bg1.jpg b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/bg1.jpg similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/img/bg1.jpg rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/bg1.jpg diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/img/blank.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/blank.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/img/blank.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/blank.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/img/trafficbar.png b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/trafficbar.png similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/img/trafficbar.png rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/trafficbar.png diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/img/volume_high.svg b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/volume_high.svg similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/img/volume_high.svg rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/volume_high.svg diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/img/volume_off.svg b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/volume_off.svg similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/img/volume_off.svg rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/img/volume_off.svg diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/js/jquery.min.js b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/js/jquery.min.js similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/js/jquery.min.js rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/js/jquery.min.js diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/js/script.js b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/js/script.js similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/js/script.js rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/js/script.js diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/less/cascade.less similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/less/cascade.less diff --git a/themes/luci-theme-argon/htdocs/luci-static/argon/less/dark.less b/themes/luci-theme-argon-mod/htdocs/luci-static/argon/less/dark.less similarity index 100% rename from themes/luci-theme-argon/htdocs/luci-static/argon/less/dark.less rename to themes/luci-theme-argon-mod/htdocs/luci-static/argon/less/dark.less diff --git a/themes/luci-theme-argon/luasrc/view/themes/argon/footer.htm b/themes/luci-theme-argon-mod/luasrc/view/themes/argon/footer.htm similarity index 100% rename from themes/luci-theme-argon/luasrc/view/themes/argon/footer.htm rename to themes/luci-theme-argon-mod/luasrc/view/themes/argon/footer.htm diff --git a/themes/luci-theme-argon/luasrc/view/themes/argon/header.htm b/themes/luci-theme-argon-mod/luasrc/view/themes/argon/header.htm similarity index 100% rename from themes/luci-theme-argon/luasrc/view/themes/argon/header.htm rename to themes/luci-theme-argon-mod/luasrc/view/themes/argon/header.htm diff --git a/themes/luci-theme-argon/luasrc/view/themes/argon/header_login.htm b/themes/luci-theme-argon-mod/luasrc/view/themes/argon/header_login.htm similarity index 100% rename from themes/luci-theme-argon/luasrc/view/themes/argon/header_login.htm rename to themes/luci-theme-argon-mod/luasrc/view/themes/argon/header_login.htm diff --git a/themes/luci-theme-argon/luasrc/view/themes/argon/out_header_login.htm b/themes/luci-theme-argon-mod/luasrc/view/themes/argon/out_header_login.htm similarity index 100% rename from themes/luci-theme-argon/luasrc/view/themes/argon/out_header_login.htm rename to themes/luci-theme-argon-mod/luasrc/view/themes/argon/out_header_login.htm diff --git a/themes/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm b/themes/luci-theme-argon-mod/luasrc/view/themes/argon/sysauth.htm similarity index 100% rename from themes/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm rename to themes/luci-theme-argon-mod/luasrc/view/themes/argon/sysauth.htm diff --git a/themes/luci-theme-argon/root/etc/uci-defaults/90_luci-theme-argon b/themes/luci-theme-argon-mod/root/etc/uci-defaults/90_luci-theme-argon similarity index 95% rename from themes/luci-theme-argon/root/etc/uci-defaults/90_luci-theme-argon rename to themes/luci-theme-argon-mod/root/etc/uci-defaults/90_luci-theme-argon index 326c8fcb..951ad663 100644 --- a/themes/luci-theme-argon/root/etc/uci-defaults/90_luci-theme-argon +++ b/themes/luci-theme-argon-mod/root/etc/uci-defaults/90_luci-theme-argon @@ -6,6 +6,7 @@ rm -Rf /var/luci-modulecache rm -Rf /var/luci-indexcache uci batch <<-EOF set luci.themes.Argon=/luci-static/argon + set luci.main.mediaurlbase=/luci-static/argon commit luci EOF exit 0 \ No newline at end of file