diff --git a/autoinstall/autoinstall.sh b/autoinstall/autoinstall.sh index 88c2338..b1ec90b 100755 --- a/autoinstall/autoinstall.sh +++ b/autoinstall/autoinstall.sh @@ -11,7 +11,7 @@ LUCI_APP=1 OWRT_VERSION="19.07" RUAB_VERSION="0.9.0-2" RUAB_MOD_LUA_VERSION="0.9.0-2" -RUAB_LUCI_APP_VERSION="0.9.0-5" +RUAB_LUCI_APP_VERSION="0.9.0-6" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/ruantiblock_openwrt/master" PKG_DIR="/tmp" diff --git a/luci-app-ruantiblock/Makefile b/luci-app-ruantiblock/Makefile index 6c6a7d5..5a6ed70 100644 --- a/luci-app-ruantiblock/Makefile +++ b/luci-app-ruantiblock/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_VERSION:=0.9.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 LUCI_TITLE:=LuCI support for ruantiblock LUCI_DEPENDS:=+ruantiblock +luci-mod-admin-full LUCI_PKGARCH:=all diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/abstract-log.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/abstract-log.js index eb95a7a..1c0e098 100644 --- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/abstract-log.js +++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/abstract-log.js @@ -3,13 +3,18 @@ document.head.append(E('style', {'type': 'text/css'}, ` +:root { + --app-log-dark-font-color: #2e2e2e; + --app-log-light-font-color: #fff; + --app-log-debug-font-color: #737373; +} .log-entry-empty { } .log-entry-number { min-width: 4em !important; } .log-entry-time { - min-width: 14em !important; + min-width: 15em !important; } .log-entry-host { min-width: 10em !important; @@ -35,40 +40,75 @@ document.head.append(E('style', {'type': 'text/css'}, } .log-emerg { background-color: #a93734 !important; - color: #fff; + color: var(--app-log-light-font-color); } log-emerg .td { - color: #fff !important; + color: var(--app-log-light-font-color) !important; } log-emerg td { - color: #fff !important; + color: var(--app-log-light-font-color) !important; } .log-alert { background-color: #ff7968 !important; - color: #fff; + color: var(--app-log-light-font-color); } .log-alert .td { - color: #fff !important; + color: var(--app-log-light-font-color) !important; } .log-alert td { - color: #fff !important; + color: var(--app-log-light-font-color) !important; } .log-crit { background-color: #fcc3bf !important; + color: var(--app-log-dark-font-color) !important; +} +.log-crit .td { + color: var(--app-log-dark-font-color) !important; +} +.log-crit td { + color: var(--app-log-dark-font-color) !important; } .log-err { background-color: #ffe9e8 !important; + color: var(--app-log-dark-font-color) !important; +} +.log-err .td { + color: var(--app-log-dark-font-color) !important; +} +.log-err td { + color: var(--app-log-dark-font-color) !important; } .log-warn { background-color: #fff7e2 !important; + color: var(--app-log-dark-font-color) !important; +} +.log-warn .td { + color: var(--app-log-dark-font-color) !important; +} +.log-warn td { + color: var(--app-log-dark-font-color) !important; } .log-notice { background-color: #e3ffec !important; + color: var(--app-log-dark-font-color) !important; +} +.log-notice .td { + color: var(--app-log-dark-font-color) !important; +} +.log-notice td { + color: var(--app-log-dark-font-color) !important; } .log-info { } .log-debug { background-color: #ebf6ff !important; + color: var(--app-log-debug-font-color) !important; +} +.log-debug .td { + color: var(--app-log-debug-font-color) !important; +} +.log-debug td { + color: var(--app-log-debug-font-color) !important; } .log-highlight-item { background-color: #ffef00; @@ -76,7 +116,7 @@ log-emerg td { .log-entries-count { margin: 0 0 5px 5px; font-weight: bold; - opacity: 0.6; + opacity: 0.7; } .log-entries-count-level { display: inline-block !important; diff --git a/packages/19.07/luci-app-ruantiblock_0.9.0-5_all.ipk b/packages/19.07/luci-app-ruantiblock_0.9.0-5_all.ipk deleted file mode 100644 index 6ccf48e..0000000 Binary files a/packages/19.07/luci-app-ruantiblock_0.9.0-5_all.ipk and /dev/null differ diff --git a/packages/19.07/luci-app-ruantiblock_0.9.0-6_all.ipk b/packages/19.07/luci-app-ruantiblock_0.9.0-6_all.ipk new file mode 100644 index 0000000..fb04f95 Binary files /dev/null and b/packages/19.07/luci-app-ruantiblock_0.9.0-6_all.ipk differ diff --git a/packages/19.07/luci-i18n-ruantiblock-ru_0.9.0-5_all.ipk b/packages/19.07/luci-i18n-ruantiblock-ru_0.9.0-5_all.ipk deleted file mode 100644 index cb13414..0000000 Binary files a/packages/19.07/luci-i18n-ruantiblock-ru_0.9.0-5_all.ipk and /dev/null differ diff --git a/packages/19.07/luci-i18n-ruantiblock-ru_0.9.0-6_all.ipk b/packages/19.07/luci-i18n-ruantiblock-ru_0.9.0-6_all.ipk new file mode 100644 index 0000000..6bd0e6b Binary files /dev/null and b/packages/19.07/luci-i18n-ruantiblock-ru_0.9.0-6_all.ipk differ