diff --git a/luci-app-pingcontrol/Makefile b/luci-app-pingcontrol/Makefile index daa83f206..07946683c 100755 --- a/luci-app-pingcontrol/Makefile +++ b/luci-app-pingcontrol/Makefile @@ -2,8 +2,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-pingcontrol LUCI_DEPENDS:=+pingcontrol + PKG_VERSION:=1 -PKG_RELEASE:=1 + +PKG_RELEASE:=2 LUCI_TITLE:=LuCI network interface control diff --git a/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js b/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js index 6228cb8f2..679f1a179 100644 --- a/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js +++ b/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js @@ -43,9 +43,6 @@ return view.extend({ o = s.taboption('general',form.DynamicList, 'testip', _('IP address or hostname of test servers')); o.datatype = 'or(hostname,ipaddr("nomask"))'; - o = s.taboption('general',form.Flag, 'ping_silent', _('Silent mode'), _('Do not log success ping')); - - o = s.taboption('general',form.Value, 'check_period', _('Period of check, sec')); o.rmempty = false; o.datatype = 'and(uinteger,min(20))'; diff --git a/luci-app-pingcontrol/po/ru/pingcontrol.po b/luci-app-pingcontrol/po/ru/pingcontrol.po index b004f13ff..dd951ee41 100755 --- a/luci-app-pingcontrol/po/ru/pingcontrol.po +++ b/luci-app-pingcontrol/po/ru/pingcontrol.po @@ -10,12 +10,6 @@ msgstr "Интерфейс для ping-запросов" msgid "IP address or hostname of test servers" msgstr "IP-адрес или имя хоста тестовых серверов" -msgid "Silent mode" -msgstr "Тихий режим" - -msgid "Do not log success ping" -msgstr "Не журналировать успешные попытки" - msgid "Failed attempts before iface up/down" msgstr "Количество неудачных попыток до переподключения интерфейса" diff --git a/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json b/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json index c024342b5..a994f5029 100644 --- a/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json +++ b/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json @@ -1,6 +1,7 @@ { "admin/services/pingcontrol": { "title": "Pingcontrol", + "order": 30, "action": { "type": "view", "path": "pingcontrol/pingcontrol" diff --git a/luci-theme-teleofis/Makefile b/luci-theme-teleofis/Makefile index bc2114390..8e5be1239 100644 --- a/luci-theme-teleofis/Makefile +++ b/luci-theme-teleofis/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Bootstrap Teleofis Theme -LUCI_DEPENDS:= +luci-lua-runtime +LUCI_DEPENDS:= PKG_LICENSE:=Apache-2.0 diff --git a/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css b/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css index 691ffc5c2..8a6304a63 100644 --- a/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css +++ b/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css @@ -14,109 +14,6 @@ * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ -:root { - --background-color-delta-l-sign: -1; - --background-color-h: 0; - --background-color-s: 0%; - --background-color-l: 100%; - - --background-color-high-hsl: - var(--background-color-h), - var(--background-color-s), - var(--background-color-l); - --background-color-high: hsl(var(--background-color-high-hsl)); - - --background-color-medium-hsl: - var(--background-color-h), - var(--background-color-s), - calc(var(--background-color-l) + var(--background-color-delta-l-sign) * calc(6 / 255 * 100%)); - --background-color-medium: hsl(var(--background-color-medium-hsl)); - - --background-color-low-hsl: - var(--background-color-h), - var(--background-color-s), - calc(var(--background-color-l) + var(--background-color-delta-l-sign) * calc(10 / 255 * 100%)); - --background-color-low: hsl(var(--background-color-low-hsl)); - - --text-color-delta-l-sign: 1; - --text-color-h: 0; - --text-color-s: 0%; - --text-color-l: 0%; - - --text-color-highest-hsl: - var(--text-color-h), - var(--text-color-s), - var(--text-color-l); - --text-color-highest: hsl(var(--text-color-highest-hsl)); - - --text-color-high-hsl: - var(--text-color-h), - var(--text-color-s), - calc(var(--text-color-l) + var(--text-color-delta-l-sign) * calc(64 / 255 * 100%)); - --text-color-high: hsl(var(--text-color-high-hsl)); - - --text-color-medium-hsl: - var(--text-color-h), - var(--text-color-s), - calc(var(--text-color-l) + var(--text-color-delta-l-sign) * calc(128 / 255 * 100%)); - --text-color-medium: hsl(var(--text-color-medium-hsl)); - - --text-color-low-hsl: - var(--text-color-h), - var(--text-color-s), - calc(var(--text-color-l) + var(--text-color-delta-l-sign) * calc(191 / 255 * 100%)); - --text-color-low: hsl(var(--text-color-low-hsl)); - - --border-color-delta-l-sign: -1; - --border-color-h: var(--background-color-h); - --border-color-s: var(--background-color-s); - --border-color-l: var(--background-color-l); - - --border-color-high-hsl: - var(--border-color-h), - var(--border-color-s), - calc(var(--border-color-l) + var(--border-color-delta-l-sign) * calc(51 / 255 * 100%)); - --border-color-high: hsl(var(--border-color-high-hsl)); - - --border-color-medium-hsl: - var(--border-color-h), - var(--border-color-s), - calc(var(--border-color-l) + var(--border-color-delta-l-sign) * calc(34 / 255 * 100%)); - --border-color-medium: hsl(var(--border-color-medium-hsl)); - - --border-color-low-hsl: - var(--border-color-h), - var(--border-color-s), - calc(var(--border-color-l) + var(--border-color-delta-l-sign) * calc(17 / 255 * 100%)); - --border-color-low: hsl(var(--border-color-low-hsl)); - - --primary-color-high: #1976d2; - --primary-color-medium: #1564c0; - --primary-color-low: #b00000; - --on-primary-color: var(--background-color-high); - - --error-color-high-rgb: 246, 43, 18; - --error-color-high: rgb(var(--error-color-high-rgb)); - --error-color-medium: #e8210d; - --error-color-low: #d00000; - --on-error-color: var(--background-color-high); - - --success-color-high-rgb: 0, 172, 89; - --success-color-high: rgb(var(--success-color-high-rgb)); - --success-color-medium: #009a4c; - --success-color-low: #007936; - --on-success-color: var(--background-color-high); - - --warn-color-high: #efbd0b; - --warn-color-medium: #f0c629; - --warn-color-low: #f2d24f; - --on-warn-color: var(--text-color-highest); - - --disabled-opacity: .7; - - color-scheme: light; -} - * { margin: 0; padding: 0; @@ -1760,15 +1657,14 @@ input[type="text"] + .cbi-button-remove { transition: opacity .25s ease-in; } - .cbi-progressbar { - border: 1px solid var(--border-color-high); + border: 1px solid #ccc; border-radius: 3px; position: relative; min-width: 170px; - height: 8px; - margin: 1.4em 0 4px 0; - background: #fcfcfc; + height: 20px; + margin: 4px 0; + background: #f9f9f9; } .cbi-progressbar > div { @@ -1776,13 +1672,16 @@ input[type="text"] + .cbi-button-remove { height: 100%; transition: width .25s ease-in; width: 0%; - border-radius: 2px; } -.cbi-progressbar::before { +.cbi-progressbar::after { position: absolute; - top: -1.4em; + bottom: 0; + top: 0; + right: 0; left: 0; + text-align: center; + text-shadow: 0 0 2px #fff; content: attr(title); white-space: pre; overflow: hidden; @@ -2417,7 +2316,7 @@ html body.apply-overlay-active { bottom: 0; width: 32px; content: " "; - background: url(../resources/icons/loading.svg) no-repeat center; + background: url(../resources/icons/loading.gif) no-repeat center; background-size: 16px; } diff --git a/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm b/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm index 7a6b5fadc..d15dfa367 100644 --- a/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm +++ b/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm @@ -8,7 +8,7 @@ <% local ver = require "luci.version" %>