diff options
35 files changed, 1104 insertions, 794 deletions
diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po index 1e2598f382..ae2262084a 100644 --- a/applications/luci-app-ddns/po/es/ddns.po +++ b/applications/luci-app-ddns/po/es/ddns.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-ddns 2.4.0-1\n" "POT-Creation-Date: 2016-01-30 11:07+0100\n" -"PO-Revision-Date: 2019-02-21 17:24-0300\n" +"PO-Revision-Date: 2019-04-20 20:11-0300\n" "Last-Translator: José Vicente <josevteg@gmail.com>\n" "Language-Team: \n" "Language: es\n" @@ -282,7 +282,7 @@ msgstr "" #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:609 msgid "Enable secure communication with DDNS provider" -msgstr "Habilitar la comunicación segura con el proveedor de DDNS" +msgstr "Habilita la comunicación segura con el proveedor de DDNS" #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:271 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua:153 @@ -444,8 +444,8 @@ msgid "" "If this service section is disabled it could not be started.<br />Neither " "from LuCI interface nor from console" msgstr "" -"Si esta sección de servicio está deshabilitada, no se pudo iniciar.<br />Ni " -"desde la interfaz de LuCI ni desde la consola" +"Si no se habilita esta opción, no se iniciará el servicio.<br />Ni desde la " +"interfaz de LuCI ni desde la consola" #: applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua:160 msgid "If using secure communication you should verify server certificates!" @@ -837,7 +837,7 @@ msgstr "" #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:600 msgid "Use HTTP Secure" -msgstr "Usar HTTP seguro" +msgstr "Usar HTTP seguro (HTTPS)" #: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:113 msgid "Use cURL" diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po index 67d93ac408..7020f85541 100644 --- a/applications/luci-app-firewall/po/es/firewall.po +++ b/applications/luci-app-firewall/po/es/firewall.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-30 17:00+0200\n" -"PO-Revision-Date: 2019-03-27 14:22-0300\n" +"PO-Revision-Date: 2019-04-20 20:26-0300\n" "Last-Translator: José Vicente <josevteg@gmail.com>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -697,11 +697,12 @@ msgid "" "<em>not</em> imply a permission to forward from wan to lan as well." msgstr "" "Estas opciones controlan las políticas de reenvío entre esta zona (%s) y " -"otras. <em>Las zonas origen</em> cubren el tráfico reenviado <strong>desde " -"%q</strong>. <em>Las zonas origen</em> coinciden con el tráfico reenviado " -"desde otras zonas <strong>dirigido a %q</strong>. La regla de reenvío es " -"<em>unidireccional</em>, por ejemplo una regla de reenvío desde la LAN a la " -"WAN <em>no</em> implica permiso para reenviar desde la WAN a la LAN también." +"otras. <em>Las zonas de origen</em> cubren el tráfico reenviado desde " +"<strong>%q</strong>. <em>Las zonas origen</em> coinciden con el tráfico " +"reenviado desde otras zonas dirigido a <strong>%q</strong>. La regla de " +"reenvío es <em>unidireccional</em>, por ejemplo una regla de reenvío desde " +"la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la " +"LAN también." #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14 msgid "" @@ -893,7 +894,7 @@ msgstr "No seguir" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97 msgid "drop" -msgstr "descartar" +msgstr "Descartar" #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187 msgid "hour" diff --git a/applications/luci-app-rosy-file-server/Makefile b/applications/luci-app-rosy-file-server/Makefile new file mode 100644 index 0000000000..93d9a3a669 --- /dev/null +++ b/applications/luci-app-rosy-file-server/Makefile @@ -0,0 +1,15 @@ +# +# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> +# Copyright (C) 2018 Rosy Song <rosysong@rosinson.com> +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=LuCI Support for Rosy File Server +LUCI_DEPENDS:=+luci-base +rosy-file-server + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-rosy-file-server/luasrc/controller/rosy-file-server/rosy-file-server.lua b/applications/luci-app-rosy-file-server/luasrc/controller/rosy-file-server/rosy-file-server.lua new file mode 100644 index 0000000000..dd5598a689 --- /dev/null +++ b/applications/luci-app-rosy-file-server/luasrc/controller/rosy-file-server/rosy-file-server.lua @@ -0,0 +1,37 @@ +-- Copyright 2018 Rosy Song <rosysong@rosinson.com> +-- Licensed to the public under the Apache License 2.0. + +module("luci.controller.rosy-file-server.rosy-file-server", package.seeall) + +function index() + if not nixio.fs.access("/etc/config/rosyfs") then + return + end + + local root = node() + if not root.target then + root.target = alias("httpfs") + root.index = true + end + + page = node() + page.lock = true + page.target = alias("httpfs") + page.subindex = true + page.index = false + + page = node("httpfs") + page.title = _("Rosy File Server") + page.target = alias("httpfs", "rosy-file-server") + page.order = 5 + page.setuser = "root" + page.setgroup = "root" + page.index = true + + entry({"httpfs", "rosy-file-server"}, + form("rosy-file-server/rosy-file-server"), _("Rosy File Server"), 10) + + entry({"admin", "services", "rosyfs"}, + cbi("rosy-file-server/rosyfs"), _("Rosy File Server"), 61) +end + diff --git a/applications/luci-app-rosy-file-server/luasrc/model/cbi/rosy-file-server/rosy-file-server.lua b/applications/luci-app-rosy-file-server/luasrc/model/cbi/rosy-file-server/rosy-file-server.lua new file mode 100644 index 0000000000..703b4defc0 --- /dev/null +++ b/applications/luci-app-rosy-file-server/luasrc/model/cbi/rosy-file-server/rosy-file-server.lua @@ -0,0 +1,72 @@ +-- Copyright 2018 Rosy Song <rosysong@rosinson.com> +-- Licensed to the public under the Apache License 2.0. + +local uci = require "luci.model.uci".cursor() +local dis = uci:get("rosyfs", "default", "disabled") + +local targets = {} +local server_root = luci.http.formvalue("server_root") or "/www/rosyfs-share/" +local buffer = io.popen("/bin/busybox ls -ahLlp %s" % server_root) +if dis ~= '1' and buffer then + for l in buffer:lines() do + local _p, i, u, g, sz, mm, dd, tt, nm = l:match( + "^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+(.+)" + ) + local p = _p and string.sub(_p, 1, 1) or nil + if p and (p == '-' or p == 'd') and nm and (nm ~= "./") and + not (server_root == "/www/rosyfs-share/" and nm == "../") and + not (server_root == "/www/rosyfs-share/" and nm == "rosyfs-share/") then + targets[nm] = { + ['type'] = p, + ['size'] = sz, + ['last'] = "%s %s %s" % { mm, dd, tt }, + ['name'] = nm + } + end + end +end + +local title = uci:get("rosyfs", "default", "title") or nil + +m = SimpleForm("rosyfs", title or translate("Rosy File Server"), translate("This is rosy file server for luci.<br /><strong>Note: targets will be mapped at /www/rosyfs-share !</strong>")) +m.reset = false +m.submit = false + + +s = m:section(Table, targets) + +t = s:option(DummyValue, "type", translate("Type")) + +n = s:option(DummyValue, "name", translate("Name")) +n.rawhtml = true + +function n.cfgvalue(self, section) + local v = DummyValue.cfgvalue(self, section) + local hv = (v == "../") and "Parent Directory" or v + local t = targets[v]['type'] + + if t and t ~='d' then + -- File + return translatef("<a href='%s%s'>%s</a>", + string.sub(server_root, 5, #server_root), hv, hv); + elseif t then + -- Directory + if v == "../" then + local dir = luci.util.trim(luci.util.exec("dirname " .. server_root)) + + if dir ~= "/" then dir = dir .. "/" end + + return translatef("<a href='%s?server_root=%s'>%s</a>", + luci.dispatcher.build_url("httpfs/rosy-file-server"), dir, hv) + else + return translatef("<a href='%s?server_root=%s%s'>%s</a>", + luci.dispatcher.build_url("httpfs/rosy-file-server"), + server_root, hv, hv) + end + end +end + +l = s:option(DummyValue, "last", translate("Last Modified")) +sz = s:option(DummyValue, "size", translate("Size")) + +return m diff --git a/applications/luci-app-rosy-file-server/luasrc/model/cbi/rosy-file-server/rosyfs.lua b/applications/luci-app-rosy-file-server/luasrc/model/cbi/rosy-file-server/rosyfs.lua new file mode 100644 index 0000000000..51efa9e814 --- /dev/null +++ b/applications/luci-app-rosy-file-server/luasrc/model/cbi/rosy-file-server/rosyfs.lua @@ -0,0 +1,26 @@ +-- Copyright 2019 Rosy Song <rosysong@rosinson.com> +-- Licensed to the public under the Apache License 2.0. + +local uci = require("luci.model.uci").cursor() +local dis = uci:get("rosyfs", "default", "disabled") +local tgt = uci:get("rosyfs", "default", "target") +local tlt = uci:get("rosyfs", "default", "title") + +m = Map("rosyfs", translate("Rosy File Server Settings")) + +s = m:section(TypedSection, "rosyfs", nil) +s.addremove = false +s.anonymous = true + +e = s:option(Flag, "disabled", translate("Disable"), translate("Disable Rosy File Server")) +e.default = dis or e.disabled +e.rmempty = false + +a = s:option(Value, "target", translate("Target"), translate("Specify path to be mapped")) +a.default = tgt or "/www" +a.datatype = "directory" + +t = s:option(Value, "title", translate("Title"), translate("Title to be shown")) +t.default = tlt or "Rosy File Server" + +return m diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index 7fe5f23a47..827a39b8cf 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -60,24 +60,30 @@ o2 = s:option(Flag, "trm_captive", translate("Captive Portal Detection"), o2.default = o2.enabled o2.rmempty = false -o3 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"), - translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection.")) -o3.default = o3.enabled +o3 = s:option(Flag, "trm_netcheck", translate("Net Error Check"), + translate("Treat missing internet availability as an error.")) +o3:depends("trm_captive", 1) +o3.default = o3.disabled o3.rmempty = false -o4 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"), +o4 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"), + translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection.")) +o4.default = o4.enabled +o4.rmempty = false + +o5 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"), translate("Name of the used uplink interface.")) if dump then local i, v for i, v in ipairs(dump.interface) do if v.interface ~= "loopback" and v.interface ~= "lan" then local device = v.l3_device or v.device or "-" - o4:value(v.interface, v.interface.. " (" ..device.. ")") + o5:value(v.interface, v.interface.. " (" ..device.. ")") end end end -o4.default = trmiface -o4.rmempty = false +o5.default = trmiface +o5.rmempty = false -- Runtime information @@ -97,34 +103,40 @@ e2 = e:option(Value, "trm_radio", translate("Radio Selection / Order"), translate("Restrict travelmate to a single radio (e.g. 'radio1') or change the overall scanning order (e.g. 'radio1 radio2 radio0').")) e2.rmempty = true -e3 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), - translate("Additional trigger delay in seconds before travelmate processing begins.")) -e3.datatype = "range(1,60)" -e3.default = 2 +e3 = e:option(Value, "trm_listexpiry", translate("List Auto Expiry"), + translate("Automatically resets the 'Faulty Stations' list after n minutes. Default is '0' which means no expiry.")) +e3.datatype = "range(0,300)" +e3.default = 0 e3.rmempty = false -e4 = e:option(Value, "trm_maxretry", translate("Connection Limit"), - translate("Retry limit to connect to an uplink.")) -e4.default = 3 -e4.datatype = "range(1,10)" +e4 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), + translate("Additional trigger delay in seconds before travelmate processing begins.")) +e4.datatype = "range(1,60)" +e4.default = 2 e4.rmempty = false -e5 = e:option(Value, "trm_minquality", translate("Signal Quality Threshold"), - translate("Minimum signal quality threshold as percent for conditional uplink (dis-) connections.")) -e5.default = 35 -e5.datatype = "range(20,80)" +e5 = e:option(Value, "trm_maxretry", translate("Connection Limit"), + translate("Retry limit to connect to an uplink.")) +e5.default = 5 +e5.datatype = "range(1,10)" e5.rmempty = false -e6 = e:option(Value, "trm_maxwait", translate("Interface Timeout"), - translate("How long should travelmate wait for a successful wlan uplink connection.")) -e6.default = 30 -e6.datatype = "range(20,40)" +e6 = e:option(Value, "trm_minquality", translate("Signal Quality Threshold"), + translate("Minimum signal quality threshold as percent for conditional uplink (dis-) connections.")) +e6.default = 35 +e6.datatype = "range(20,80)" e6.rmempty = false -e7 = e:option(Value, "trm_timeout", translate("Overall Timeout"), - translate("Overall retry timeout in seconds.")) -e7.default = 60 -e7.datatype = "range(30,300)" +e7 = e:option(Value, "trm_maxwait", translate("Interface Timeout"), + translate("How long should travelmate wait for a successful wlan uplink connection.")) +e7.default = 30 +e7.datatype = "range(20,40)" e7.rmempty = false +e8 = e:option(Value, "trm_timeout", translate("Overall Timeout"), + translate("Overall retry timeout in seconds.")) +e8.default = 60 +e8.datatype = "range(30,300)" +e8.rmempty = false + return m diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index 9bc8ec17a1..d94804529c 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -14,13 +14,17 @@ LUCI_BASENAME:=base LUCI_TITLE:=LuCI core libraries LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua - -PKG_SOURCE:=v1.0.0.tar.gz -PKG_SOURCE_URL:=https://github.com/jirutka/luasrcdiet/archive/ -PKG_HASH:=48162e63e77d009f5848f18a5cabffbdfc867d0e5e73c6d407f6af5d6880151b +LUCI_LUASRCDIET_VERSION:=1.0.0 + +PKG_SOURCE_URL:=https://github.com/jirutka/luasrcdiet.git +PKG_SOURCE_VERSION:=f138fc9359821d9201cd6b57cfa2fcbed5b9af97 +PKG_SOURCE_SUBDIR:=luasrcdiet-$(LUCI_LUASRCDIET_VERSION) +PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz +PKG_MIRROR_HASH:=a5c9d098549fbef618e6022b701e66c8c6fb16c910e63219adad3a4e71341f72 PKG_LICENSE:=MIT -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/luasrcdiet-1.0.0 +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR) include $(INCLUDE_DIR)/host-build.mk diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua index b4206e98df..33d018d2d0 100644 --- a/modules/luci-base/luasrc/cbi/datatypes.lua +++ b/modules/luci-base/luasrc/cbi/datatypes.lua @@ -132,6 +132,10 @@ function ip6prefix(val) return ( val and val >= 0 and val <= 128 ) end +function cidr(val) + return cidr4(val) or cidr6(val) +end + function cidr4(val) local ip, mask = val:match("^([^/]+)/([^/]+)$") diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index 49e1657aae..dec25a5d0b 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -1159,6 +1159,16 @@ function protocol.is_dynamic(self) return (self:_ubus("dynamic") == true) end +function protocol.is_auto(self) + local auto = self:_get("auto") + + if auto == "0" then + return false + else + return true + end +end + function protocol.is_alias(self) local ifn, parent = nil, nil diff --git a/modules/luci-base/luasrc/view/cbi/tsection.htm b/modules/luci-base/luasrc/view/cbi/tsection.htm index 547a793329..8f3b7f0ffb 100644 --- a/modules/luci-base/luasrc/view/cbi/tsection.htm +++ b/modules/luci-base/luasrc/view/cbi/tsection.htm @@ -2,6 +2,11 @@ <% if self.title and #self.title > 0 then -%> <legend><%=self.title%></legend> <%- end %> + <% if self.error_msg and #self.error_msg > 0 then -%> + <div class="cbi-section-error"> + <%=self.error_msg%> + </div> + <%- end %> <% if self.description and #self.description > 0 then -%> <div class="cbi-section-descr"><%=self.description%></div> <%- end %> diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index d8802f8d8b..3d96c81359 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:41+0200\n" -"PO-Revision-Date: 2019-03-27 14:07-0300\n" +"PO-Revision-Date: 2019-04-20 20:03-0300\n" "Last-Translator: José Vicente <josevteg@gmail.com>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -146,8 +146,7 @@ msgstr "Tiempo de espera de reintento de 802.11w" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:398 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" -msgstr "" -"<abbr title=\"Identificador de conjunto de servicios básicos\">BSSID</abbr>" +msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:182 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port" @@ -199,8 +198,7 @@ msgstr "" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:325 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)" -msgstr "" -"<abbr title=\"Protocolo de Internet versión 6\">IPv6</abbr>-Suffix (hex)" +msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)" #: modules/luci-mod-system/luasrc/controller/admin/system.lua:34 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -236,7 +234,7 @@ msgstr "Tamaño máximo de paquetes EDNS0" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:211 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries" -msgstr "Máximo número de consultas concurrentes" +msgstr "<abbr title=\"maximal\">Máx.</abbr> consultas simultáneas" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10 msgid "" @@ -469,7 +467,7 @@ msgstr "" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:543 msgid "Allow AP mode to disconnect STAs based on low ACK condition" msgstr "" -"Permitir que el modo AP desconecte los clientes por una condición de bajo ACK" +"Permitir que el modo AP desconecte los clientes por una condición de ACK bajo" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587 @@ -809,7 +807,7 @@ msgstr "Volver a resultados de la exploración" #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17 msgid "Backup" -msgstr "Salvar" +msgstr "Copia de seguridad" #: modules/luci-mod-system/luasrc/controller/admin/system.lua:37 msgid "Backup / Flash Firmware" @@ -1033,7 +1031,7 @@ msgid "" "Click \"Generate archive\" to download a tar archive of the current " "configuration files." msgstr "" -"Pulse \"generar archivo\" para descargar un archivo tar con los archivos de " +"Pulse \"generar archivo\" para descargar un archivo .tar con los archivos de " "configuración actuales." #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:65 @@ -1191,7 +1189,7 @@ msgstr "Código de país" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36 msgid "Cover the following interface" -msgstr "Cubre el interfaz siguiente" +msgstr "Cubrir interfaz" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43 msgid "Cover the following interfaces" @@ -1246,7 +1244,7 @@ msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" -"Personaliza el comportamiento de los <abbr title=\"Diodo emisor de luz" +"Personaliza el comportamiento de los <abbr title=\"Light Emitting Diode" "\">LED</abbr>s del dispositivo, si es posible." #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:770 @@ -2535,7 +2533,7 @@ msgstr "Si está desmarcado no se configurará una ruta por defecto" #: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59 msgid "If unchecked, the advertised DNS server addresses are ignored" msgstr "" -"Si está desmarcado las direcciones de servidor DNS anunciadas se ignorarán" +"Si está desmarcado las direcciones de servidores DNS ingresadas se ignorarán" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:236 msgid "" @@ -2545,13 +2543,12 @@ msgid "" "slow process as the swap-device cannot be accessed with the high datarates " "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -"Si su dispositivo no tiene memoria <abbr title=\"Random Access Memory\">RAM</" -"abbr> suficiente, los datos no utilizados pueden ser guardados temporalmente " -"en un dispositivo de intercambio (swap-device) liberando el espacio que " -"ocupan. Tenga en cuenta que el intercambio es un proceso lento porque los " -"dispositivos de intercambio no pueden transferir volúmenes de información a " -"alta velocidad tal y como hace la memoria <abbr title=\"Random Access Memory" -"\">RAM</abbr>." +"Si su dispositivo no tiene <abbr title=\"Random Access Memory\">RAM</abbr> " +"suficiente, los datos no utilizados pueden ser guardados temporalmente en un " +"dispositivo de Swap (swap-device) liberando el espacio que ocupan. Tenga en " +"cuenta que el Swap es un proceso lento porque este método no puede " +"transferir volúmenes de información a alta velocidad tal y como hace la " +"<abbr title=\"Random Access Memory\">RAM</abbr>." #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:57 msgid "Ignore <code>/etc/hosts</code>" @@ -2593,7 +2590,7 @@ msgstr "Espera de inactividad" #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:287 msgid "Inbound:" -msgstr "Entrantes:" +msgstr "Entrante:" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:95 msgid "Info" @@ -2820,14 +2817,14 @@ msgstr "Tiempo de conexión restante" #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27 msgid "Leave empty to autodetect" -msgstr "Dejar vacío para autodetectar" +msgstr "Deje vacío para autodetectar" #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21 msgid "Leave empty to use the current WAN address" -msgstr "Dejar vacío para usar la dirección WAN actual" +msgstr "Deje vacío para usar la dirección WAN actual" #: modules/luci-base/luasrc/view/admin_uci/changelog.htm:8 msgid "Legend:" @@ -3156,7 +3153,7 @@ msgid "" "bridge prefix (br-, 6in4-, pppoe- etc.)" msgstr "" "La longitud máxima del nombre es de 15 caracteres, incluido el prefijo de " -"protocolo / puente automático (br-, 6in4-, pppoe- etc.)" +"protocolo/puente automático (br-, 6in4-, pppoe-, etc.)" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482 msgid "Maximum number of leased addresses." @@ -3562,7 +3559,7 @@ msgstr "Retraso de activación" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:338 msgid "One of hostname or mac address must be specified!" -msgstr "¡Debe especificar al menos un nombre de dispositivo o dirección mac!" +msgstr "¡Debe especificar al menos un nombre de host o dirección MAC!" #: modules/luci-base/luasrc/view/cbi/nullsection.htm:17 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:22 @@ -3720,7 +3717,7 @@ msgstr "Reemplazar TTL" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:511 msgid "Override default interface name" -msgstr "Reemplazar nombre de interfaz predeterminado" +msgstr "Reemplaza el nombre de interfaz predeterminado" #: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41 msgid "Override the gateway in DHCP responses" @@ -4057,7 +4054,7 @@ msgstr "Protocolo de la nueva interfaz" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222 msgid "Protocol support is not installed" -msgstr "No está instalado el soporte al protocolo" +msgstr "No está instalado el paquete necesario del protocolo" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:257 msgid "Provide NTP server" @@ -4108,8 +4105,8 @@ msgid "" "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> " "servers" msgstr "" -"Consulta todos los servidores <abbr title=\"Sistema de nombres de dominio" -"\">DNS</abbr> disponibles en el enlace" +"Consulta todos los servidores <abbr title=\"Domain Name System\">DNS</abbr> " +"disponibles en el enlace" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932 msgid "R0 Key Lifetime" @@ -4375,7 +4372,7 @@ msgstr "Reiniciar contadores" #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:38 msgid "Reset to defaults" -msgstr "Reiniciar a valores predeterminados" +msgstr "Reiniciar a configuraciones predeterminadas" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:20 msgid "Resolv and Hosts Files" @@ -4668,7 +4665,7 @@ msgstr "Preámbulo corto" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:18 msgid "Show current backup file list" -msgstr "Mostrar lista de archivos a salvar" +msgstr "Mostrar lista de archivos a resguardar" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99 msgid "Show empty chains" @@ -4858,9 +4855,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" "Las direcciones estáticas se usan para asignar direcciones IP fijas y " -"nombres simbólicos de dispositivos a clientes DHCP. También son necesarias " -"para configuraciones de interfaz no dinámica en las que a cada dispositivo " -"siempre se le quiere servir la misma dirección IP." +"nombres identificativos de dispositivos a clientes DHCP. También son " +"necesarias para configuraciones de interfaz no dinámica en las que a cada " +"dispositivo siempre se le quiere dar la misma dirección IP." #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:532 msgid "Station inactivity limit" @@ -5155,8 +5152,8 @@ msgid "" "The hardware is not multi-SSID capable and the existing configuration will " "be replaced if you proceed." msgstr "" -"El hardware no tiene capacidad multi-SSID y la configuración existente será " -"reemplazada si continúa." +"El hardware no tiene capacidad de tener varios SSIDs y la configuración " +"existente será reemplazada si continúa." #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31 @@ -5284,7 +5281,7 @@ msgid "" msgstr "" "Este archivo puede contener líneas como 'servidor=/dominio/1.2.3.4' o " "'servidor=1.2.3.4' para dominios específicos o dominantes completos <abbr " -"title=\"Sistema de nombres de dominio\">DNS</abbr>." +"title=\"Domain Name System\">DNS</abbr>." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:16 msgid "" @@ -5394,8 +5391,9 @@ msgid "" "reset\" (only possible with squashfs images)." msgstr "" "Para restaurar los archivos de configuración, debe subir primero una copia " -"de seguridad. Para reiniciar el firmware a su estado inicial pulse " -"\"Realizar restablecimiento\" (sólo posible con imágenes squashfs)." +"de seguridad. Para reiniciar el firmware a sus configuraciones " +"predeterminadas pulse \"Realizar restablecimiento\" (sólo posible con " +"imágenes squashfs)." #: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112 msgid "Tone" @@ -5618,7 +5616,7 @@ msgstr "Usar puerta de enlace DHCP" #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38 #: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58 msgid "Use DNS servers advertised by peer" -msgstr "Utiliza servidores DNS anunciados por otros" +msgstr "Usar otros servidores DNS" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:226 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:232 @@ -5721,7 +5719,7 @@ msgid "" msgstr "" "Pulse el botón <em>Añadir</em> para insertar una nueva dirección. " "<em>Dirección MAC</em> identificará el dispositivo, <em>Dirección IPv4</em> " -"especificará la dirección fija a usar y <em>Nombre del dispositivo</em> se " +"especificará la dirección fija a usar y <em>Nombre de máquina</em> se " "asignará como nombre identificativo." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:111 @@ -5829,7 +5827,7 @@ msgstr "Clave compartida WEP" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59 msgid "WEP passphrase" -msgstr "Frase de contraseña WEP" +msgstr "Contraseña WEP" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:501 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:564 @@ -5838,7 +5836,7 @@ msgstr "Modo WMM" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68 msgid "WPA passphrase" -msgstr "Frase de contraseña WPA" +msgstr "Contraseña WPA" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:693 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:706 @@ -6187,7 +6185,7 @@ msgstr "clave con 5 o 13 caracteres" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:50 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" -msgstr "local <abbr title=\"Sistema de nombres de dominio\">DNS</abbr> Archivo" +msgstr "Archivo <abbr title=\"Domain Name System\">DNS</abbr> local" #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932 msgid "minutes" diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js index 40624e741e..bab23cc3c7 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js @@ -1,7 +1,7 @@ function iface_reconnect(id) { L.halt(); L.dom.content(document.getElementById(id + '-ifc-description'), E('em', _('Interface is reconnecting...'))); - L.post(L.url('admin/network/iface_reconnect', id), L.run); + L.post(L.url('admin/network/iface_reconnect', id), null, L.run); } function iface_delete(ev) { @@ -102,6 +102,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null, _('IPv6'), ifc.ip6addrs ? ifc.ip6addrs[8] : null, _('IPv6'), ifc.ip6addrs ? ifc.ip6addrs[9] : null, _('IPv6-PD'), ifc.ip6prefix, + _('Information'), ifc.is_auto ? null : _('Not started on boot'), _('Error'), ifc.errors ? ifc.errors[0] : null, _('Error'), ifc.errors ? ifc.errors[1] : null, _('Error'), ifc.errors ? ifc.errors[2] : null, diff --git a/modules/luci-mod-network/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua index 1da5eac464..2312dcf6e0 100644 --- a/modules/luci-mod-network/luasrc/controller/admin/network.lua +++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua @@ -212,6 +212,7 @@ function iface_status(ifaces) is_up = net:is_up() and device:is_up(), is_alias = net:is_alias(), is_dynamic = net:is_dynamic(), + is_auto = net:is_auto(), rx_bytes = device:rx_bytes(), tx_bytes = device:tx_bytes(), rx_packets = device:rx_packets(), diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js index c2aa3a9b0d..3a895eca18 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js @@ -1,13 +1,15 @@ -function progressbar(q, v, m) +function progressbar(query, value, max, byte) { - var pg = document.querySelector(q), - vn = parseInt(v) || 0, - mn = parseInt(m) || 100, + var pg = document.querySelector(query), + vn = parseInt(value) || 0, + mn = parseInt(max) || 100, + fv = byte ? String.format('%1024.2mB', value) : value, + fm = byte ? String.format('%1024.2mB', max) : max, pc = Math.floor((100 / mn) * vn); if (pg) { pg.firstElementChild.style.width = pc + '%'; - pg.setAttribute('title', '%s / %s (%d%%)'.format(v, m, pc)); + pg.setAttribute('title', '%s / %s (%d%%)'.format(fv, fm, pc)); } } @@ -189,27 +191,32 @@ L.poll(5, L.location(), { status: 1 }, ); progressbar('#memtotal', - ((info.memory.free + info.memory.buffered) / 1024) + ' ' + _('kB'), - (info.memory.total / 1024) + ' ' + _('kB')); + info.memory.free + info.memory.buffered, + info.memory.total, + true); progressbar('#memfree', - (info.memory.free / 1024) + ' ' + _('kB'), - (info.memory.total / 1024) + ' ' + _('kB')); + info.memory.free, + info.memory.total, + true); progressbar('#membuff', - (info.memory.buffered / 1024) + ' ' + _('kB'), - (info.memory.total / 1024) + ' ' + _('kB')); + info.memory.buffered, + info.memory.total, + true); progressbar('#swaptotal', - (info.swap.free / 1024) + ' ' + _('kB'), - (info.swap.total / 1024) + ' ' + _('kB')); + info.swap.free, + info.swap.total, + true); progressbar('#swapfree', - (info.swap.free / 1024) + ' ' + _('kB'), - (info.swap.total / 1024) + ' ' + _('kB')); + info.swap.free, + info.swap.total, + true); progressbar('#conns', - info.conncount, info.connmax); + info.conncount, info.connmax, false); } ); diff --git a/modules/luci-mod-status/luasrc/view/admin_status/connections.htm b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm index d9099aa078..e3dd39d607 100644 --- a/modules/luci-mod-status/luasrc/view/admin_status/connections.htm +++ b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm @@ -165,8 +165,8 @@ rows.push([ c.layer3.toUpperCase(), c.layer4.toUpperCase(), - src + ':' + c.sport, - dst + ':' + c.dport, + c.hasOwnProperty('sport') ? (src + ':' + c.sport) : src, + c.hasOwnProperty('dport') ? (dst + ':' + c.dport) : dst, '%1024.2mB (%d <%:Pkts.%>)'.format(c.bytes, c.packets) ]); } diff --git a/modules/luci-mod-system/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua index 3e58896d63..49d4476c4e 100644 --- a/modules/luci-mod-system/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua @@ -9,6 +9,7 @@ function index() entry({"admin", "system", "system"}, cbi("admin_system/system"), _("System"), 1) entry({"admin", "system", "clock_status"}, post_on({ set = true }, "action_clock_status")) + entry({"admin", "system", "ntp_restart"}, call("action_ntp_restart"), nil).leaf = true entry({"admin", "system", "admin"}, firstchild(), _("Administration"), 2) entry({"admin", "system", "admin", "password"}, template("admin_system/password"), _("Router Password"), 1) @@ -64,6 +65,14 @@ function action_clock_status() luci.http.write_json({ timestring = os.date("%c") }) end +function action_ntp_restart() + if nixio.fs.access("/etc/init.d/sysntpd") then + os.execute("/etc/init.d/sysntpd restart") + end + luci.http.prepare_content("text/plain") + luci.http.write("0") +end + local function image_supported(image) return (os.execute("sysupgrade -T %q >/dev/null" % image) == 0) end diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua index b58bbd4134..33ec027e0d 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua @@ -67,7 +67,7 @@ end -- Logging -- -o = s:taboption("logging", Value, "log_size", translate("System log buffer size"), "kiB") +o = s:taboption("logging", Value, "log_size", translate("System log buffer size"), translate("KiB")) o.optional = true o.placeholder = 16 o.datatype = "uinteger" diff --git a/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm index 2c96eb4180..796aa695c6 100644 --- a/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm +++ b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm @@ -28,9 +28,29 @@ return false; } + + function btn_action(action) + { + if (action.name === "do_ntp_restart") + { + new XHR.get('<%=luci.dispatcher.build_url("admin", "system", "ntp_restart")%>', null, + function(x) + { + if (!x) + { + return; + } + }); + } + } + //]]></script> <span id="<%=self.option%>-clock-status"><em><%:Collecting data...%></em></span> <input type="button" class="cbi-button cbi-button-apply" value="<%:Sync with browser%>" onclick="return sync_clock(this)" /> +<% if require("nixio.fs").access("/etc/init.d/sysntpd") then %> +<input type="button" class="cbi-button cbi-button-apply" name="do_ntp_restart" value="<%:Sync with NTP-Server%>" onclick="btn_action(this)" /> +<% end %> + <%+cbi/valuefooter%> diff --git a/modules/luci-mod-system/luasrc/view/admin_system/password.htm b/modules/luci-mod-system/luasrc/view/admin_system/password.htm index 09cea4f74a..6ca02a83c1 100644 --- a/modules/luci-mod-system/luasrc/view/admin_system/password.htm +++ b/modules/luci-mod-system/luasrc/view/admin_system/password.htm @@ -2,6 +2,27 @@ <input type="password" aria-hidden="true" style="position:absolute; left:-10000px" /> +<script type="text/javascript"> +function checkPassword() { + var pw1 = document.body.querySelector('[name="pw1"]'); + var view = document.getElementById("passstrength"); + + var strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g"); + var mediumRegex = new RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$", "g"); + var enoughRegex = new RegExp("(?=.{6,}).*", "g"); + if (false == enoughRegex.test(pw1.value)) { + view.innerHTML = '<%:Password strength%>: <span style="color:red"><%:More Characters%></span>'; + } else if (strongRegex.test(pw1.value)) { + view.innerHTML = '<%:Password strength%>: <span style="color:green"><%:Strong%></span>'; + } else if (mediumRegex.test(pw1.value)) { + view.innerHTML = '<%:Password strength%>: <span style="color:orange"><%:Medium%></span>'; + } else { + view.innerHTML = '<%:Password strength%>: <span style="color:red"><%:Weak%></span>'; + } + return true; +} +</script> + <div class="cbi-map"> <h2><%:Router Password%></h2> @@ -13,7 +34,7 @@ <div class="cbi-value"> <label class="cbi-value-title" for="image"><%:Password%></label> <div class="cbi-value-field"> - <input type="password" name="pw1" /><!-- + <input type="password" name="pw1" onkeyup="checkPassword()"/><!-- --><button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</button> </div> </div> @@ -23,6 +44,7 @@ <div class="cbi-value-field"> <input type="password" name="pw2" onkeydown="if (event.keyCode === 13) submitPassword(event)" /><!-- --><button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</button> + <div id="passstrength" class="cbi-value-description"></div> </div> </div> </div> diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index ab4e08a9e9..21a2291e5b 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -454,11 +454,14 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #808080; border: 1px solid #ccc; border-radius: 3px; } +.uneditable-input { + color: #808080; +} + .cbi-dropdown, .cbi-dynlist { min-width: 210px; diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index db5304b430..2a88ef3750 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -15,6 +15,9 @@ * MUI: * https://github.com/muicss/mui * + * Menu and loading spinner icons from IcoMoon: + * https://icomoon.io + * * Pure CSS ripple effect: * https://github.com/mladenplavsic/css-ripple-effect * @@ -26,20 +29,6 @@ */ @import url("custom.css"); -/* - * Font generate by Icomoon<icomoon.io> - */ -@font-face { - font-family: "icomoon"; - font-weight: normal; - font-style: normal; - src: url("fonts/font.eot"); - src: url("fonts/font.eot") format("embedded-opentype"), - url("fonts/font.ttf") format("truetype"), - url("fonts/font.woff") format("woff"), - url("fonts/font.svg") format("svg"); -} - .table { position: relative; display: table; @@ -143,20 +132,6 @@ flex: 10 10 300px !important; } -.cbi-button-up, -.cbi-button-down, -.cbi-value-helpicon, -.showSide { - font-family: "icomoon" !important; - font-weight: normal; - font-style: normal; - font-variant: normal; - line-height: 1; - text-transform: none; - -webkit-font-smoothing: antialiased; - speak: none; -} - * { box-sizing: border-box; margin: 0; @@ -229,12 +204,12 @@ input, select, .cbi-dropdown { width: inherit; + cursor: default; } select:not([multiple="multiple"]):focus, input:not(.cbi-button):focus, -.cbi-dropdown:focus, -.cbi-dynlist > .item:focus { +.cbi-dropdown:focus { border-color: #09c; border-color: var(--main-color); } @@ -298,6 +273,12 @@ footer > a { color: #aaa; } +small { + font-size: 90%; + line-height: 1.42857143; + white-space: normal; +} + .main { position: relative; top: 4rem; @@ -320,7 +301,7 @@ footer > a { .main > .loading > span { font-family: monospace; - font-size: 2.0rem; + font-size: 2rem; font-size-adjust: .35; position: relative; top: 12.5%; @@ -329,17 +310,16 @@ footer > a { color: #888; } -.main > .loading > span > .loading-img:before { - content: "\e603"; -} - .main > .loading > span > .loading-img { - font-family: "icomoon" !important; - font-size: 1.0rem; - font-size-adjust: .6; + position: relative; + top: .1rem; + left: .05rem; display: inline-block; + width: 1.25rem; + height: 1.25rem; margin-right: 1rem; animation: anim-rotate 2s infinite linear; + background: url(./icons/spinner.svg) no-repeat center; } @keyframes anim-rotate { @@ -406,6 +386,9 @@ header { header > .fill > .container { margin-top: .5rem; padding: .5rem 1rem 0 1rem; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; } @@ -508,12 +491,17 @@ header > .fill > .container > .status > * { .main > .main-left > .nav > li { padding: .5rem 1rem; cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -.main > .main-left > .nav > li:nth-last-child(1) { - font-size: 1.2rem; - margin-top: 1rem; - margin-bottom: 1rem; +.main > .main-left > .nav > li:last-child { + display: flex; + align-items: center; + margin: 2rem 0 1rem 0; + padding: 0 0 0 2rem; } .main > .main-left > .nav > li a { @@ -530,15 +518,26 @@ header > .fill > .container > .status > * { display: none; } +.main > .main-left > .nav > .slide > .menu, +.main > .main-left > .nav > li > [data-title="Logout"] { + font-size: 1.15rem; + font-weight: 500; + display: flex; + align-items: center; + width: 100%; + padding: .5rem 1rem; + text-decoration: none; + color: #202124; + color: var(--main-menu-color); +} + .main > .main-left > .nav > .slide > .menu::before { position: absolute; - top: 30%; right: 17px; - width: 1rem; - height: 1rem; + width: 16px; + height: 16px; content: ""; - background-image: url(data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwMCAxMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxMDAwIDEwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGQ9Ik01MDAsNjI1LjJMNzUuMywyNTVMMTAsMzE0LjlMNTAwLDc0NWw0OTAtNDMwLjFMOTI0LjcsMjU1TDUwMCw2MjUuMnoiLz48L2c+PC9zdmc+); - background-repeat: no-repeat; + background: url(./icons/arrow.svg) no-repeat; } .main > .main-left > .nav > .slide > .menu.active::before { @@ -557,13 +556,12 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before display: none; } -.main > .main-left > .nav > .slide > .menu { - font-size: 1.15rem; - font-weight: 500; - display: block; - padding: .5rem 1rem; - text-decoration: none; - color: var(--menu-color); +.main > .main-left > .nav > li:last-child::before { + position: absolute; + left: 14px; + width: 24px; + height: 24px; + content: url(./icons/logout.svg); } .main > .main-left > .nav > li:hover, @@ -605,21 +603,22 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before } .main > .main-left > .nav > .slide > .slide-menu > .active:hover { - cursor: hand; background-color: #09c; background-color: var(--main-color); } /* ripple effect */ .main > .main-left > .nav > .slide > .menu, -.main > .main-left > .nav > .slide > .slide-menu > li { +.main > .main-left > .nav > .slide > .slide-menu > li, +.main > .main-left > .nav > li:last-child { position: relative; overflow: hidden; transform: translate3d(0, 0, 0); } -.main > .main-left > .nav > .slide > .menu:after, -.main > .main-left > .nav > .slide > .slide-menu > li:after { +.main > .main-left > .nav > .slide > .menu::after, +.main > .main-left > .nav > .slide > .slide-menu > li::after, +.main > .main-left > .nav > li:last-child::after { position: absolute; top: 0; left: 0; @@ -636,8 +635,9 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before background-position: 50%; } -.main > .main-left > .nav > .slide > .menu:active:after, -.main > .main-left > .nav > .slide > .slide-menu > li:active:after { +.main > .main-left > .nav > .slide > .menu:active::after, +.main > .main-left > .nav > .slide > .slide-menu > li:active::after, +.main > .main-left > .nav > li:last-child:active::after { transition: 0s; transform: scale(0, 0); opacity: .2; @@ -647,10 +647,6 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before margin: 0 2rem 1rem 2rem; } -.Processes #maincontent > .container { - margin-right: 0; -} - ul { line-height: normal; } @@ -712,6 +708,14 @@ h5 { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } +.cbi-map-descr, +.cbi-section-descr { + font-size: small; + line-height: 1.42857143; + padding: .5rem; + color: #999; +} + .cbi-map-descr + fieldset { margin-top: 1rem; } @@ -789,8 +793,6 @@ tr > th, border-top: thin solid #ddd; } -tr:first-child > td -.tr:first-child > .td, #cbi-wireless .td, #cbi-network .tr:first-child > .td, .table[width="100%"] > .tr:first-child > .td, @@ -800,6 +802,10 @@ tr:first-child > td border-top: 0 !important; } +.table[width="100%"] > .tr:first-child > .td { + margin: auto 0; +} + .cbi-section-table-row { margin-bottom: 1rem; text-align: center !important; @@ -810,10 +816,10 @@ tr:first-child > td margin-bottom: 0; } +.cbi-section-table-row > .cbi-value-field .cbi-dropdown, .cbi-section-table-row > .cbi-value-field .cbi-input-select, .cbi-section-table-row > .cbi-value-field .cbi-input-text, -.cbi-section-table-row > .cbi-value-field .cbi-input-password, -.cbi-section-table-row > .cbi-value-field .cbi-dropdown { +.cbi-section-table-row > .cbi-value-field .cbi-input-password { width: 100%; } @@ -833,20 +839,11 @@ div > .table > .tr:nth-of-type(2n) { /* fix multiple table */ table table, -.table .table { - border: 0; -} - +.table .table, .cbi-value-field table, -.cbi-value-field .table { - border: 0; -} - +.cbi-value-field .table, td > table > tbody > tr > td, -.td > .table > .tbody > .tr > .td { - border: 0; -} - +.td > .table > .tbody > .tr > .td, .cbi-value-field > table > tbody > tr > td, .cbi-value-field > .table > .tbody > .tr > .td { border: 0; @@ -881,11 +878,25 @@ td > table > tbody > tr > td, touch-action: manipulation; } +.cbi-button-up, +.cbi-button-down { + font-size: 1.2rem; + display: inline-block; + min-width: 0; + padding: .2rem .3rem; + color: transparent !important; + background: url(./icons/arrow.svg) no-repeat center; + background-size: 12px 20px; +} + +.cbi-button-up { + transform: scaleY(-1); +} + .cbi-button:not(select) { -webkit-appearance: none !important; } -form[method="post"] + form[method="post"], .cbi-button + .cbi-button { margin-left: .6rem; } @@ -909,15 +920,27 @@ form[method="post"] + form[method="post"], .btn:hover, .btn:focus, .cbi-button:hover, -.cbi-button:focus { +.cbi-button:focus, +.item:hover::after, +.item:focus::after { box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .2); } .btn:active, -.cbi-button:active { +.cbi-button:active, +.item:active::after { box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23); } +.cbi-button-up:hover, +.cbi-button-up:focus { + box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 -2px 2px rgba(0, 0, 0, .2); +} + +.cbi-button-up:active { + box-shadow: 0 -10px 20px rgba(0, 0, 0, .19), 0 -6px 6px rgba(0, 0, 0, .23); +} + .btn:disabled, .cbi-button:disabled { cursor: not-allowed; @@ -968,6 +991,7 @@ form[method="post"] + form[method="post"], .cbi-button-reload, .cbi-button-action, .cbi-button[value="Submit"], +.cbi-button[value="Upload"], .cbi-button[value$="Apply"], .cbi-button[onclick="addKey(event)"] { font-weight: normal; @@ -1010,7 +1034,7 @@ form[method="post"] + form[method="post"], .cbi-button-success, .cbi-button-download, .cbi-button[name="backup"], -.cbi-button[value="Upload"], +.cbi-button[value="Download"], .cbi-button[value="Save mtdblock"] { font-weight: normal; color: #fff; @@ -1028,41 +1052,44 @@ form[method="post"] + form[method="post"], .cbi-value-field .cbi-button-add { font-weight: bold; + margin: 9px 0 4px 3px; padding: 1px 6px; } -.cbi-value-field .cbi-button-neutral { - padding: 1px 8px; -} - -/* table */ .tabs { margin: 0 -2rem; padding-left: .5rem; background-color: #fff; } -.cbi-tabmenu > li, -.tabs > li { +.tabs > li, +.cbi-tabmenu > li { display: inline-block; - padding: .6rem 0; + padding: .55rem 0; + cursor: pointer; } -.cbi-tabmenu > li > a, -.tabs > li > a { - padding: .5rem .8rem; - text-decoration: none; - color: #404040; +.tabs > li { + padding-bottom: .4rem; + border-bottom: .2rem solid transparent; } .tabs > li[class~="active"], .tabs > li:hover { - margin-bottom: -.18751rem; + border-bottom-color: #09c; + border-bottom-color: var(--main-color); +} + +.tabs > li:hover { cursor: pointer; - color: #09c; - color: var(--main-color); - border-bottom: #09c; - border-bottom: .2rem solid var(--main-color); + border-bottom-color: #c9c9c9; +} + +.tabs > li > a, +.cbi-tabmenu > li > a { + padding: .6rem .9rem; + text-decoration: none; + color: #404040; } .tabs > li[class~="active"] > a { @@ -1070,10 +1097,6 @@ form[method="post"] + form[method="post"], color: var(--main-color); } -.tabs > li:hover { - border-bottom: .18751rem solid #c9c9c9; -} - .cbi-tabmenu { border: thin solid #d4d4d4; border-bottom: 0; @@ -1097,15 +1120,15 @@ form[method="post"] + form[method="post"], } [data-tab-title] { + overflow: hidden; height: 0; opacity: 0; - overflow: hidden; } [data-tab-active="true"] { - opacity: 1; - height: auto; overflow: visible; + height: auto; + opacity: 1; transition: opacity .25s ease-in; } @@ -1131,41 +1154,9 @@ form[method="post"] + form[method="post"], display: table-cell; } -.cbi-input-invalid { - color: #f00; - border-color: #f00; -} - -.cbi-section-error { - font-weight: bold; - line-height: 1.42857143; - margin: 18px; - padding: 6px; - border: thin solid #f00; - border-radius: 3px; - background-color: #fce6e6; -} - -.cbi-section-error ul { - margin: 0 0 0 20px; -} - -.cbi-section-error ul li { - font-weight: bold; - color: #f00; -} - -.cbi-value-helpicon > img { - display: none; -} - -.cbi-value-helpicon:before { - content: "\f059"; -} - .cbi-value-description { font-size: small; - padding: .5rem 0 0 0; + padding-top: .4rem; opacity: .5; } @@ -1173,7 +1164,7 @@ form[method="post"] + form[method="post"], display: table-cell; float: left; width: 23rem; - padding-top: .4rem; + padding-top: .35rem; padding-right: 2rem; text-align: right; word-wrap: break-word; @@ -1182,13 +1173,53 @@ form[method="post"] + form[method="post"], .cbi-value { display: inline-block; width: 100%; - padding: .3rem 1rem; + padding: .35rem 1rem .2rem 1rem; } .cbi-value ul { line-height: 1.25; } +.cbi-value-field .cbi-dropdown, +.cbi-value-field .cbi-input-select, +.cbi-value input[type="text"], +.cbi-value input[type="password"] { + min-width: 25rem; +} + +#cbi-firewall-zone .cbi-input-select, +#cbi-network-switch_vlan .cbi-input-select { + min-width: 11rem; +} + +#cbi-network-switch_vlan .cbi-input-text { + max-width: 3rem; +} + +.cbi-input-invalid { + color: #f00; + border-bottom-color: #f00; +} + +.cbi-section-error { + font-weight: bold; + line-height: 1.42857143; + margin: 18px; + padding: 6px; + border: thin solid #f00; + border-radius: 3px; + background-color: #fce6e6; +} + +.cbi-section-error ul { + margin: 0 0 0 20px; +} + +.cbi-section-error ul li { + font-weight: bold; + color: #f00; +} + .td[data-title]::before { font-weight: bold; display: none; @@ -1226,7 +1257,7 @@ form[method="post"] + form[method="post"], .cbi-rowstyle-2 .cbi-button-up, .cbi-rowstyle-2 .cbi-button-down, -.cbi-rowstyle-2:first-child { +body:not(.Interfaces) .cbi-rowstyle-2:first-child { background-color: #fff !important; } @@ -1253,30 +1284,23 @@ form[method="post"] + form[method="post"], margin: 0; } -/* desc */ -.cbi-section-descr, -.cbi-map-descr { - font-size: small; - line-height: 1.42857143; - padding: .5rem; - color: #999; -} - +/* lists */ .cbi-dynlist { line-height: 1.3; flex-direction: column; min-height: 30px; + cursor: text; } .cbi-dynlist > .item { position: relative; - max-width: 24.9rem; - margin: 0 2em 4px 0; - padding: 2px 4px; - cursor: default; + max-width: 25rem; + margin-right: 2em; + padding: .5em .25em .25em 0; pointer-events: none; color: #666; border-bottom: 2px solid rgba(0, 0, 0, .26); + outline: 0; } .cbi-dynlist[name="sshkeys"] > .item { @@ -1303,13 +1327,36 @@ form[method="post"] + form[method="post"], word-break: break-word; } +.cbi-dynlist > .add-item { + display: inline-flex; + align-items: center; + width: 100%; + min-width: 16rem; +} + +.cbi-dynlist > .add-item:not([ondrop]) > input { + overflow: hidden; + width: 100%; + min-width: 15rem; + white-space: nowrap; + text-overflow: ellipsis; +} + +.cbi-dynlist > .add-item[ondrop] > input { + min-width: 13rem; +} + .cbi-dynlist, .cbi-dropdown { position: relative; display: inline-flex; - height: auto; padding: 0; - cursor: default; +} + +.cbi-dropdown[placeholder*="select"] { + max-width: 25rem; + height: auto; + margin-top: -3px; } .cbi-dropdown > ul { @@ -1320,6 +1367,7 @@ form[method="post"] + form[method="post"], margin: 0 !important; padding: 0; list-style: none; + outline: 0; } .cbi-dropdown > ul.preview { @@ -1341,7 +1389,9 @@ form[method="post"] + form[method="post"], flex-shrink: 0; justify-content: center; padding: 0 .25em; + cursor: default; text-align: center; + outline: 0; } .cbi-dropdown > .more, @@ -1402,10 +1452,6 @@ form[method="post"] + form[method="post"], height: 20px; } -.cbi-dropdown[open] { - position: relative; -} - .cbi-dropdown[open] > ul.dropdown { position: absolute; z-index: 1100; @@ -1483,6 +1529,43 @@ form[method="post"] + form[method="post"], width: auto; } +/* progressbar */ +.cbi-progressbar { + position: relative; + min-width: 170px; + height: 20px; + margin: 6px 0; + border: thin solid #999; + background: #eee; +} + +.cbi-progressbar > div { + width: 0; + height: 100%; + transition: width .25s ease-in; + background: #5bc0de; + background: var(--bar-bg); +} + +.cbi-progressbar::after { + font-family: monospace; + font-size: 1.3em; + font-weight: bold; + font-size-adjust: .38; + line-height: normal; + position: absolute; + top: 2px; + right: 0; + bottom: 2px; + left: 0; + overflow: hidden; + content: attr(title); + text-align: center; + white-space: pre; + text-overflow: ellipsis; + text-shadow: 0 0 2px #eee; +} + #modal_overlay { position: fixed; z-index: 900; @@ -1525,6 +1608,7 @@ form[method="post"] + form[method="post"], overflow: auto; margin-bottom: .5em; padding: 8.5px; + cursor: auto; white-space: pre-wrap; color: #eee; outline: 0; @@ -1593,7 +1677,7 @@ body.modal-overlay-active #modal_overlay { bottom: 0; left: .2em; width: 32px; - content: " "; + content: ""; background: url(../resources/icons/loading.gif) no-repeat center; background-size: 16px; } @@ -1641,60 +1725,6 @@ body.modal-overlay-active #modal_overlay { display: inline-block; } -/* input */ -.cbi-value input[type="password"], -.cbi-value input[type="text"] { - min-width: 15rem; -} - -/* select */ -.cbi-value-field .cbi-dropdown, -.cbi-value-field .cbi-input-select { - min-width: 15rem; -} - -.cbi-value-field .cbi-input-invalid { - color: #f00; - border-bottom-color: #f00; -} - -/* progressbar */ -.cbi-progressbar { - position: relative; - min-width: 170px; - height: 20px; - margin: 4px 0; - border: thin solid #999; - background: #eee; -} - -.cbi-progressbar > div { - width: 0; - height: 100%; - transition: width .25s ease-in; - background: #5bc0de; - background: var(--bar-bg); -} - -.cbi-progressbar::after { - font-family: monospace; - font-size: 1.3em; - font-weight: bold; - font-size-adjust: .38; - line-height: normal; - position: absolute; - top: 2px; - right: 0; - bottom: 2px; - left: 0; - overflow: hidden; - content: attr(title); - text-align: center; - white-space: pre; - text-overflow: ellipsis; - text-shadow: 0 0 2px #eee; -} - .th[data-type="button"], .td[data-type="button"], .th[data-type="fvalue"], @@ -1773,12 +1803,11 @@ td > .ifacebadge, #syslog { font-size: small; + line-height: 1.25; overflow-y: hidden; width: 100%; min-height: 15rem; - margin-bottom: 20px; padding: 1rem; - padding-bottom: 2.5rem; resize: none; color: #eee; border: 0; @@ -1929,7 +1958,7 @@ td > .ifacebadge, .cbi-value-field .cbi-input-checkbox, .cbi-value-field .cbi-input-radio { - margin-top: .15rem; + margin-top: .1rem; } .cbi-value-field > ul > li { @@ -1971,20 +2000,6 @@ td.cbi-value-field var, color: #0069d6; } -small { - font-size: 90%; - line-height: 1.42857143; - white-space: normal; -} - -.cbi-button-up, -.cbi-button-down { - font-size: 1.2rem; - display: inline-block; - min-width: 0; - padding: .2rem .3rem; -} - .cbi-optionals { padding: 1rem 1rem 0 1rem; border-top: thin solid #ccc; @@ -2060,8 +2075,6 @@ span[data-tooltip] .label { text-decoration: none; text-transform: uppercase; color: #fff !important; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; background-color: #bfbfbf; text-shadow: none; @@ -2092,11 +2105,13 @@ label > input[type="radio"] { /* diagnostics */ #diag-rc-output > pre, -#command-rc-output > pre { +#command-rc-output > pre, +[data-page="admin-services-wol"] .notice code { font-size: 1.2rem; font-size-adjust: .35; line-height: normal; display: block; + overflow-y: hidden; width: 100%; padding: 8.5px; white-space: pre; @@ -2151,7 +2166,7 @@ input[name="nslookup"] { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } -.node-main-login > .main form > div:nth-last-child(1) { +.node-main-login > .main form > div:last-child { float: right; } @@ -2164,6 +2179,7 @@ input[name="nslookup"] { } .node-main-login > .main .cbi-input-text { + width: 100% !important; min-width: 15rem; } @@ -2179,20 +2195,12 @@ input[name="nslookup"] { } } -/* fix status overview */ -.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2) { - white-space: normal; -} - -/* fix status processes */ +/* fix status */ +.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2), .node-status-processes > .main .table .tr .td:nth-child(3) { white-space: normal; } -.node-admin-status form { - margin: 2rem 2rem 0 0; -} - /* fix system reboot */ [data-page="admin-system-reboot"] p { padding-left: 2rem; @@ -2205,11 +2213,11 @@ input[name="nslookup"] { } /* samba */ -#cbi-samba .cbi-value-last .cbi-value-field { +#cbi-samba [data-tab="template"] .cbi-value-field { display: block; } -#cbi-samba .cbi-value-last .cbi-value-title { +#cbi-samba [data-tab="template"] .cbi-value-title { width: auto; padding-bottom: .6rem; } @@ -2287,6 +2295,7 @@ input[name="nslookup"] { } .Firewall form { + margin: 2rem 2rem 0 0; padding: 0; box-shadow: none; } @@ -2319,7 +2328,8 @@ input[name="nslookup"] { display: block; } -#cbi-firewall-zone .td.cbi-section-actions { +#cbi-firewall-zone .td, +#cbi-network-switch_vlan .td { width: 100%; } @@ -2341,6 +2351,7 @@ input[name="nslookup"] { /* custom commands */ .commandbox { width: 24% !important; + margin: 10px 0 0 10px !important; padding: .5rem 1rem; border-bottom: thin solid #ccc; background: #eee; @@ -2361,16 +2372,20 @@ input[name="nslookup"] { .commandbox code { position: absolute; - overflow-x: hidden; - overflow-y: auto; + overflow: hidden; max-width: 60%; - max-height: 55px; - margin-top: -3px; margin-left: 4px; padding: 2px 3px; + white-space: nowrap; text-overflow: ellipsis; } +.commandbox code:hover { + overflow-y: auto; + max-height: 50px; + white-space: normal; +} + .commandbox p:first-of-type { margin-top: -6px; } @@ -2381,7 +2396,7 @@ input[name="nslookup"] { [data-page^="admin-system-commands"] .panel-title, [data-page^="command-cfg"] .mobile-hide, -[data-page^="command-cfg"] header > .fill > .container > #logo { +[data-page^="command-cfg"] .showSide { display: none; } @@ -2393,6 +2408,7 @@ input[name="nslookup"] { max-width: 40%; margin: 0; animation: anim-fade-in 1.5s forwards; + word-break: break-word; opacity: 0; } @@ -2402,6 +2418,21 @@ input[name="nslookup"] { } } +/* IE hacks */ +@media all and (-ms-high-contrast: none) { + .main > .main-left > .nav > .slide > .menu::before { + top: 30.25%; + } + + .main > .main-left > .nav > li:last-child::before { + top: 20%; + } + + .showSide::before { + top: -12px; + } +} + @media screen and (max-width: 1600px) { header > .fill > .container > #logo { margin: 0 2.5rem 0 .5rem; @@ -2415,10 +2446,6 @@ input[name="nslookup"] { width: calc(100% - 13rem); } - .cbi-dynlist > .item { - max-width: 21.9rem; - } - .btn:not(button), .cbi-button { font-size: .8rem; @@ -2429,14 +2456,25 @@ input[name="nslookup"] { padding: .2rem .6rem; } + fieldset, + .cbi-section { + padding: 1rem; + } + .cbi-value-title { width: 15rem; padding-right: .6rem; } - fieldset, - .cbi-section { - padding: 1rem; + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"], + .cbi-value input[type="password"] { + min-width: 22rem; + } + + #cbi-firewall-zone .cbi-input-select { + min-width: 9rem; } .cbi-input-textarea { @@ -2446,10 +2484,6 @@ input[name="nslookup"] { .node-admin-status > .main fieldset li > a { padding: .3rem .6rem; } - - #cbi-firewall-zone > .table { - display: block; - } } @media screen and (max-width: 1366px) { @@ -2477,12 +2511,8 @@ input[name="nslookup"] { width: calc(100% - 13rem); } - .cbi-dynlist > .item { - max-width: 19.9rem; - } - - .cbi-tabmenu > li > a, - .tabs > li > a { + .tabs > li > a, + .cbi-tabmenu > li > a { padding: .2rem .5rem; } @@ -2500,9 +2530,21 @@ input[name="nslookup"] { width: 100%; } + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"], + .cbi-value input[type="password"] { + min-width: 19rem; + } + + #cbi-firewall-zone .cbi-input-select { + min-width: 4rem; + } + .main > .main-left > .nav > li, .main > .main-left > .nav > li a, - .main > .main-left > .nav > .slide > .menu { + .main > .main-left > .nav > .slide > .menu, + .main > .main-left > .nav > li > [data-title="Logout"] { font-size: .9rem; } @@ -2520,7 +2562,8 @@ input[name="nslookup"] { [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table), [data-page="admin-network-firewall-rules"] .table:not(.cbi-section-table), - [data-page="admin-network-hosts"] .table { + [data-page="admin-network-hosts"] .table, + [data-page="admin-network-routes"] .table { overflow-y: visible; } @@ -2538,16 +2581,15 @@ input[name="nslookup"] { position: relative; } - [data-page^="command-cfg"] header > .fill > .container > .brand { - display: block; - margin-top: -1.75rem; - } - html, .main { overflow-y: visible; } + .main > .loading > span { + top: 25%; + } + .main-left { position: fixed; z-index: 100; @@ -2558,29 +2600,30 @@ input[name="nslookup"] { width: 100%; } - .cbi-dynlist > .item { - max-width: 14.9rem; - } - .showSide { - display: inline-block; - overflow: visible; - margin-right: .5rem; - padding: .1rem; + position: relative; + top: .18rem; + display: inline-flex; + align-items: center; + width: 1.6rem; + height: 1.6rem; + margin-right: .7rem; cursor: pointer; - border-radius: 50%; } - .showSide:before { - font-size: 1.7rem; - content: "\e20e"; + .showSide::before { + position: absolute; + left: 1px; + width: 24px; + height: 24px; + content: ""; + background: url(./icons/menu.svg) no-repeat center; } body:not(.logged-in) .showSide { visibility: hidden; width: 0; margin: 0; - padding: 0; } .node-main-login > .main .cbi-value-title { @@ -2588,12 +2631,27 @@ input[name="nslookup"] { } .cbi-value-title { - width: 9rem; + width: 12rem; padding-right: 1rem; } + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"] { + width: 16rem; + min-width: 16rem; + } + + .cbi-value input[type="password"], + .cbi-value input[name^="pw"], + .cbi-value input[data-update="change"]:nth-child(2) { + width: 13rem !important; + min-width: 13rem; + } + #diag-rc-output > pre, - #command-rc-output > pre { + #command-rc-output > pre, + [data-page="admin-services-wol"] .notice code { font-size: 1rem; } @@ -2601,6 +2659,10 @@ input[name="nslookup"] { display: block; } + .Interfaces .table { + overflow-x: hidden; + } + #packages.table { display: grid; } @@ -2733,6 +2795,7 @@ input[name="nslookup"] { .commandbox { width: 100% !important; + margin-left: 0 !important; } } @@ -2749,7 +2812,6 @@ input[name="nslookup"] { fieldset, .cbi-section { margin: 1rem 0 0 0; - padding: 1rem; } .tabs { @@ -2760,7 +2822,8 @@ input[name="nslookup"] { margin: 0 1rem 1.5rem 1rem; } - .main > .main-left > .nav > .slide > .menu { + .main > .main-left > .nav > .slide > .menu, + .main > .main-left > .nav > li > [data-title="Logout"] { font-size: 1.2rem; } @@ -2770,15 +2833,17 @@ input[name="nslookup"] { .cbi-value-title { display: block; - width: 100%; min-width: 0 !important; - margin-top: 1rem; - margin-bottom: .5rem; + margin: .5rem 0; text-align: left; } + .cbi-value-title, + .cbi-value-description, .cbi-value-field, - .cbi-value-description { + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"] { width: 100%; } @@ -2786,13 +2851,8 @@ input[name="nslookup"] { display: inline-block; } - .cbi-tabmenu > li, - .tabs > li { - padding: .6rem 0; - } - - .cbi-tabmenu > li > a, - .tabs > li > a { + .tabs > li > a, + .cbi-tabmenu > li > a { font-size: .9rem; padding: .2rem .3rem; } @@ -2814,7 +2874,7 @@ input[name="nslookup"] { padding: 0; } - .node-main-login > .main form > div:nth-last-child(1) { + .node-main-login > .main form > div:last-child { margin-top: 2rem; } @@ -2832,9 +2892,11 @@ input[name="nslookup"] { margin-top: -8px; } + #syslog, #diag-rc-output > pre, - #command-rc-output > pre { - font-size: .8rem; + #command-rc-output > pre, + [data-page="admin-services-wol"] .notice code { + font-size: .8rem !important; } h2 { @@ -2896,10 +2958,21 @@ input[name="nslookup"] { font-size: .62rem; } - #cbi-wireless .td { + #cbi-wireless > #wifi_assoclist_table .td { overflow: hidden; } + #cbi-wireless > .cbi-section-node .td, + .Interfaces .td.cbi-section-actions { + text-align: center !important; + } + + [data-page="admin-status-processes"] .td[data-title="Hang Up"]::before, + [data-page="admin-status-processes"] .td[data-title="Terminate"]::before, + [data-page="admin-status-processes"] .td[data-title="Kill"]::before { + display: none; + } + .hide-sm, .hide-xs:not([data-title="MAC-Address"]) { display: none; @@ -2910,6 +2983,10 @@ input[name="nslookup"] { ::-webkit-scrollbar { width: 10px; height: 10px; + } + + ::-webkit-scrollbar, + ::-webkit-scrollbar-corner { background: transparent; } @@ -2925,52 +3002,3 @@ input[name="nslookup"] { background: #424242; } } - -@media screen and (min-width: 1152px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 20rem; - } - - .cbi-value-field .cbi-input-select { - width: 20rem; - } - - .cbi-value-field .cbi-dropdown { - min-width: 20rem; - } - - .cbi-section-node .tr { - overflow: hidden; - } -} - -@media screen and (min-width: 1366px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 22rem; - } - - .cbi-value-field .cbi-input-select { - width: 22rem; - } - - .cbi-value-field .cbi-dropdown { - min-width: 22rem; - } -} - -@media screen and (min-width: 1600px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 25rem; - } - - .cbi-value-field .cbi-input-select { - width: 25rem; - } - - .cbi-value-field .cbi-dropdown { - min-width: 25rem; - } -} diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css index 6acd5aa3dd..7a5bbb93e8 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/custom.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css @@ -6,6 +6,7 @@ --menu-bg-color: #fff; --menu-color: #5f6368; --menu-color-hover: #202124; + --main-menu-color: #202124; --submenu-bg-hover: #d4d4d4; --submenu-bg-hover-active: #09c; --font-body: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"; diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot Binary files differdeleted file mode 100644 index 9e6ffc9b82..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg deleted file mode 100644 index d38d057da3..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata>Generated by IcoMoon</metadata> -<defs> -<font id="icomoon" horiz-adv-x="1024"> -<font-face units-per-em="1024" ascent="960" descent="-64" /> -<missing-glyph horiz-adv-x="1024" /> -<glyph unicode=" " horiz-adv-x="512" d="" /> -<glyph unicode="" glyph-name="expand_less" d="M512 596.667l256-256-60-60-196 196-196-196-60 60z" /> -<glyph unicode="" glyph-name="expand_more" d="M708 572.667l60-60-256-256-256 256 60 60 196-196z" /> -<glyph unicode="" glyph-name="menu" d="M128 682.667h768v-86h-768v86zM128 384.667v84h768v-84h-768zM128 170.667v86h768v-86h-768z" /> -<glyph unicode="" glyph-name="favorite" d="M512 28.667l-62 56q-106 96-154 142t-107 114-81 123-22 113q0 98 67 166t167 68q116 0 192-90 76 90 192 90 100 0 167-68t67-166q0-78-52-162t-113-146-199-186z" /> -<glyph unicode="" glyph-name="spinner9" d="M512 960c-278.748 0-505.458-222.762-511.848-499.974 5.92 241.864 189.832 435.974 415.848 435.974 229.75 0 416-200.576 416-448 0-53.020 42.98-96 96-96s96 42.98 96 96c0 282.77-229.23 512-512 512zM512-64c278.748 0 505.458 222.762 511.848 499.974-5.92-241.864-189.832-435.974-415.848-435.974-229.75 0-416 200.576-416 448 0 53.020-42.98 96-96 96s-96-42.98-96-96c0-282.77 229.23-512 512-512z" /> -<glyph unicode="" glyph-name="question-circle" horiz-adv-x="878" d="M512 164.571v109.714q0 8-5.143 13.143t-13.143 5.143h-109.714q-8 0-13.143-5.143t-5.143-13.143v-109.714q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143zM658.286 548.571q0 50.286-31.714 93.143t-79.143 66.286-97.143 23.429q-138.857 0-212-121.714-8.571-13.714 4.571-24l75.429-57.143q4-3.429 10.857-3.429 9.143 0 14.286 6.857 30.286 38.857 49.143 52.571 19.429 13.714 49.143 13.714 27.429 0 48.857-14.857t21.429-33.714q0-21.714-11.429-34.857t-38.857-25.714q-36-16-66-49.429t-30-71.714v-20.571q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143q0 10.857 12.286 28.286t31.143 28.286q18.286 10.286 28 16.286t26.286 20 25.429 27.429 16 34.571 7.143 46.286zM877.714 438.857q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -</font></defs></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf Binary files differdeleted file mode 100644 index 84669323e9..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff Binary files differdeleted file mode 100644 index 00cf84ea03..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg new file mode 100644 index 0000000000..be864c5ac9 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#202124" d="m8,10.033663l-6.898535,-6.013274l-1.060688,0.972974l7.959223,6.986249l7.959223,-6.986249l-1.060688,-0.972974l-6.898535,6.013274z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg new file mode 100644 index 0000000000..d529b94e6f --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#202124" d="M10.09,15.59L11.5,17l5,-5,-5,-5,-1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0,-2,0.9,-2,2v4h2V5h14v14H5v-4H3v4c0,1.1,0.89,2,2,2h14c1.1,0,2,-0.9,2,-2V5c0,-1.1,-0.9,-2,-2,-2z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg new file mode 100644 index 0000000000..46bd0ae687 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#fff" d="m2.037076,18.641983l19.925899,0l0,-2.231286l-19.925899,0l0,2.231286zm0,-7.731664l0,2.179395l19.925899,0l0,-2.179395l-19.925899,0zm0,-5.552269l0,2.231286l19.925899,0l0,-2.231286l-19.925899,0z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg new file mode 100644 index 0000000000..6ddd3b3ed8 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#888" d="M8,0c-4.355,0-7.898,3.481-7.998,7.812,0.092-3.779,2.966-6.812,6.498-6.812,3.59,0,6.5,3.134,6.5,7,0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-4.418-3.582-8-8-8zM8,16c4.355,0,7.898-3.481,7.998-7.812-0.092,3.779-2.966,6.812-6.498,6.812-3.59,0-6.5-3.134-6.5-7,0-0.828-0.672-1.5-1.5-1.5s-1.5,0.672-1.5,1.5c0,4.418,3.582,8,8,8z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js index 3c25ed712d..755191f335 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js +++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js @@ -1,237 +1,218 @@ /** - * Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI + * Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI * - * luci-theme-material - * Copyright 2015 Lutty Yang <lutty@wcan.in> + * luci-theme-material + * Copyright 2015 Lutty Yang <lutty@wcan.in> * - * Have a bug? Please create an issue here on GitHub! - * https://github.com/LuttyYang/luci-theme-material/issues + * Have a bug? Please create an issue here on GitHub! + * https://github.com/LuttyYang/luci-theme-material/issues * - * luci-theme-bootstrap: - * Copyright 2008 Steven Barth <steven@midlink.org> - * Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - * Copyright 2012 David Menting <david@nut-bolt.nl> + * luci-theme-bootstrap: + * Copyright 2008 Steven Barth <steven@midlink.org> + * Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + * Copyright 2012 David Menting <david@nut-bolt.nl> * - * MUI: - * https://github.com/muicss/mui + * MUI: + * https://github.com/muicss/mui * - * Licensed to the public under the Apache License 2.0 + * Licensed to the public under the Apache License 2.0 */ + (function ($) { - $(".main > .loading").fadeOut(); - - /** - * trim text, Remove spaces, wrap - * @param text - * @returns {string} - */ - function trimText(text) { - return text.replace(/[ \t\n\r]+/g, " "); - } - - - var lastNode = undefined; - var mainNodeName = undefined; - - var nodeUrl = ""; - (function(node){ - var luciLocation; - if (node[0] == "admin"){ - luciLocation = [node[1], node[2]]; - }else{ - luciLocation = node; - } - - for(var i in luciLocation){ - nodeUrl += luciLocation[i]; - if (i != luciLocation.length - 1){ - nodeUrl += "/"; - } - } - })(luciLocation); - - /** - * get the current node by Burl (primary) - * @returns {boolean} success? - */ - function getCurrentNodeByUrl() { - var ret = false; - if (!$('body').hasClass('logged-in')) { - luciLocation = ["Main", "Login"]; - return true; - } - - $(".main > .main-left > .nav > .slide > .menu").each(function () { - var ulNode = $(this); - ulNode.next().find("a").each(function () { - var that = $(this); - var href = that.attr("href"); - - if (href.indexOf(nodeUrl) != -1) { - ulNode.click(); - ulNode.next(".slide-menu").stop(true, true); - lastNode = that.parent(); - lastNode.addClass("active"); - ret = true; - return true; - } - }); - }); - return ret; - } - - /** - * menu click - */ - $(".main > .main-left > .nav > .slide > .menu").click(function () { - var ul = $(this).next(".slide-menu"); - var menu = $(this); - if (!ul.is(":visible")) { - menu.addClass("active"); - ul.addClass("active"); - ul.stop(true).slideDown("fast"); - } else { - ul.stop(true).slideUp("fast", function () { - menu.removeClass("active"); - ul.removeClass("active"); - }); - } - return false; - }); - - /** - * hook menu click and add the hash - */ - $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () { - if (lastNode != undefined) lastNode.removeClass("active"); - $(this).parent().addClass("active"); - $(".main > .loading").fadeIn("fast"); - return true; - }); - - /** - * fix menu click - */ - $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () { - if (lastNode != undefined) lastNode.removeClass("active"); - $(this).addClass("active"); - $(".main > .loading").fadeIn("fast"); - window.location = $($(this).find("a")[0]).attr("href"); - return false; - }); - - /** - * get current node and open it - */ - if (getCurrentNodeByUrl()) { - mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1]; - mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase(); - $("body").addClass(mainNodeName); - } - $(".cbi-button-up").val(""); - $(".cbi-button-down").val(""); - - - /** - * hook other "A Label" and add hash to it. - */ - $("#maincontent > .container").find("a").each(function () { - var that = $(this); - var onclick = that.attr("onclick"); - if (onclick == undefined || onclick == "") { - that.click(function () { - var href = that.attr("href"); - if (href.indexOf("#") == -1) { - $(".main > .loading").fadeIn("fast"); - return true; - } - }); - } - }); - - /** - * Sidebar expand - */ - var showSide = false; - $(".showSide").click(function () { - if (showSide) { - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).animate({ - width: "0" - }, "fast"); - $(".main-right").css("overflow-y", "visible"); - showSide = false; - } else { - $(".darkMask").stop(true).fadeIn("fast"); - $(".main-left").stop(true).animate({ - width: "15rem" - }, "fast"); - $(".main-right").css("overflow-y", "hidden"); - showSide = true; - } - }); - - - $(".darkMask").click(function () { - if (showSide) { - showSide = false; - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).animate({ - width: "0" - }, "fast"); - $(".main-right").css("overflow-y", "visible"); - } - }); - - $(window).resize(function () { - if ($(window).width() > 921) { - $(".main-left").css("width", ""); - $(".darkMask").stop(true); - $(".darkMask").css("display", "none"); - showSide = false; - } - }); - - /** - * fix legend position - */ - $("legend").each(function () { - var that = $(this); - that.after("<span class='panel-title'>" + that.text() + "</span>"); - }); - - $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { - var that = $(this); - if (that.text().trim() == ""){ - that.css("display", "none"); - } - }); - - - $(".main-right").focus(); - $(".main-right").blur(); - $("input").attr("size", "0"); - - if (mainNodeName != undefined) { - console.log(mainNodeName); - switch (mainNodeName) { - case "node-status-system_log": - case "node-status-kernel_log": - $("#syslog").focus(function () { - $("#syslog").blur(); - $(".main-right").focus(); - $(".main-right").blur(); - }); - break; - case "node-status-firewall": - var button = $(".node-status-firewall > .main fieldset li > a"); - button.addClass("cbi-button cbi-button-reset a-to-btn"); - break; - case "node-system-reboot": - var button = $(".node-system-reboot > .main > .main-right p > a"); - button.addClass("cbi-button cbi-input-reset a-to-btn"); - break; - } - } + $(".main > .loading").fadeOut(); + + /** + * trim text, Remove spaces, wrap + * @param text + * @returns {string} + */ + function trimText(text) { + return text.replace(/[ \t\n\r]+/g, " "); + } + + var lastNode = undefined; + var mainNodeName = undefined; + + var nodeUrl = ""; + (function(node){ + var luciLocation; + if (node[0] == "admin"){ + luciLocation = [node[1], node[2]]; + }else{ + luciLocation = node; + } + + for(var i in luciLocation){ + nodeUrl += luciLocation[i]; + if (i != luciLocation.length - 1){ + nodeUrl += "/"; + } + } + })(luciLocation); + + /** + * get the current node by Burl (primary) + * @returns {boolean} success? + */ + function getCurrentNodeByUrl() { + var ret = false; + if (!$('body').hasClass('logged-in')) { + luciLocation = ["Main", "Login"]; + return true; + } + + $(".main > .main-left > .nav > .slide > .menu").each(function () { + var ulNode = $(this); + ulNode.next().find("a").each(function () { + var that = $(this); + var href = that.attr("href"); + + if (href.indexOf(nodeUrl) != -1) { + ulNode.click(); + ulNode.next(".slide-menu").stop(true, true); + lastNode = that.parent(); + lastNode.addClass("active"); + ret = true; + return true; + } + }); + }); + return ret; + } + + /** + * menu click + */ + $(".main > .main-left > .nav > .slide > .menu").click(function () { + var ul = $(this).next(".slide-menu"); + var menu = $(this); + if (!ul.is(":visible")) { + menu.addClass("active"); + ul.addClass("active"); + ul.stop(true).slideDown("fast"); + } else { + ul.stop(true).slideUp("fast", function () { + menu.removeClass("active"); + ul.removeClass("active"); + }); + } + return false; + }); + + /** + * hook menu click and add the hash + */ + $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () { + if (lastNode != undefined) lastNode.removeClass("active"); + $(this).parent().addClass("active"); + $(".main > .loading").fadeIn("fast"); + return true; + }); + + /** + * fix menu click + */ + $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () { + if (lastNode != undefined) lastNode.removeClass("active"); + $(this).addClass("active"); + $(".main > .loading").fadeIn("fast"); + window.location = $($(this).find("a")[0]).attr("href"); + return false; + }); + + /** + * get current node and open it + */ + if (getCurrentNodeByUrl()) { + mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1]; + mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase(); + $("body").addClass(mainNodeName); + } + + /** + * Sidebar expand + */ + var showSide = false; + $(".showSide").click(function () { + if (showSide) { + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).animate({ + width: "0" + }, "fast"); + $(".main-right").css("overflow-y", "visible"); + showSide = false; + } else { + $(".darkMask").stop(true).fadeIn("fast"); + $(".main-left").stop(true).animate({ + width: "15rem" + }, "fast"); + $(".main-right").css("overflow-y", "hidden"); + showSide = true; + } + }); + + $(".darkMask").click(function () { + if (showSide) { + showSide = false; + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).animate({ + width: "0" + }, "fast"); + $(".main-right").css("overflow-y", "visible"); + } + }); + + $(window).resize(function () { + if ($(window).width() > 921) { + $(".main-left").css("width", ""); + $(".darkMask").stop(true); + $(".darkMask").css("display", "none"); + showSide = false; + } + }); + + /** + * fix legend position + */ + $("legend").each(function () { + var that = $(this); + that.after("<span class='panel-title'>" + that.text() + "</span>"); + }); + + $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { + var that = $(this); + if (that.text().trim() == ""){ + that.css("display", "none"); + } + }); + + $(".main-right").focus(); + $(".main-right").blur(); + $("input").attr("size", "0"); + $(".cbi-button-up").val("__"); + $(".cbi-button-down").val("__"); + $(".slide > a").removeAttr("href"); + + if (mainNodeName != undefined) { + console.log(mainNodeName); + switch (mainNodeName) { + case "node-status-system_log": + case "node-status-kernel_log": + $("#syslog").focus(function () { + $("#syslog").blur(); + $(".main-right").focus(); + $(".main-right").blur(); + }); + break; + case "node-status-firewall": + var button = $(".node-status-firewall > .main fieldset li > a"); + button.addClass("cbi-button cbi-button-reset a-to-btn"); + break; + case "node-system-reboot": + var button = $(".node-system-reboot > .main > .main-right p > a"); + button.addClass("cbi-button cbi-input-reset a-to-btn"); + break; + } + } })(jQuery); diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css index 4ae8151050..26a08be463 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -165,7 +165,7 @@ header { } header .container { - padding: 0 0.5rem; + padding: 0 0.5rem; } select { @@ -588,7 +588,7 @@ footer > a { .main-right .container .alert-message h4 { margin-top: 1rem; background: url(./no-pwd.png) no-repeat left 1px / 28px; - padding: 7px 0 0 32px; + padding: 7px 0 0 32px; } .main-right .container .alert-message .btn { @@ -782,7 +782,7 @@ form[method="post"] + form[method="post"], .cbi-button[name="zero"], .cbi-button[name="restart"], .cbi-button[onclick="hide_empty(this)"] { - border: 1px solid; + border: 1px solid; } /* dark blue */ @@ -813,10 +813,10 @@ form[method="post"] + form[method="post"], .cbi-button[value="Submit"], .cbi-button[value$="Apply"], .cbi-button[onclick="addKey(event)"] { - font-weight: normal; - color: #fff; - border: 1px solid #468ea4; - background-color: #468ea4; + font-weight: normal; + color: #fff; + border: 1px solid #468ea4; + background-color: #468ea4; } /* red */ @@ -830,10 +830,10 @@ form[method="post"] + form[method="post"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { padding: 5px .8rem; - font-weight: 100; - color: #f24b7c; - background-color: transparent; - border: 1px solid #f24b7c; + font-weight: 100; + color: #f24b7c; + background-color: transparent; + border: 1px solid #f24b7c; } /* yellow */ @@ -856,10 +856,10 @@ form[method="post"] + form[method="post"], .cbi-button[name="backup"], .cbi-button[value="Upload"], .cbi-button[value="Save mtdblock"] { - font-weight: normal; - color: #468ea4; - border: thin solid #468ea4; - background-color: transparent; + font-weight: normal; + color: #468ea4; + border: thin solid #468ea4; + background-color: transparent; } .cbi-page-actions .cbi-button-link:first-child { @@ -886,40 +886,40 @@ form[method="post"] + form[method="post"], } .tabs > li { - margin-right: .8rem; - padding: .5rem 4px; - position: relative; - display: inline-block; - text-align: center; + margin-right: .8rem; + padding: 6px 10px; + position: relative; + display: inline-block; + text-align: center; } .tabs > li a { - color: #468EA4; + color: #468EA4; font-size: 14px; text-decoration: none; position: relative; z-index: 1; } .tabs > li::after { - content: ''; - background-color: #cccccc82; - position: absolute; - width: 0; - height: 100%; - bottom: 0; - border-radius: 20px; - left: 50%; - transform: translateX(-50%); + content: ''; + background-color: #cccccc82; + position: absolute; + width: 0; + height: 100%; + bottom: 0; + border-radius: 20px; + left: 50%; + transform: translateX(-50%); } .tabs > li:hover::after { - transition: width .35s; - width: calc(100% + 4px); + transition: width .35s; + width: calc(100% + 4px); } .tabs > li.active::after { - width: calc(100% + 4px); - background-color: #468ea473; + width: calc(100% + 4px); + background-color: #468ea473; } .cbi-tabmenu > li { @@ -1164,17 +1164,17 @@ form[method="post"] + form[method="post"], } .cbi-dynlist > .item::after { - position: absolute; - right: -2em; - bottom: 0; - display: inline-flex; - min-height: 17px; - padding: 0 6px; - content: "\00D7"; - pointer-events: auto; - color: #f24b7c; - border: thin solid #f24b7c; - background-color: transparent; + position: absolute; + right: -2em; + bottom: 0; + display: inline-flex; + min-height: 17px; + padding: 0 6px; + content: "\00D7"; + pointer-events: auto; + color: #f24b7c; + border: thin solid #f24b7c; + background-color: transparent; } .cbi-dynlist > .item > span { @@ -1455,6 +1455,11 @@ body.modal-overlay-active { height: 100vh; } +#modal_overlay .alert-message.warning { + background-color: #fff !important; + margin-bottom: 10px; +} + body.modal-overlay-active #modal_overlay { right: 0; left: 0; @@ -2066,9 +2071,9 @@ input[name="nslookup"] { .login .alert-message > h4 { padding: 7px 0 0 32px; - font-size: 18px; - background: url(./no-pwd.png) no-repeat left 0 / 28px; - display: inline-block; + font-size: 18px; + background: url(./no-pwd.png) no-repeat left 0 / 28px; + display: inline-block; } .login .alert-message > p { @@ -2128,30 +2133,30 @@ input[name="nslookup"] { } .login > .main .cbi-value > .cbi-value-field { - display: block; - position: relative; + display: block; + position: relative; } .login > .main .cbi-value-last .cbi-value-field > div { - height: 24px; - width: 24px; - display: inline-block; - background: url(./op-eye.png) no-repeat center center / cover; - position: absolute; - top: 8px; - right: 12px; + height: 24px; + width: 24px; + display: inline-block; + background: url(./op-eye.png) no-repeat center center / cover; + position: absolute; + top: 8px; + right: 12px; } .login > .main .cbi-value-last .cbi-value-field.op-eye > div { - background-image: url(./cl-eye.png); + background-image: url(./cl-eye.png); } .login > .main .cbi-value .cbi-input-text { margin: 0 0 16px; padding-left: 36px; width: 100%; - height: 42px; - border: 1px solid #556270; + height: 42px; + border: 1px solid #556270; border-radius: 20px; background: #fff no-repeat 11px center / 19px; } @@ -2172,14 +2177,14 @@ input[name="nslookup"] { .login .cbi-page-actions .cbi-button-apply, .login .cbi-button-apply { - border: 1px solid #f24b7c; - background-color: #f24b7c; + border: 1px solid #f24b7c; + background-color: #f24b7c; } .login .cbi-button[value="Reset"] { - color: #fff; - border: 1px solid #9a4569; - background-color: #9a4569; + color: #fff; + border: 1px solid #9a4569; + background-color: #9a4569; } .login footer { @@ -2246,13 +2251,49 @@ input[name="nslookup"] { .logged-in .main-right { float: right; width: 84%; - height: 100%; + height: 100%; } .logged-in .main-right .container { margin: 5rem 1rem 1rem; } +/* rosy file server */ +.login-info.node-main-login{ + background-color: #ebf1f6; +} + +.login-info.node-main-login header .container, +.login-info.node-main-login .main { + width: 1170px; +} + +.login-info.node-main-login .main { + padding: 0 15px; +} + +.login-info.node-main-login header { + display: block; +} + +.login-info.node-main-login header .container { + margin: 1rem auto 0; + height: 3rem; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 50px; + line-height: 44px; +} + +.login-info.node-main-login .label.logout { + background-color: #f24b7c; +} + +.login-info.node-main-login .label.logout a { + color: #fff; + text-decoration: none; +} + /* node main login */ .login-info .main { margin: 0 auto; @@ -2435,11 +2476,14 @@ input[name="nslookup"] { flex-basis: 12%; } -#cbi-firewall-zone .table, -#cbi-network-switch_vlan .table { +#cbi-firewall-zone .table { display: table; } +#cbi-network-switch_vlan #vlan_table { + overflow-x: auto; +} + #cbi-firewall-zone .td.cbi-section-actions { width: 100%; } @@ -2592,10 +2636,6 @@ input[name="nslookup"] { font-size: .7rem; } - #modal_overlay { - top: 3.5rem; - } - [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) { display: block; } @@ -2612,10 +2652,17 @@ input[name="nslookup"] { } @media screen and (max-width: 992px) { + .login-info.node-main-login header .container, + .login-info.node-main-login .main { + width: 970px; + } +} + +@media screen and (max-width: 992px) { .login .main-right { background: #354057; } - + .login > .main #maincontent { width: 90%; } @@ -2674,6 +2721,10 @@ input[name="nslookup"] { width: 30px; } + .login-info.node-main-login header .showSide { + display: none; + } + .showSide::before { content: ''; display: inline-block; @@ -2882,6 +2933,22 @@ input[name="nslookup"] { .logged-in .main-left .navbar-container:hover { scrollbar-face-color: #839dd67a; } + + .login-info.node-main-login header .container, + .login-info.node-main-login .main { + width: 750px; + } +} + +@media screen and (max-width: 768px) { + .login-info.node-main-login header { + padding: 0 15px; + } + + .login-info.node-main-login header .container, + .login-info.node-main-login .main { + width: 100%; + } } @media screen and (max-width: 600px) { @@ -2900,10 +2967,6 @@ input[name="nslookup"] { padding: 1rem; } - .tabs { - margin: 0 -1rem; - } - .main-left .nav-container { width: 70%; } diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js index 7f5f1ad0b0..886e175cc4 100755 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js @@ -273,7 +273,9 @@ thisParent.removeClass('op-eye'); $(this).prev().attr('type', 'password'); } - + }); + $('#cbi-network-switch_vlan .table').wrap('#vlan_table'); + })(window, jQuery); diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm index 4377e1ca98..25997d145e 100755 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm @@ -28,7 +28,7 @@ </div> </div> </div> -<footer class="mobile-hide"> +<footer> <a href="https://github.com/openwrt/luci">Powered by<%= ver.luciname %> (<%= ver.luciversion %>)</a> / <%= ver.distversion %> <% if #categories > 1 then %> |
