From 6063119d711d9e3e086ea0d0fc27e210b4e7bfff Mon Sep 17 00:00:00 2001 From: sbwml Date: Mon, 30 Dec 2024 22:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 支持修改进度条字体颜色避免主色调明亮缘故导致进度条字体看不清楚 --- .../resources/view/argon-config.js | 37 ++- luci-app-argon-config/po/es/argon-config.po | 285 ------------------ .../po/zh_Hans/argon-config.po | 9 + .../po/zh_Hant/argon-config.po | 273 ----------------- luci-app-argon-config/root/etc/config/argon | 1 + .../htdocs/luci-static/argon/css/cascade.css | 1 + .../luasrc/view/themes/argon/header.htm | 5 + .../view/themes/argon/out_footer_login.htm | 27 -- .../luasrc/view/themes/argon/sysauth.htm | 2 +- 9 files changed, 50 insertions(+), 590 deletions(-) delete mode 100644 luci-app-argon-config/po/es/argon-config.po delete mode 100644 luci-app-argon-config/po/zh_Hant/argon-config.po delete mode 100644 luci-theme-argon/luasrc/view/themes/argon/out_footer_login.htm diff --git a/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js b/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js index cde1774..73de619 100644 --- a/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js +++ b/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js @@ -86,8 +86,6 @@ return view.extend({ colorPicker.style.marginLeft = '5px'; colorPicker.style.borderRadius = '4px'; colorPicker.style.border = '1px solid #d9d9d9'; - colorPicker.style.justifyContent = 'center'; - colorPicker.style.transition = 'all 0.2s'; textInput.parentNode.insertBefore(colorPicker, textInput.nextSibling); colorPicker.addEventListener('input', function() { textInput.value = colorPicker.value; @@ -135,8 +133,6 @@ return view.extend({ colorPicker.style.marginLeft = '5px'; colorPicker.style.borderRadius = '4px'; colorPicker.style.border = '1px solid #d9d9d9'; - colorPicker.style.justifyContent = 'center'; - colorPicker.style.transition = 'all 0.2s'; textInput.parentNode.insertBefore(colorPicker, textInput.nextSibling); colorPicker.addEventListener('input', function() { textInput.value = colorPicker.value; @@ -161,6 +157,39 @@ return view.extend({ o.default = '10'; o.rmempty = false; + o = s.option(form.Value, 'progressbar_font', _('Progress bar Font Color'), _('A HEX color (default: #2e2b60).')) + o.default = '#2e2b60'; + o.rmempty = false; + o.validate = function(section_id, value) { + if (section_id) + return /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(value) || + _('Expecting: %s').format(_('valid HEX color value')); + return true; + }; + o.render = function(section_id, option_index, cfgvalue) { + var el = form.Value.prototype.render.apply(this, arguments); + setTimeout(function() { + const textInput = document.querySelector('[id^="widget.cbid.argon."][id$=".progressbar_font"]'); + const colorPicker = document.createElement('input'); + colorPicker.type = 'color'; + colorPicker.value = textInput.value; + colorPicker.style.width = '24px'; + colorPicker.style.height = '24px'; + colorPicker.style.padding = '0px'; + colorPicker.style.marginLeft = '5px'; + colorPicker.style.borderRadius = '4px'; + colorPicker.style.border = '1px solid #d9d9d9'; + textInput.parentNode.insertBefore(colorPicker, textInput.nextSibling); + colorPicker.addEventListener('input', function() { + textInput.value = colorPicker.value; + }); + textInput.addEventListener('input', function() { + colorPicker.value = textInput.value; + }); + }, 0); + return el; + }; + o = s.option(form.Button, '_save', _('Save settings')); o.inputstyle = 'apply'; o.inputtitle = _('Save current settings'); diff --git a/luci-app-argon-config/po/es/argon-config.po b/luci-app-argon-config/po/es/argon-config.po deleted file mode 100644 index 38ef29a..0000000 --- a/luci-app-argon-config/po/es/argon-config.po +++ /dev/null @@ -1,285 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: 2021-03-15 21:25-0300\n" -"PO-Revision-Date: 2022-04-23 15:21-0300\n" -"Last-Translator: Franco Castillo \n" -"Language-Team: \n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.0.1\n" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:102 -msgid "0 transparent - 1 opaque (suggest: black translucent preset: 0.5)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:78 -msgid "" -"0 transparent - 1 opaque (suggest: transparent: 0 or translucent preset: " -"0.5)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:91 -msgid "A HEX Color (default: #483d8b)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:67 -msgid "A HEX color (default: #5e72e4)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:155 -msgid "Action" -msgstr "" - -#: applications/luci-app-argon-config/root/usr/share/luci/menu.d/luci-app-argon-config.json:3 -msgid "Argon Config" -msgstr "Configuración de Argon" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:45 -msgid "Argon theme configuration" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:175 -msgid "Background file list" -msgstr "Lista de archivos de fondo" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:54 -msgid "Bing" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:53 -msgid "Built-in" -msgstr "Integrado" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:63 -msgid "Dark mode" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:170 -msgid "Delete" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:73 -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:97 -msgid "Expecting: %s" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:139 -msgid "Failed to upload file: %s." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:152 -msgid "Filename" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:129 -msgid "Files will be uploaded to %s." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:61 -msgid "Follow system" -msgstr "" - -#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 -msgid "Grant UCI access for luci-app-argon-config" -msgstr "Otorgar acceso UCI para luci-app-argon-config" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:46 -msgid "" -"Here you can set the blur and transparency of the login page of argon theme, " -"and manage the background pictures and videos. Chrome is recommended." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:85 -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:109 -msgid "Larger value will more blurred (suggest: clear: 1 or blur preset: 10)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:62 -msgid "Light mode" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:153 -msgid "Modified date" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:172 -msgid "No files found." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:116 -msgid "Save current settings" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:114 -msgid "Save settings" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:154 -msgid "Size" -msgstr "Tamaño" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:48 -msgid "Theme configuration" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:60 -msgid "Theme mode" -msgstr "Modo del tema" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:55 -msgid "Unsplash" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:128 -msgid "Upload background" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:122 -msgid "Upload background (available space: %1024.2mB)" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:131 -msgid "Upload..." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:56 -msgid "Wallhaven" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:52 -msgid "Wallpaper source" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:124 -msgid "" -"You can upload files such as gif/jpg/mp4/png/webm/webp files, to change the " -"login page background." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:108 -msgid "[Dark mode] Frosted Glass Radius" -msgstr "[Modo oscuro] Radio de vidrio esmerilado" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:90 -msgid "[Dark mode] Primary Color" -msgstr "[Modo oscuro] Color primario" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:101 -msgid "[Dark mode] Transparency" -msgstr "[Modo oscuro] Transparencia" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:84 -msgid "[Light mode] Frosted Glass Radius" -msgstr "[Modo claro] Radio de vidrio esmerilado" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:67 -msgid "[Light mode] Primary Color" -msgstr "[Modo claro] Color primario" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:77 -msgid "[Light mode] Transparency" -msgstr "[Modo claro] Transparencia" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:73 -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:97 -msgid "valid HEX color value" -msgstr "" - -#~ msgid "" -#~ "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" -#~ msgstr "" -#~ "0 transparente - 1 opaco; (Sugerencia: negro translúcido preestablecido: " -#~ "0.5)" - -#~ msgid "" -#~ "0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent " -#~ "preset: 0.5 )" -#~ msgstr "" -#~ "0 transparente - 1 opaco; (Sugerencia: transparente: 0 o translúcido " -#~ "preestablecido: 0.5)" - -#~ msgid "A HEX Color ; ( Default: #483d8b )" -#~ msgstr "Un color HEX; (Predeterminado: #483d8b)" - -#~ msgid "A HEX Color ; ( Default: #5e72e4 )" -#~ msgstr "Un color HEX; (Predeterminado: #5e72e4)" - -#~ msgid "Bing Wallpapers" -#~ msgstr "Fondos de Bing" - -#~ msgid "Choose local file:" -#~ msgstr "Elija un archivo local:" - -#~ msgid "Create upload file error." -#~ msgstr "Crear archivo de error de carga." - -#~ msgid "File name" -#~ msgstr "Nombre del archivo" - -#~ msgid "File saved to" -#~ msgstr "Archivo guardado en" - -#~ msgid "Follow System" -#~ msgstr "Seguir el sistema" - -#~ msgid "Force Dark" -#~ msgstr "Forzar oscuro" - -#~ msgid "Force Light" -#~ msgstr "Forzar claro" - -#~ msgid "" -#~ "Here you can set the blur and transparency of the login page of argon " -#~ "theme, and manage the background pictures and videos.[Chrome is " -#~ "recommended]" -#~ msgstr "" -#~ "Aquí puede configurar el desenfoque y la transparencia de la página de " -#~ "inicio de sesión del tema argon y administrar las imágenes de fondo y los " -#~ "videos. [Se recomienda Chrome]" - -#~ msgid "" -#~ "Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" -#~ msgstr "" -#~ "El valor más grande se verá más borroso; (Sugerencia: claro: 1 o " -#~ "desenfoque predeterminado: 10)" - -#~ msgid "Modify time" -#~ msgstr "Modificar la hora" - -#~ msgid "No specify upload file." -#~ msgstr "No especificar archivo de carga." - -#~ msgid "Remove" -#~ msgstr "Eliminar" - -#~ msgid "Save Changes" -#~ msgstr "Guardar cambios" - -#~ msgid "Upload" -#~ msgstr "Cargar" - -#~ msgid "Upload (Free:" -#~ msgstr "Cargar (Libre:" - -#~ msgid "Upload file to '/www/luci-static/argon/background/'" -#~ msgstr "Subir archivo a '/www/luci-static/argon/background/'" - -#~ msgid "Wallpaper Source" -#~ msgstr "Fuente del fondo de pantalla" - -#~ msgid "You can choose Theme color mode here" -#~ msgstr "Puede elegir el modo de color del tema aquí" - -#~ msgid "" -#~ "You can upload files such as jpg,png,gif,webp,mp4,webm files, To change " -#~ "the login page background." -#~ msgstr "" -#~ "Puede cargar archivos como jpg, png, gif, webp, mp4, webm, para cambiar " -#~ "el fondo de la página de inicio de sesión." - -#~ msgid "Luci Argon theme config" -#~ msgstr "Configuración del tema Luci Argon" diff --git a/luci-app-argon-config/po/zh_Hans/argon-config.po b/luci-app-argon-config/po/zh_Hans/argon-config.po index 807469a..8006b56 100644 --- a/luci-app-argon-config/po/zh_Hans/argon-config.po +++ b/luci-app-argon-config/po/zh_Hans/argon-config.po @@ -188,5 +188,14 @@ msgstr "[亮色模式] 透明度" #: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:73 #: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:97 +#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:166 msgid "valid HEX color value" msgstr "有效十六进制颜色值" + +#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:160 +msgid "Progress bar Font Color" +msgstr "进度条字体颜色" + +#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:160 +msgid "A HEX color (default: #2e2b60)." +msgstr "十六进制颜色值（预设为：#2e2b60）。" diff --git a/luci-app-argon-config/po/zh_Hant/argon-config.po b/luci-app-argon-config/po/zh_Hant/argon-config.po deleted file mode 100644 index 1f8ce33..0000000 --- a/luci-app-argon-config/po/zh_Hant/argon-config.po +++ /dev/null @@ -1,273 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: Victor Tseng \n" -"Language-Team: \n" -"Language: zh_TW\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.2.2\n" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:102 -msgid "0 transparent - 1 opaque (suggest: black translucent preset: 0.5)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:78 -msgid "" -"0 transparent - 1 opaque (suggest: transparent: 0 or translucent preset: " -"0.5)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:91 -msgid "A HEX Color (default: #483d8b)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:67 -msgid "A HEX color (default: #5e72e4)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:155 -msgid "Action" -msgstr "" - -#: applications/luci-app-argon-config/root/usr/share/luci/menu.d/luci-app-argon-config.json:3 -msgid "Argon Config" -msgstr "Argon 設定" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:45 -msgid "Argon theme configuration" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:175 -msgid "Background file list" -msgstr "背景檔案清單" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:54 -msgid "Bing" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:53 -msgid "Built-in" -msgstr "內建" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:63 -msgid "Dark mode" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:170 -msgid "Delete" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:73 -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:97 -msgid "Expecting: %s" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:139 -msgid "Failed to upload file: %s." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:152 -msgid "Filename" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:129 -msgid "Files will be uploaded to %s." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:61 -msgid "Follow system" -msgstr "" - -#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 -msgid "Grant UCI access for luci-app-argon-config" -msgstr "為 luci-app-argon-config 授予 UCI 權限" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:46 -msgid "" -"Here you can set the blur and transparency of the login page of argon theme, " -"and manage the background pictures and videos. Chrome is recommended." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:85 -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:109 -msgid "Larger value will more blurred (suggest: clear: 1 or blur preset: 10)." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:62 -msgid "Light mode" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:153 -msgid "Modified date" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:172 -msgid "No files found." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:116 -msgid "Save current settings" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:114 -msgid "Save settings" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:154 -msgid "Size" -msgstr "容量" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:48 -msgid "Theme configuration" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:60 -msgid "Theme mode" -msgstr "佈景主題模式" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:55 -msgid "Unsplash" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:128 -msgid "Upload background" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:122 -msgid "Upload background (available space: %1024.2mB)" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:131 -msgid "Upload..." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:56 -msgid "Wallhaven" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:52 -msgid "Wallpaper source" -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:124 -msgid "" -"You can upload files such as gif/jpg/mp4/png/webm/webp files, to change the " -"login page background." -msgstr "" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:108 -msgid "[Dark mode] Frosted Glass Radius" -msgstr "《深色模式》模糊效果半徑" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:90 -msgid "[Dark mode] Primary Color" -msgstr "《深色模式》主色彩" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:101 -msgid "[Dark mode] Transparency" -msgstr "《深色模式》透明度" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:84 -msgid "[Light mode] Frosted Glass Radius" -msgstr "《淺色模式》模糊效果半徑" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:67 -msgid "[Light mode] Primary Color" -msgstr "《淺色模式》主色彩" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:77 -msgid "[Light mode] Transparency" -msgstr "《淺色模式》透明度" - -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:73 -#: applications/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js:97 -msgid "valid HEX color value" -msgstr "" - -#~ msgid "" -#~ "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" -#~ msgstr "0 全透明 - 1 不透明（建議：黑色半透明 0.5）" - -#~ msgid "" -#~ "0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent " -#~ "preset: 0.5 )" -#~ msgstr "0 全透明 - 1 不透明（建議：全透明 0，或半透明 0.5）" - -#~ msgid "A HEX Color ; ( Default: #483d8b )" -#~ msgstr "十六進制顏色（預設 #483d8b）" - -#~ msgid "A HEX Color ; ( Default: #5e72e4 )" -#~ msgstr "十六進制顏色（預設 #5e72e4）" - -#~ msgid "Bing Wallpapers" -#~ msgstr "必應桌布" - -#~ msgid "Choose local file:" -#~ msgstr "選擇本地檔案：" - -#~ msgid "Create upload file error." -#~ msgstr "建立上傳檔案錯誤。" - -#~ msgid "File name" -#~ msgstr "檔案名稱" - -#~ msgid "File saved to" -#~ msgstr "檔案已儲存至" - -#~ msgid "Follow System" -#~ msgstr "跟隨系統配色" - -#~ msgid "Force Dark" -#~ msgstr "強制深色" - -#~ msgid "Force Light" -#~ msgstr "強制淺色" - -#~ msgid "" -#~ "Here you can set the blur and transparency of the login page of argon " -#~ "theme, and manage the background pictures and videos.[Chrome is " -#~ "recommended]" -#~ msgstr "" -#~ "您可以在此設定登入畫面的模糊度、透明度、以及管理背景圖片與影片（推薦使用 " -#~ "Chrome）。" - -#~ msgid "" -#~ "Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" -#~ msgstr "數值越大越模糊（建議：清晰 1，或模糊程度 10）" - -#~ msgid "Modify time" -#~ msgstr "修改時間" - -#~ msgid "No specify upload file." -#~ msgstr "沒有選擇要上傳的檔案。" - -#~ msgid "Remove" -#~ msgstr "移除" - -#~ msgid "Save Changes" -#~ msgstr "保存變更" - -#~ msgid "Upload" -#~ msgstr "上傳" - -#~ msgid "Upload (Free:" -#~ msgstr "上傳（剩餘空間：" - -#~ msgid "Upload file to '/www/luci-static/argon/background/'" -#~ msgstr "上傳檔案至「/www/luci-static/argon/background」" - -#~ msgid "Wallpaper Source" -#~ msgstr "桌布來源" - -#~ msgid "You can choose Theme color mode here" -#~ msgstr "您可以在此選擇佈景主題的顏色模式" - -#~ msgid "" -#~ "You can upload files such as jpg,png,gif,mp4,webm files, To change the " -#~ "login page background." -#~ msgstr "" -#~ "您可以上傳諸如 jpg、png、gif、mp4、webm 等類型的檔案來更換登入畫面的背景。" diff --git a/luci-app-argon-config/root/etc/config/argon b/luci-app-argon-config/root/etc/config/argon index 7530fe0..b37b212 100644 --- a/luci-app-argon-config/root/etc/config/argon +++ b/luci-app-argon-config/root/etc/config/argon @@ -1,6 +1,7 @@ config global option primary '#5e72e4' option dark_primary '#483d8b' + option progressbar_font '#2e2b60' option blur '10' option blur_dark '10' option transparency '0.2' diff --git a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css index ba4bc1e..168eb83 100644 --- a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css +++ b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css @@ -2542,6 +2542,7 @@ td>table>tbody>tr>td, border-radius: 12px; overflow: hidden; color: #2e2b60; + color: var(--progressbar-font-color); } .cbi-progressbar>div { diff --git a/luci-theme-argon/luasrc/view/themes/argon/header.htm b/luci-theme-argon/luasrc/view/themes/argon/header.htm index edaccc1..34972c4 100644 --- a/luci-theme-argon/luasrc/view/themes/argon/header.htm +++ b/luci-theme-argon/luasrc/view/themes/argon/header.htm @@ -49,7 +49,11 @@ blur_opacity = uci:get_first('argon', 'global', 'transparency') blur_opacity_dark = uci:get_first('argon', 'global', 'transparency_dark') mode = uci:get_first('argon', 'global', 'mode') + progressbar_font = uci:get_first('argon', 'global', 'progressbar_font') bar_color = mode == 'dark' and dark_primary or primary + if not progressbar_font then + progressbar_font = "#2e2b60" + end end -- Brand name @@ -112,6 +116,7 @@ :root { --primary: <%=primary%>; --dark-primary: <%=dark_primary%>; + --progressbar-font-color: <%=progressbar_font%>; --blur-radius:<%=blur_radius%>px; --blur-opacity:<%=blur_opacity%>; --blur-radius-dark:<%=blur_radius_dark%>px; diff --git a/luci-theme-argon/luasrc/view/themes/argon/out_footer_login.htm b/luci-theme-argon/luasrc/view/themes/argon/out_footer_login.htm deleted file mode 100644 index 3983147..0000000 --- a/luci-theme-argon/luasrc/view/themes/argon/out_footer_login.htm +++ /dev/null @@ -1,27 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008-2019 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<% - local is_rollback_pending, rollback_time_remaining, rollback_session, rollback_token = luci.model.uci:rollback_pending() - - if is_rollback_pending or trigger_apply or trigger_revert then -%> - -<% - end - - include("themes/" .. theme .. "/footer_login") -%> diff --git a/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm b/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm index 710fdcd..cc9e7fa 100644 --- a/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm +++ b/luci-theme-argon/luasrc/view/themes/argon/sysauth.htm @@ -184,4 +184,4 @@ } //]]> <% end %> -<%+themes/argon/out_footer_login%> +<%+themes/argon/footer_login%>