diff --git a/README.md b/README.md index 0388791..9d70c9e 100644 --- a/README.md +++ b/README.md @@ -20,22 +20,22 @@ Internet-detector is an application for checking the availability of the Interne ## Installation notes: opkg update - wget --no-check-certificate -O /tmp/internet-detector_1.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector_1.6.3-r1_all.ipk - opkg install /tmp/internet-detector_1.6.3-r1_all.ipk - rm /tmp/internet-detector_1.6.3-r1_all.ipk + wget --no-check-certificate -O /tmp/internet-detector_1.6.4-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector_1.6.4-r1_all.ipk + opkg install /tmp/internet-detector_1.6.4-r1_all.ipk + rm /tmp/internet-detector_1.6.4-r1_all.ipk service internet-detector start service internet-detector enable - wget --no-check-certificate -O /tmp/luci-app-internet-detector_1.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_1.6.3-r1_all.ipk - opkg install /tmp/luci-app-internet-detector_1.6.3-r1_all.ipk - rm /tmp/luci-app-internet-detector_1.6.3-r1_all.ipk + wget --no-check-certificate -O /tmp/luci-app-internet-detector_1.6.4-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_1.6.4-r1_all.ipk + opkg install /tmp/luci-app-internet-detector_1.6.4-r1_all.ipk + rm /tmp/luci-app-internet-detector_1.6.4-r1_all.ipk service rpcd restart i18n-ru: - wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_1.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_1.6.3-r1_all.ipk - opkg install /tmp/luci-i18n-internet-detector-ru_1.6.3-r1_all.ipk - rm /tmp/luci-i18n-internet-detector-ru_1.6.3-r1_all.ipk + wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_1.6.4-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_1.6.4-r1_all.ipk + opkg install /tmp/luci-i18n-internet-detector-ru_1.6.4-r1_all.ipk + rm /tmp/luci-i18n-internet-detector-ru_1.6.4-r1_all.ipk ## Screenshots: @@ -47,9 +47,9 @@ i18n-ru: **Dependences:** modemmanager. - wget --no-check-certificate -O /tmp/internet-detector-mod-modem-restart_1.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector-mod-modem-restart_1.6.3-r1_all.ipk - opkg install /tmp/internet-detector-mod-modem-restart_1.6.3-r1_all.ipk - rm /tmp/internet-detector-mod-modem-restart_1.6.3-r1_all.ipk + wget --no-check-certificate -O /tmp/internet-detector-mod-modem-restart_1.6.4-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector-mod-modem-restart_1.6.4-r1_all.ipk + opkg install /tmp/internet-detector-mod-modem-restart_1.6.4-r1_all.ipk + rm /tmp/internet-detector-mod-modem-restart_1.6.4-r1_all.ipk service internet-detector restart ![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/04.jpg) @@ -58,9 +58,9 @@ i18n-ru: **Dependences:** mailsend. - wget --no-check-certificate -O /tmp/internet-detector-mod-email_1.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector-mod-email_1.6.3-r1_all.ipk - opkg install /tmp/internet-detector-mod-email_1.6.3-r1_all.ipk - rm /tmp/internet-detector-mod-email_1.6.3-r1_all.ipk + wget --no-check-certificate -O /tmp/internet-detector-mod-email_1.6.4-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector-mod-email_1.6.4-r1_all.ipk + opkg install /tmp/internet-detector-mod-email_1.6.4-r1_all.ipk + rm /tmp/internet-detector-mod-email_1.6.4-r1_all.ipk service internet-detector restart ![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/05.jpg) @@ -69,9 +69,9 @@ i18n-ru: **Dependences:** curl. - wget --no-check-certificate -O /tmp/internet-detector-mod-telegram_1.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector-mod-telegram_1.6.3-r1_all.ipk - opkg install /tmp/internet-detector-mod-telegram_1.6.3-r1_all.ipk - rm /tmp/internet-detector-mod-telegram_1.6.3-r1_all.ipk + wget --no-check-certificate -O /tmp/internet-detector-mod-telegram_1.6.4-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector-mod-telegram_1.6.4-r1_all.ipk + opkg install /tmp/internet-detector-mod-telegram_1.6.4-r1_all.ipk + rm /tmp/internet-detector-mod-telegram_1.6.4-r1_all.ipk service internet-detector restart ![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/06.jpg) diff --git a/internet-detector-mod-email/Makefile b/internet-detector-mod-email/Makefile index fb7ee39..754d1f1 100644 --- a/internet-detector-mod-email/Makefile +++ b/internet-detector-mod-email/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=internet-detector-mod-email -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot diff --git a/internet-detector-mod-modem-restart/Makefile b/internet-detector-mod-modem-restart/Makefile index 86ef149..bd4e5de 100644 --- a/internet-detector-mod-modem-restart/Makefile +++ b/internet-detector-mod-modem-restart/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=internet-detector-mod-modem-restart -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot diff --git a/internet-detector-mod-telegram/Makefile b/internet-detector-mod-telegram/Makefile index 2138338..1a85c50 100644 --- a/internet-detector-mod-telegram/Makefile +++ b/internet-detector-mod-telegram/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=internet-detector-mod-telegram -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot diff --git a/internet-detector/Makefile b/internet-detector/Makefile index c05be25..5b73091 100644 --- a/internet-detector/Makefile +++ b/internet-detector/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=internet-detector -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot diff --git a/internet-detector/files/etc/config/internet-detector b/internet-detector/files/etc/config/internet-detector index b32405a..3663853 100644 --- a/internet-detector/files/etc/config/internet-detector +++ b/internet-detector/files/etc/config/internet-detector @@ -5,6 +5,7 @@ config main 'config' config instance 'internet' option enabled '1' + option description 'Default instance' list hosts '8.8.8.8' list hosts '1.1.1.1' option check_type '0' diff --git a/luci-app-internet-detector/Makefile b/luci-app-internet-detector/Makefile index cb07f28..f96d46e 100644 --- a/luci-app-internet-detector/Makefile +++ b/luci-app-internet-detector/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-internet-detector -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 LUCI_TITLE:=LuCI support for internet-detector LUCI_DEPENDS:=+internet-detector diff --git a/luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js b/luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js index 6a33ea9..af3fb8d 100644 --- a/luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js +++ b/luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js @@ -762,14 +762,11 @@ return view.extend({ list.value(2000, '2 ' + _('sec')); } - // enabled - o = s.taboption('main', form.Flag, 'enabled', - _('Enabled'), - ); - o.rmempty = false; - o.default = '1'; - o.editable = true; - o.modalonly = false; + // description + o = s.taboption('main', form.Value, 'description', + _("Description")); + o.datatype = 'maxlength(30)'; + o.modalonly = null; // hosts o = s.taboption('main', form.DynamicList, @@ -869,6 +866,15 @@ return view.extend({ o.value(10, '10 ' + _('sec')); o.default = '2'; + // enabled + o = s.taboption('main', form.Flag, 'enabled', + _('Enabled'), + ); + o.rmempty = false; + o.default = '1'; + o.editable = true; + o.modalonly = false; + /* Modules */ diff --git a/luci-app-internet-detector/po/ru/internet-detector.po b/luci-app-internet-detector/po/ru/internet-detector.po index 6c2d07a..614da4d 100644 --- a/luci-app-internet-detector/po/ru/internet-detector.po +++ b/luci-app-internet-detector/po/ru/internet-detector.po @@ -112,6 +112,9 @@ msgstr "Отладка" msgid "Default port value for TCP connections." msgstr "Стандартное значение порта для TCP-подключений." +msgid "Description" +msgstr "Описание" + msgid "Device" msgstr "Устройство" diff --git a/luci-app-internet-detector/po/templates/internet-detector.pot b/luci-app-internet-detector/po/templates/internet-detector.pot index 2f41b6d..9c6749c 100644 --- a/luci-app-internet-detector/po/templates/internet-detector.pot +++ b/luci-app-internet-detector/po/templates/internet-detector.pot @@ -99,6 +99,9 @@ msgstr "" msgid "Default port value for TCP connections." msgstr "" +msgid "Description" +msgstr "" + msgid "Device" msgstr "" diff --git a/screenshots/01.jpg b/screenshots/01.jpg index cef637f..6a95e18 100644 Binary files a/screenshots/01.jpg and b/screenshots/01.jpg differ