diff --git a/luci-app-hotplug/Makefile b/luci-app-hotplug/Makefile index 1a45f17b9..daca32198 100644 --- a/luci-app-hotplug/Makefile +++ b/luci-app-hotplug/Makefile @@ -3,10 +3,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-hotplug LUCI_TITLE:=LuCI interface for hotplug configuration -LUCI_DEPENDS:=+luci-base +LUCI_DEPENDS:=+luci-base +hotplug LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-iolines/Makefile b/luci-app-iolines/Makefile index b7f7c712f..0cbe96fdb 100644 --- a/luci-app-iolines/Makefile +++ b/luci-app-iolines/Makefile @@ -3,10 +3,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-iolines LUCI_TITLE:=LuCI I/O switcher -LUCI_DEPENDS:=+luci-base +LUCI_DEPENDS:=+luci-base +iolines LUCI_PKGARCH:=all PKG_VERSION:=0.2.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-report/Makefile b/luci-app-report/Makefile index 80fdf61eb..3de3b9564 100644 --- a/luci-app-report/Makefile +++ b/luci-app-report/Makefile @@ -4,7 +4,7 @@ PKG_NAME:=luci-app-report PKG_LICENSE:=Apache-2.0 LUCI_TITLE:=LuCI report module -LUCI_DEPENDS:=+luci-base +LUCI_DEPENDS:=+luci-base +report LUCI_PKGARCH:=all include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-smscontrol/Makefile b/luci-app-smscontrol/Makefile index ae44b4c86..ff83a13d2 100755 --- a/luci-app-smscontrol/Makefile +++ b/luci-app-smscontrol/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-smscontrol -LUCI_DEPENDS:= +LUCI_DEPENDS:=+smscontrol # Version: .. PKG_VERSION:=0.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 LUCI_TITLE:=LuCI utility to remote control via SMS diff --git a/luci-app-snmpd-ssl/Makefile b/luci-app-snmpd-ssl/Makefile index ec4f6ca32..732e5fc7f 100644 --- a/luci-app-snmpd-ssl/Makefile +++ b/luci-app-snmpd-ssl/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-snmpd-ssl LUCI_TITLE:=Net-SNMP LuCI interface with v3 support -LUCI_DEPENDS:=+luci-base +LUCI_DEPENDS:=+luci-base +snmpd-ssl LUCI_PKGARCH:=all include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-strongswan/Makefile b/luci-app-strongswan/Makefile deleted file mode 100644 index 3905f94cc..000000000 --- a/luci-app-strongswan/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=luci-app-strongswan - -LUCI_TITLE:=LuCI interface for Strongswan configuration -LUCI_DEPENDS:=+luci-base -LUCI_PKGARCH:=all - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-strongswan/htdocs/luci-static/resources/view/strongswan/strongswan.js b/luci-app-strongswan/htdocs/luci-static/resources/view/strongswan/strongswan.js deleted file mode 100644 index 94399527c..000000000 --- a/luci-app-strongswan/htdocs/luci-static/resources/view/strongswan/strongswan.js +++ /dev/null @@ -1,182 +0,0 @@ -'use strict'; -'require fs'; -'require rpc'; -'require uci'; -'require view'; -'require form'; -'require tools.widgets as widgets'; - -return view.extend({ - render: function() { - var m, s, o; - - m = new form.Map('ipsec', _('IPsec (Internet Protocol Security)')); - m.description = _('strongSwan IPsec Configuration'); - - s = m.section(form.GridSection, 'conn', _('Settings')); - s.tab('general', _('General Settings')); - s.tab('phase1', _('Phase 1')); - s.tab('phase2', _('Phase 2')); - s.addremove = true; - s.nodescriptions = true; - - o = s.taboption('general', form.Flag, 'enabled', _('Enabled')); - o.rmempty = false; - - o = s.taboption('general', form.ListValue, 'keyexchange', _('IKE version'), _('Method of key exchange')); - o.default = 'ikev2'; - o.value('ikev1',_('IKEv1')); - o.value('ikev2',_('IKEv2')); - - - o = s.taboption('general', form.ListValue, 'aggressive', _('Mode'), _('ISAKMP (Internet Security Association and Key Management Protocol) phase 1 exchange mode')); - o.default = 'no'; - o.value('no',_('Main')); - o.value('yes',_('Aggressive')); - o.depends({keyexchange: 'ikev1'}); - o.modalonly = true; - - o = s.taboption('general', form.Value, 'psk_key', _('Preshared key'), _('A shared password to authenticate between the peers')); - o.rmempty = false; - o.modalonly = true; - - o = s.taboption('general', form.ListValue, 'leftidtype', _('Local identifier type'), _('Choose one accordingly to your IPSec configuration')); - o.default = 'address'; - o.value('address',_('Address')); - o.value('fqdn',_('FQDN')); - o.value('user_fqdn',_('User FQDN')); - o.modalonly = true; - - o = s.taboption('general', form.Value, 'leftid', _('Local identifier'), _('Set the device identifier for IPSec tunnel')); - o.rmempty = false; - o.modalonly = true; - - o = s.taboption('general', form.DynamicList, 'leftsubnet', _('Local IP address/Subnet mask')); - o.placeholder = '192.168.88.0/24' - o.datatype = 'ipaddr' - o.rmempty = false; - o.modalonly = true; - - o = s.taboption('general', form.ListValue, 'rightidtype', _('Remote identifier type'), _('Choose one accordingly to your IPSec configuration')); - o.default = 'address'; - o.value('address',_('Address')); - o.value('fqdn',_('FQDN')); - o.value('user_fqdn',_('User FQDN')); - o.modalonly = true; - - o = s.taboption('general', form.Value, 'rightid', _('Remote identifier'), _('Set the remote identifier for IPSec tunnel')); - o.rmempty = false; - o.modalonly = true; - - o = s.taboption('general', form.Value, 'right', _('Remote VPN endpoint'), _('Domain name or IP address. Leave empty for any')); - o.datatype = 'host' - o.textvalue = function(section_id) { - if(!uci.get('ipsec', section_id, 'right')) { - return _('any') - } else { - return uci.get('ipsec', section_id, 'right') - } - }; - - o = s.taboption('general', form.DynamicList, 'rightsubnet', _('Remote IP address/Subnet mask'), _('Should differ from local IP address/Subnet mask')); - o.placeholder = '192.168.100.0/24' - o.datatype = 'ipaddr' - o.rmempty = false; - - o = s.taboption('general', form.ListValue, 'dpdaction', _('Dead Peer Detection action')); - o.default = 'restart'; - o.value('none'); - o.value('restart'); - o.rmempty = false; - - o = s.taboption('general', form.Value, 'dpddelay', _('DPD delay (sec)'), _('Delay between peer acknowledgement requests')); - o.default = '30'; - o.datatype = 'and(uinteger, min(0))' - o.rmempty = false; - o.modalonly = true; - o.depends({dpdaction: 'restart'}); - - o = s.taboption('phase1', form.ListValue, 'ike_encryption_algorithm', _('Encryption algorithm'), _('The encryption algorithm must match with another incoming connection to establish IPSec')); - o.default = '3des'; - o.value('des',_('DES')); - o.value('3des',_('3DES')); - o.value('aes128',_('AES128')); - o.value('aes192',_('AES192')); - o.value('aes256',_('AES256')); - o.modalonly = true; - - o = s.taboption('phase1', form.ListValue, 'ike_authentication_algorithm', _('Authentication algorithm'), _('The authentication algorithm must match with another incoming connection to establish IPSec')); - o.default = 'sha1'; - o.value('md5',_('MD5')); - o.value('sha1',_('SHA1')); - o.value('sha256',_('SHA256')); - o.value('sha384',_('SHA384')); - o.value('sha512',_('SHA512')); - o.modalonly = true; - - o = s.taboption('phase1', form.ListValue, 'ike_dh_group', _('DH group'), _('The DH (Diffie-Hellman) group must match with another incoming connection to establish IPSec')); - o.default = 'modp1536'; - o.value('modp768',_('MODP768')); - o.value('modp1024',_('MODP1024')); - o.value('modp1536',_('MODP1536')); - o.value('modp2048',_('MODP2048')); - o.value('modp3072',_('MODP3072')); - o.value('modp4096',_('MODP4096')); - o.modalonly = true; - - o = s.taboption('phase1', form.Value, 'ikelifetime', _('Lifetime'), _('The time duration for phase 1')); - o.datatype = 'and(uinteger, min(0))' - o.default = '8'; - o.modalonly = true; - - o = s.taboption('phase1', form.ListValue, 'ikeletter', _('in')); - o.default = 'h'; - o.value('h',_('hours')); - o.value('m',_('minutes')); - o.value('s',_('seconds')); - o.modalonly = true; - - o = s.taboption('phase2', form.ListValue, 'esp_encryption_algorithm', _('Encryption algorithm'), _('The encryption algorithm must match with another incoming connection to establish IPSec')); - o.default = '3des'; - o.value('des',_('DES')); - o.value('3des',_('3DES')); - o.value('aes128',_('AES128')); - o.value('aes192',_('AES192')); - o.value('aes256',_('AES256')); - o.modalonly = true; - - o = s.taboption('phase2', form.ListValue, 'esp_hash_algorithm', _('Hash algorithm'), _('The hash algorithm must match with another incoming connection to establish IPSec')); - o.default = 'sha1'; - o.value('md5',_('MD5')); - o.value('sha1',_('SHA1')); - o.value('sha256',_('SHA256')); - o.value('sha384',_('SHA384')); - o.value('sha512',_('SHA512')); - o.modalonly = true; - - o = s.taboption('phase2', form.ListValue, 'esp_pfs_group', _('PFS group'), _('The PFS (Perfect Forward Secrecy) group must match with another incoming connection to establish IPSec')); - o.default = 'modp1536'; - o.value('modp768',_('MODP768')); - o.value('modp1024',_('MODP1024')); - o.value('modp1536',_('MODP1536')); - o.value('modp2048',_('MODP2048')); - o.value('modp3072',_('MODP3072')); - o.value('modp4096',_('MODP4096')); - o.value('no_pfs',_('No PFS')); - o.modalonly = true; - - o = s.taboption('phase2', form.Value, 'keylife', _('Lifetime'), _('The time duration for phase 2')); - o.datatype = 'and(uinteger, min(0))' - o.default = '8'; - o.modalonly = true; - - o = s.taboption('phase2', form.ListValue, 'letter', _('in')); - o.default = 'h'; - o.value('h',_('hours')); - o.value('m',_('minutes')); - o.value('s',_('seconds')); - o.modalonly = true; - - return m.render(); - } -}); diff --git a/luci-app-strongswan/po/en/strongswan.po b/luci-app-strongswan/po/en/strongswan.po deleted file mode 100755 index 3750ced99..000000000 --- a/luci-app-strongswan/po/en/strongswan.po +++ /dev/null @@ -1,137 +0,0 @@ -msgid "IPsec Configuration" -msgstr "IPsec Configuration" - -msgid "Enable IPsec (Internet Protocol Security)" -msgstr "Enable IPsec (Internet Protocol Security)" - -msgid "IKE version" -msgstr "IKE version" - -msgid "Method of key exchange" -msgstr "Method of key exchange" - -msgid "ISAKMP (Internet Security Association and Key Management Protocol) phase 1 exchange mode" -msgstr "ISAKMP (Internet Security Association and Key Management Protocol) phase 1 exchange mode" - -msgid "My identifier type" -msgstr "My identifier type" - -msgid "Choose one accordingly to your IPSec configuration" -msgstr "Choose one accordingly to your IPSec configuration" - -msgid "My identifier" -msgstr "My identifier" - -msgid "Set the device identifier for IPSec tunnel" -msgstr "Set the device identifier for IPSec tunnel" - -msgid "Remote identifier type" -msgstr "Remote identifier type" - -msgid "Choose one accordingly to your IPSec configuration" -msgstr "Choose one accordingly to your IPSec configuration" - -msgid "Remote identifier" -msgstr "Remote identifier" - -msgid "Set the remote identifier for IPSec tunnel" -msgstr "Set the remote identifier for IPSec tunnel" - -msgid "The values clear, hold, and restart all activate DPD." -msgstr "The values clear, hold, and restart all activate DPD." - -msgid "Dead Peer Detection" -msgstr "Dead Peer Detection" - -msgid "Pre shared key" -msgstr "Pre shared key" - -msgid "A shared password to authenticate between the peers." -msgstr "A shared password to authenticate between the peers." - -msgid "Remote VPN endpoint" -msgstr "Remote VPN endpoint" - -msgid "Domain name or IP address. Leave empty for any" -msgstr "Domain name or IP address. Leave empty for any" - -msgid "Local IP address/Subnet mask" -msgstr "Local IP address/Subnet mask" - -msgid "Remote IP address/Subnet mask" -msgstr "Remote IP address/Subnet mask" - -msgid "Remote network secure group IP address and mask used to determine to what subnet an IP address belongs to. Range [0 - 32]. IP should differ from device LAN IP" -msgstr "Remote network secure group IP address and mask used to determine to what subnet an IP address belongs to. Range [0 - 32]. IP should differ from device LAN IP" - -msgid "Enable keepalive" -msgstr "Enable keepalive" - -msgid "Enable tunnel keep alive" -msgstr "Enable tunnel keep alive" - -msgid "A host address to which ICMP (Internet Control Message Protocol) echo requests will be sent" -msgstr "A host address to which ICMP (Internet Control Message Protocol) echo requests will be sent" - -msgid "Ping period (sec)" -msgstr "Ping period (sec)" - -msgid "Send ICMP (Internet Control Message Protocol) echo request every x seconds. Range [0 - 9999999]" -msgstr "Send ICMP (Internet Control Message Protocol) echo request every x seconds. Range [0 - 9999999]" - -msgid "The phase must match with another incoming connection to establish IPSec" -msgstr "The phase must match with another incoming connection to establish IPSec" - -msgid "Encryption algorithm" -msgstr "Encryption algorithm" - -msgid "The encryption algorithm must match with another incoming connection to establish IPSec" -msgstr "The encryption algorithm must match with another incoming connection to establish IPSec" - -msgid "The authentication algorithm must match with another incoming connection to establish IPSec" -msgstr "The authentication algorithm must match with another incoming connection to establish IPSec" - -msgid "DH group" -msgstr "DH group" - -msgid "Lifetime" -msgstr "Lifetime" - -msgid "in" -msgstr "in" - -msgid "The DH (Diffie-Hellman) group must match with another incoming connection to establish IPSec" -msgstr "The DH (Diffie-Hellman) group must match with another incoming connection to establish IPSec" - -msgid "The time duration for phase 1" -msgstr "The time duration for phase 1" - -msgid "Phase" -msgstr "Phase" - -msgid "Phase 1" -msgstr "Phase 1" - -msgid "Phase 2" -msgstr "Phase 2" - -msgid "Hash algorithm" -msgstr "Hash algorithm" - -msgid "The hash algorithm must match with another incoming connection to establish IPSec" -msgstr "The hash algorithm must match with another incoming connection to establish IPSec" - -msgid "PFS group" -msgstr "PFS group" - -msgid "The PFS (Perfect Forward Secrecy) group must match with another incoming connection to establish IPSec" -msgstr "The PFS (Perfect Forward Secrecy) group must match with another incoming connection to establish IPSec" - -msgid "The time duration for phase 2" -msgstr "The time duration for phase 2" - -msgid "Name" -msgstr "Name" - -msgid "There are no IPsec configurations yet" -msgstr "There are no IPsec configurations yet" diff --git a/luci-app-strongswan/po/ru/strongswan.po b/luci-app-strongswan/po/ru/strongswan.po deleted file mode 100755 index 6265265bb..000000000 --- a/luci-app-strongswan/po/ru/strongswan.po +++ /dev/null @@ -1,137 +0,0 @@ -msgid "IPsec Configuration" -msgstr "Конфигурация IPsec" - -msgid "Enable IPsec (Internet Protocol Security)" -msgstr "Включить IPsec (Internet Protocol Security)" - -msgid "IKE version" -msgstr "Версия IKE" - -msgid "Method of key exchange" -msgstr "Протокол обмена ключами" - -msgid "ISAKMP (Internet Security Association and Key Management Protocol) phase 1 exchange mode" -msgstr "ISAKMP (Internet Security Association and Key Management Protocol) режим обмена первой фазы" - -msgid "My identifier type" -msgstr "Тип локального идентификатора" - -msgid "Choose one accordingly to your IPSec configuration" -msgstr "Выберите в соответствии с вашей конфигурацией IPsec" - -msgid "My identifier" -msgstr "Локальный идентификатор" - -msgid "Set the device identifier for IPSec tunnel" -msgstr "Укажите локальный идентификатор для IPsec туннеля" - -msgid "Remote identifier type" -msgstr "Тип удаленного идентификатора" - -msgid "Choose one accordingly to your IPSec configuration" -msgstr "Выберите в соответствии с вашей конфигурацией IPsec" - -msgid "Remote identifier" -msgstr "Удаленный идентификатор" - -msgid "Set the remote identifier for IPSec tunnel" -msgstr "Укажите удаленный идентификатор для IPsec туннеля" - -msgid "The values clear, hold, and restart all activate DPD." -msgstr "Использовать DPD" - -msgid "Dead Peer Detection" -msgstr "Dead Peer Detection" - -msgid "Pre shared key" -msgstr "Общий ключ" - -msgid "A shared password to authenticate between the peers." -msgstr "Общий ключ для идентификации между участниками" - -msgid "Remote VPN endpoint" -msgstr "Удаленная точка туннеля" - -msgid "Domain name or IP address. Leave empty for any" -msgstr "Доменное имя или IP адрес. Оставьте пустым для любых входящих соединений" - -msgid "Local IP address/Subnet mask" -msgstr "Локальная подсеть/маска подсети" - -msgid "Remote IP address/Subnet mask" -msgstr "Удаленная подсеть/маска подсети" - -msgid "Remote network secure group IP address and mask used to determine to what subnet an IP address belongs to. Range [0 - 32]. IP should differ from device LAN IP" -msgstr "Подсеть и маска на удаленном устройстве. Диапазон [0-32]. Подсети на локальном и удаленном устройстве не должны совпадать" - -msgid "Enable keepalive" -msgstr "Включить поддержку активности" - -msgid "Enable tunnel keep alive" -msgstr "Включить поддержку активности туннеля" - -msgid "A host address to which ICMP (Internet Control Message Protocol) echo requests will be sent" -msgstr "Адрес хоста, на который будут отправляться эхо-запросы ICMP (Internet Control Message Protocol) " - -msgid "Ping period (sec)" -msgstr "Период отправки ping-запроса (сек)" - -msgid "Send ICMP (Internet Control Message Protocol) echo request every x seconds. Range [0 - 9999999]" -msgstr "Отправлять ICMP (Internet Control Message Protocol) эхо-запросы каждые x секунд. Диапазон [0 - 9999999]" - -msgid "The phase must match with another incoming connection to establish IPSec" -msgstr "Фаза должна совпадать с другим входящим подключением для установки IPSec" - -msgid "Encryption algorithm" -msgstr "Алгоритм шифрования" - -msgid "The encryption algorithm must match with another incoming connection to establish IPSec" -msgstr "Алгоритм шифрования должен совпадать с другим входящим подключением для установки IPSec" - -msgid "The authentication algorithm must match with another incoming connection to establish IPSec" -msgstr "Аутентификационный алгоритм должен совпадать с другим входящим подключением для установки IPSec" - -msgid "DH group" -msgstr "Группа Диффи-Хелмана" - -msgid "Lifetime" -msgstr "Время жизни" - -msgid "in" -msgstr "в" - -msgid "The DH (Diffie-Hellman) group must match with another incoming connection to establish IPSec" -msgstr "Группа Диффи-Хелмана должна совпадать с другим входящим подключением для установки IPSec" - -msgid "The time duration for phase 1" -msgstr "Продолжительность фазы 1" - -msgid "Phase" -msgstr "Фаза" - -msgid "Phase 1" -msgstr "Фаза 1" - -msgid "Phase 2" -msgstr "Фаза 2" - -msgid "Hash algorithm" -msgstr "Алгоритм хэширования" - -msgid "The hash algorithm must match with another incoming connection to establish IPSec" -msgstr "Алгоритм хиширования должен совпадать с другим входящим подключением для установки IPSec" - -msgid "PFS group" -msgstr "Группа PFS" - -msgid "The PFS (Perfect Forward Secrecy) group must match with another incoming connection to establish IPSec" -msgstr "Группа PFS должна совпадать с другим входящим подключением для установки IPSec" - -msgid "The time duration for phase 2" -msgstr "Продолжительность фазы 2" - -msgid "Name" -msgstr "Имя" - -msgid "There are no IPsec configurations yet" -msgstr "Конфигурации IPsec отсутствуют" diff --git a/luci-app-strongswan/root/usr/share/luci/menu.d/luci-app-strongswan.json b/luci-app-strongswan/root/usr/share/luci/menu.d/luci-app-strongswan.json deleted file mode 100644 index 726a59a6f..000000000 --- a/luci-app-strongswan/root/usr/share/luci/menu.d/luci-app-strongswan.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin/vpn/strongswan": { - "title": "IPsec", - "action": { - "type": "view", - "path": "strongswan/strongswan" - }, - "depends": { - "acl": [ "luci-app-strongswan" ], - "uci": { "ipsec": true } - } - } -} diff --git a/luci-app-strongswan/root/usr/share/rpcd/acl.d/luci-app-strongswan.json b/luci-app-strongswan/root/usr/share/rpcd/acl.d/luci-app-strongswan.json deleted file mode 100644 index 110ad4e72..000000000 --- a/luci-app-strongswan/root/usr/share/rpcd/acl.d/luci-app-strongswan.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "luci-app-strongswan": { - "description": "Grant UCI access for luci-app-strongswan", - "read": { - "uci": [ "ipsec" ] - }, - "write": { - "uci": [ "ipsec" ] - } - } -} diff --git a/luci-app-xl2tpd/Makefile b/luci-app-xl2tpd/Makefile index 472ceb30d..5e4fe99a6 100755 --- a/luci-app-xl2tpd/Makefile +++ b/luci-app-xl2tpd/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-xl2tpd LUCI_TITLE:=xl2tpd server configuration -LUCI_DEPENDS:=+luci-base +LUCI_DEPENDS:=+luci-base +xl2tpd-ext +ppp-mod-pppol2tp LUCI_PKGARCH:=all include $(TOPDIR)/feeds/luci/luci.mk 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..dbef3ac86 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" %>