From 931a4c9ff4dc0ff18bf8bfe02e9902e96463fe5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Tue, 8 Sep 2020 22:24:29 +0800 Subject: [PATCH 01/10] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..644aeb1 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# luci-app-argon-config +Argon Theme Config Plugin From 76ab6f2be71aa7b5558aff9189987c123fce6197 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Tue, 8 Sep 2020 22:28:01 +0800 Subject: [PATCH 02/10] init --- Makefile | 46 ++++ luasrc/controller/argon-config.lua | 12 + .../model/cbi/argon-config/configuration.lua | 216 ++++++++++++++++++ luasrc/view/argon-config/other_button.htm | 7 + luasrc/view/argon-config/other_dvalue.htm | 8 + luasrc/view/argon-config/other_upload.htm | 5 + po/zh-cn/argon-config.po | 124 ++++++++++ root/etc/config/argon | 8 + root/etc/uci-defaults/luci-argon-config | 6 + 9 files changed, 432 insertions(+) create mode 100644 Makefile create mode 100644 luasrc/controller/argon-config.lua create mode 100644 luasrc/model/cbi/argon-config/configuration.lua create mode 100644 luasrc/view/argon-config/other_button.htm create mode 100644 luasrc/view/argon-config/other_dvalue.htm create mode 100644 luasrc/view/argon-config/other_upload.htm create mode 100644 po/zh-cn/argon-config.po create mode 100644 root/etc/config/argon create mode 100644 root/etc/uci-defaults/luci-argon-config diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1333d89 --- /dev/null +++ b/Makefile @@ -0,0 +1,46 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci-app-argon-config +LUCI_PKGARCH:=all +PKG_VERSION:=0.7 +PKG_RELEASE:=beta + +include $(INCLUDE_DIR)/package.mk + +define Package/luci-app-argon-config + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=3. Applications + TITLE:=LuCI page for Argon Config + PKGARCH:=all + DEPENDS:= +endef + +define Build/Prepare +endef + +define Build/Compile +endef + + +define Package/luci-app-argon-config/install + $(INSTALL_DIR) $(1)/usr/lib/lua/luci + cp -pR ./luasrc/* $(1)/usr/lib/lua/luci + $(INSTALL_DIR) $(1)/ + cp -pR ./root/* $(1)/ + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n + po2lmo ./po/zh-cn/argon-config.po $(1)/usr/lib/lua/luci/i18n/argon-config.zh-cn.lmo +endef + + +$(eval $(call BuildPackage,luci-app-argon-config)) + +# call BuildPackage - OpenWrt buildroot signature + + diff --git a/luasrc/controller/argon-config.lua b/luasrc/controller/argon-config.lua new file mode 100644 index 0000000..8810e37 --- /dev/null +++ b/luasrc/controller/argon-config.lua @@ -0,0 +1,12 @@ +--[[ +luci-app-argon-config +]]-- + +module("luci.controller.argon-config", package.seeall) + +function index() + if not nixio.fs.access('/www/luci-static/argon/css/cascade.css') then + return + end + entry({"admin", "system", "argon-config"}, form("argon-config/configuration"), _("Argon Config"),90) +end diff --git a/luasrc/model/cbi/argon-config/configuration.lua b/luasrc/model/cbi/argon-config/configuration.lua new file mode 100644 index 0000000..5af5374 --- /dev/null +++ b/luasrc/model/cbi/argon-config/configuration.lua @@ -0,0 +1,216 @@ +local nxfs = require 'nixio.fs' +local wa = require 'luci.tools.webadmin' +local opkg = require 'luci.model.ipkg' +local sys = require 'luci.sys' +local http = require 'luci.http' +local nutil = require 'nixio.util' +local name = 'argon' +local uci = require 'luci.model.uci'.cursor() + +local fstat = nxfs.statvfs(opkg.overlay_root()) +local space_total = fstat and fstat.blocks or 0 +local space_free = fstat and fstat.bfree or 0 +local space_used = space_total - space_free + +local free_byte = space_free * fstat.frsize + +local primary, dark_primary, blur_radius, blur_radius_dark, blur_opacity, mode +if nxfs.access('/etc/config/argon') then + primary = uci:get_first('argon', 'global', 'primary') + dark_primary = uci:get_first('argon', 'global', 'dark_primary') + blur_radius = uci:get_first('argon', 'global', 'blur') + blur_radius_dark = uci:get_first('argon', 'global', 'blur_dark') + 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') +end + +function glob(...) + local iter, code, msg = nxfs.glob(...) + if iter then + return nutil.consume(iter) + else + return nil, code, msg + end +end + +local transparency_sets = { + 0, + 0.1, + 0.2, + 0.3, + 0.4, + 0.5, + 0.6, + 0.7, + 0.8, + 0.9, + 1 +} + +-- [[ 模糊设置 ]]-- +br = SimpleForm('config', translate('Argon Config'), translate('Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.')) +br.reset = false +br.submit = false +s = br:section(SimpleSection) + +o = s:option(ListValue, 'mode', translate('Theme mode')) +o:value('normal', translate('Follow System')) +o:value('light', translate('Force Light')) +o:value('dark', translate('Force Dark')) +o.default = mode +o.rmempty = false +o.description = translate('You can choose Theme color mode here') + +o = s:option(Value, 'primary', translate('[Light mode] Primary Color'), translate('A HEX Color ; ( Default: #5e72e4 )')) +o.value = primary +o.datatype = ufloat +o.rmempty = false + + + +o = s:option(ListValue, 'transparency', translate('[Light mode] Transparency'), translate('0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: 0.5 )')) +for _, v in ipairs(transparency_sets) do + o:value(v) +end +o.default = blur_opacity +o.datatype = ufloat +o.rmempty = false + +o = s:option(Value, 'blur', translate('[Light mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )')) +o.value = blur_radius +o.datatype = ufloat +o.rmempty = false + +o = s:option(Value, 'dark_primary', translate('[Dark mode] Primary Color'), translate('A HEX Color ; ( Default: #483d8b )')) +o.value = dark_primary +o.datatype = ufloat +o.rmempty = false + +o = s:option(ListValue, 'transparency_dark', translate('[Dark mode] Transparency'), translate('0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )')) +for _, v in ipairs(transparency_sets) do + o:value(v) +end +o.default = blur_opacity_dark +o.datatype = ufloat +o.rmempty = false + +o = s:option(Value, 'blur_dark', translate('[Dark mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )')) +o.value = blur_radius_dark +o.datatype = ufloat +o.rmempty = false + +o = s:option(Button, 'save', translate('Save Changes')) +o.inputstyle = 'reload' + +function br.handle(self, state, data) + if (state == FORM_VALID and data.blur ~= nil and data.blur_dark ~= nil and data.transparency ~= nil and data.transparency_dark ~= nil and data.mode ~= nil) then + nxfs.writefile('/tmp/aaa', data) + for key, value in pairs(data) do + uci:set('argon','@global[0]',key,value) + end + uci:commit('argon') + end + return true +end + +ful = SimpleForm('upload', translate('Upload (Free: ') .. wa.byte_format(free_byte) .. ')', translate("You can upload files such as jpg,png,gif,mp4 files, To change the login page background.")) +ful.reset = false +ful.submit = false + +sul = ful:section(SimpleSection, '', translate("Upload file to '/www/luci-static/argon/background/'")) +fu = sul:option(FileUpload, '') +fu.template = 'argon-config/other_upload' +um = sul:option(DummyValue, '', nil) +um.template = 'argon-config/other_dvalue' + +local dir, fd +dir = '/www/luci-static/argon/background/' +nxfs.mkdir(dir) +http.setfilehandler( + function(meta, chunk, eof) + if not fd then + if not meta then + return + end + + if meta and chunk then + fd = nixio.open(dir .. meta.file, 'w') + end + + if not fd then + um.value = translate('Create upload file error.') + return + end + end + if chunk and fd then + fd:write(chunk) + end + if eof and fd then + fd:close() + fd = nil + um.value = translate('File saved to') .. ' "/www/luci-static/argon/background/' .. meta.file .. '"' + end + end +) + +if http.formvalue('upload') then + local f = http.formvalue('ulfile') + if #f <= 0 then + um.value = translate('No specify upload file.') + end +end + +local function getSizeStr(size) + local i = 0 + local byteUnits = {' kB', ' MB', ' GB', ' TB'} + repeat + size = size / 1024 + i = i + 1 + until (size <= 1024) + return string.format('%.1f', size) .. byteUnits[i] +end + +local inits, attr = {} +for i, f in ipairs(glob(dir .. '*')) do + attr = nxfs.stat(f) + if attr then + inits[i] = {} + inits[i].name = nxfs.basename(f) + inits[i].mtime = os.date('%Y-%m-%d %H:%M:%S', attr.mtime) + inits[i].modestr = attr.modestr + inits[i].size = getSizeStr(attr.size) + inits[i].remove = 0 + inits[i].install = false + end +end + +form = SimpleForm('filelist', translate('Background file list'), nil) +form.reset = false +form.submit = false + +tb = form:section(Table, inits) +nm = tb:option(DummyValue, 'name', translate('File name')) +mt = tb:option(DummyValue, 'mtime', translate('Modify time')) +sz = tb:option(DummyValue, 'size', translate('Size')) +btnrm = tb:option(Button, 'remove', translate('Remove')) +btnrm.render = function(self, section, scope) + self.inputstyle = 'remove' + Button.render(self, section, scope) +end + +btnrm.write = function(self, section) + local v = nxfs.unlink(dir .. nxfs.basename(inits[section].name)) + if v then + table.remove(inits, section) + end + return v +end + +function IsIpkFile(name) + name = name or '' + local ext = string.lower(string.sub(name, -4, -1)) + return ext == '.ipk' +end + +return br, ful, form diff --git a/luasrc/view/argon-config/other_button.htm b/luasrc/view/argon-config/other_button.htm new file mode 100644 index 0000000..1c391ad --- /dev/null +++ b/luasrc/view/argon-config/other_button.htm @@ -0,0 +1,7 @@ +<%+cbi/valueheader%> + <% if self:cfgvalue(section) ~= false then %> + " style="display: <%= display %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> /> + <% else %> + - + <% end %> +<%+cbi/valuefooter%> diff --git a/luasrc/view/argon-config/other_dvalue.htm b/luasrc/view/argon-config/other_dvalue.htm new file mode 100644 index 0000000..296c61e --- /dev/null +++ b/luasrc/view/argon-config/other_dvalue.htm @@ -0,0 +1,8 @@ +<%+cbi/valueheader%> + +<% + local val = self:cfgvalue(section) or self.default or "" + write(pcdata(val)) +%> + +<%+cbi/valuefooter%> diff --git a/luasrc/view/argon-config/other_upload.htm b/luasrc/view/argon-config/other_upload.htm new file mode 100644 index 0000000..ceb518e --- /dev/null +++ b/luasrc/view/argon-config/other_upload.htm @@ -0,0 +1,5 @@ +<%+cbi/valueheader%> + + + +<%+cbi/valuefooter%> diff --git a/po/zh-cn/argon-config.po b/po/zh-cn/argon-config.po new file mode 100644 index 0000000..0976e94 --- /dev/null +++ b/po/zh-cn/argon-config.po @@ -0,0 +1,124 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: dingpengyu \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"X-Generator: Poedit 2.3.1\n" + +msgid "Argon Config" +msgstr "Argon 主题设置" + +msgid "Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos." +msgstr "在这里你可以设置argon 主题的登录页面的模糊和透明度，并管理背景图片与视频。" + +msgid "Theme mode" +msgstr "主题模式" + +msgid "Follow System" +msgstr "跟随系统" + +msgid "Force Light" +msgstr "强制亮色" + +msgid "Force Dark" +msgstr "强制暗色" + +msgid "You can choose Theme color mode here" +msgstr "你可以选择喜欢的主题模式" + +msgid "[Light mode] Primary Color" +msgstr "[亮色模式] 主色调" + +msgid "[Dark mode] Primary Color" +msgstr "[暗色模式] 主色调" + +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "十六进制颜色值 ( 预设为：#5e72e4 )" + +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "十六进制颜色值 ( 预设为：#483d8b )" + +msgid "[Light mode] Transparency" +msgstr "[亮色模式] 透明度" + +msgid "[Light mode] Transparency" +msgstr "[亮色模式] 透明度" + +msgid "[Dark mode] Transparency" +msgstr "[暗色模式] 透明度" + +msgid "0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: 0.5 )" +msgstr "0最透明 - 1不透明 ; ( 建议: 透明 0 或 半透明预设 0.5 )" + +msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" +msgstr "0最透明 - 1不透明 ; ( 建议: 黑色半透明 0.5 )" + +msgid "[Light mode] Frosted Glass Radius" +msgstr "[亮色模式] 毛玻璃模糊半径" + +msgid "[Dark mode] Frosted Glass Radius" +msgstr "[暗色模式] 毛玻璃模糊半径" + +msgid "Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" +msgstr "值越大越模糊; ( 建议: 清透 1 或 模糊预设 10 )" + +msgid "You can upload files such as jpg,png,gif,mp4 files, To change the login page background." +msgstr "你可以上传jpg、png、gif或mp4文件，以创建自己喜欢的登录界面" + +msgid "Save Changes" +msgstr "保存更改" + +msgid "Choose local file:" +msgstr "选择本地文件：" + +msgid "Couldn't open file:" +msgstr "无法打开文件：" + +msgid "Create upload file error." +msgstr "创建上传文件失败。" + + +msgid "File name" +msgstr "文件名" + +msgid "File saved to" +msgstr "文件保存到" + +msgid "FileTransfer" +msgstr "文件传输" + +msgid "Install" +msgstr "安装" + +msgid "Attributes" +msgstr "属性" + +msgid "Modify time" +msgstr "修改时间" + +msgid "No specify upload file." +msgstr "未指定上传文件。" + +msgid "Path on Route:" +msgstr "路由根目录：" + +msgid "Remove" +msgstr "移除" + +msgid "Size" +msgstr "大小" + +msgid "Upload (Free:" +msgstr "上传 (剩余空间：" + +msgid "Background file list" +msgstr "背景文件列表" + +msgid "Upload file to '/www/luci-static/argon/background/'" +msgstr "文件将上传到'/www/luci-static/argon/background/'" diff --git a/root/etc/config/argon b/root/etc/config/argon new file mode 100644 index 0000000..11fb00f --- /dev/null +++ b/root/etc/config/argon @@ -0,0 +1,8 @@ +config global + option primary '#5e72e4' + option dark_primary '#483d8b' + option blur '10' + option blur_dark '10' + option transparency '0.5' + option transparency_dark '0.5' + option mode 'normal' \ No newline at end of file diff --git a/root/etc/uci-defaults/luci-argon-config b/root/etc/uci-defaults/luci-argon-config new file mode 100644 index 0000000..935d7c8 --- /dev/null +++ b/root/etc/uci-defaults/luci-argon-config @@ -0,0 +1,6 @@ +#!/bin/sh + +sed -i 's/cbi.submit\"] = true/cbi.submit\"] = \"1\"/g' /usr/lib/lua/luci/dispatcher.lua + +rm -f /tmp/luci-indexcache +exit 0 From 9207c78a5c4dc3d2dc3d6da633a7f90583ccdd8f Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Sun, 13 Sep 2020 22:01:47 +0800 Subject: [PATCH 03/10] update --- Makefile | 2 +- README.md | 2 ++ luasrc/model/cbi/argon-config/configuration.lua | 12 ++++++------ po/zh-cn/argon-config.po | 4 ++-- root/usr/share/rpcd/acl.d/luci-app-argon-config.json | 11 +++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 root/usr/share/rpcd/acl.d/luci-app-argon-config.json diff --git a/Makefile b/Makefile index 1333d89..e15613a 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-argon-config LUCI_PKGARCH:=all -PKG_VERSION:=0.7 +PKG_VERSION:=0.8 PKG_RELEASE:=beta include $(INCLUDE_DIR)/package.mk diff --git a/README.md b/README.md index 644aeb1..5921203 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # luci-app-argon-config Argon Theme Config Plugin + +You can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos. \ No newline at end of file diff --git a/luasrc/model/cbi/argon-config/configuration.lua b/luasrc/model/cbi/argon-config/configuration.lua index 5af5374..c85a46c 100644 --- a/luasrc/model/cbi/argon-config/configuration.lua +++ b/luasrc/model/cbi/argon-config/configuration.lua @@ -49,10 +49,10 @@ local transparency_sets = { } -- [[ 模糊设置 ]]-- -br = SimpleForm('config', translate('Argon Config'), translate('Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.')) +br = SimpleForm('config', translate('Argon Config'), translate('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]')) br.reset = false br.submit = false -s = br:section(SimpleSection) +s = br:section(SimpleSection) o = s:option(ListValue, 'mode', translate('Theme mode')) o:value('normal', translate('Follow System')) @@ -63,7 +63,7 @@ o.rmempty = false o.description = translate('You can choose Theme color mode here') o = s:option(Value, 'primary', translate('[Light mode] Primary Color'), translate('A HEX Color ; ( Default: #5e72e4 )')) -o.value = primary +o.default = primary o.datatype = ufloat o.rmempty = false @@ -78,12 +78,12 @@ o.datatype = ufloat o.rmempty = false o = s:option(Value, 'blur', translate('[Light mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )')) -o.value = blur_radius +o.default = blur_radius o.datatype = ufloat o.rmempty = false o = s:option(Value, 'dark_primary', translate('[Dark mode] Primary Color'), translate('A HEX Color ; ( Default: #483d8b )')) -o.value = dark_primary +o.default = dark_primary o.datatype = ufloat o.rmempty = false @@ -96,7 +96,7 @@ o.datatype = ufloat o.rmempty = false o = s:option(Value, 'blur_dark', translate('[Dark mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )')) -o.value = blur_radius_dark +o.default = blur_radius_dark o.datatype = ufloat o.rmempty = false diff --git a/po/zh-cn/argon-config.po b/po/zh-cn/argon-config.po index 0976e94..6fa5e3b 100644 --- a/po/zh-cn/argon-config.po +++ b/po/zh-cn/argon-config.po @@ -14,8 +14,8 @@ msgstr "" msgid "Argon Config" msgstr "Argon 主题设置" -msgid "Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos." -msgstr "在这里你可以设置argon 主题的登录页面的模糊和透明度，并管理背景图片与视频。" +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 "在这里你可以设置argon 主题的登录页面的模糊和透明度，并管理背景图片与视频。[建议使用 Chrome]" msgid "Theme mode" msgstr "主题模式" diff --git a/root/usr/share/rpcd/acl.d/luci-app-argon-config.json b/root/usr/share/rpcd/acl.d/luci-app-argon-config.json new file mode 100644 index 0000000..b237aff --- /dev/null +++ b/root/usr/share/rpcd/acl.d/luci-app-argon-config.json @@ -0,0 +1,11 @@ +{ + "luci-argon-config": { + "description": "Luci Argon theme config ", + "read": { + "uci": [ "argon" ] + }, + "write": { + "uci": [ "argon" ] + } + } +} \ No newline at end of file From 4568f6b3b4192122fe09f5f259e0f0c4642fb0ae Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Fri, 4 Dec 2020 18:07:11 +0800 Subject: [PATCH 04/10] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e15613a..7ed2d22 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ define Package/luci-app-argon-config SUBMENU:=3. Applications TITLE:=LuCI page for Argon Config PKGARCH:=all - DEPENDS:= + DEPENDS:=luci-lib-ipkg +luci-compat endef define Build/Prepare From 92d63919cace3f934f06513b6f530e9201d03c78 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Sat, 5 Dec 2020 12:24:54 +0800 Subject: [PATCH 05/10] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ed2d22..4b3dd0a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ define Package/luci-app-argon-config SUBMENU:=3. Applications TITLE:=LuCI page for Argon Config PKGARCH:=all - DEPENDS:=luci-lib-ipkg +luci-compat + DEPENDS:=+luci-compat endef define Build/Prepare From a3430cf5230fae67f7b6f82465badc6cdd67c293 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Tue, 9 Mar 2021 14:22:37 +0800 Subject: [PATCH 06/10] bump to v0.9 --- Makefile | 4 ++-- luasrc/model/cbi/argon-config/configuration.lua | 7 +++++++ po/zh-cn/argon-config.po | 9 +++++++++ root/etc/config/argon | 3 ++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4b3dd0a..4e1d5ce 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-argon-config LUCI_PKGARCH:=all -PKG_VERSION:=0.8 -PKG_RELEASE:=beta +PKG_VERSION:=0.9 +PKG_RELEASE:=20210309 include $(INCLUDE_DIR)/package.mk diff --git a/luasrc/model/cbi/argon-config/configuration.lua b/luasrc/model/cbi/argon-config/configuration.lua index c85a46c..f1f0ec7 100644 --- a/luasrc/model/cbi/argon-config/configuration.lua +++ b/luasrc/model/cbi/argon-config/configuration.lua @@ -23,6 +23,7 @@ if nxfs.access('/etc/config/argon') then 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') + bing_background = uci:get_first('argon', 'global', 'bing_background') end function glob(...) @@ -54,6 +55,12 @@ br.reset = false br.submit = false s = br:section(SimpleSection) +o = s:option(ListValue, 'bing_background', translate('Wallpaper Source')) +o:value('0', translate('Built-in')) +o:value('1', translate('Bing Wallpapers')) +o.default = bing_background +o.rmempty = false + o = s:option(ListValue, 'mode', translate('Theme mode')) o:value('normal', translate('Follow System')) o:value('light', translate('Force Light')) diff --git a/po/zh-cn/argon-config.po b/po/zh-cn/argon-config.po index 6fa5e3b..1d25348 100644 --- a/po/zh-cn/argon-config.po +++ b/po/zh-cn/argon-config.po @@ -17,6 +17,15 @@ msgstr "Argon 主题设置" 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 "在这里你可以设置argon 主题的登录页面的模糊和透明度，并管理背景图片与视频。[建议使用 Chrome]" +msgid "Wallpaper Source" +msgstr "壁纸来源" + +msgid "Built-in" +msgstr "内建" + +msgid "Bing Wallpapers" +msgstr "Bing 壁纸" + msgid "Theme mode" msgstr "主题模式" diff --git a/root/etc/config/argon b/root/etc/config/argon index 11fb00f..c5d6313 100644 --- a/root/etc/config/argon +++ b/root/etc/config/argon @@ -5,4 +5,5 @@ config global option blur_dark '10' option transparency '0.5' option transparency_dark '0.5' - option mode 'normal' \ No newline at end of file + option mode 'normal' + option bing_background '0' \ No newline at end of file From 92084081d0f6f47918e3428833c62920622333fc Mon Sep 17 00:00:00 2001 From: Franco Castillo Date: Mon, 15 Mar 2021 22:04:08 -0300 Subject: [PATCH 07/10] i18n: add template & Spanish translation Signed-off-by: Franco Castillo --- po/es/argon-config.po | 176 ++++++++++++++++++++++++++++++++++ po/templates/argon-config.pot | 155 ++++++++++++++++++++++++++++++ 2 files changed, 331 insertions(+) create mode 100644 po/es/argon-config.po create mode 100644 po/templates/argon-config.pot diff --git a/po/es/argon-config.po b/po/es/argon-config.po new file mode 100644 index 0000000..951ced4 --- /dev/null +++ b/po/es/argon-config.po @@ -0,0 +1,176 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: 2021-03-15 21:25-0300\n" +"PO-Revision-Date: 2021-03-15 21:58-0300\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.2\n" +"Last-Translator: Franco Castillo \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: es\n" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" +msgstr "" +"0 transparente - 1 opaco; (Sugerencia: negro translúcido preestablecido: 0.5)" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +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)" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "Un color HEX; (Predeterminado: #483d8b)" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "Un color HEX; (Predeterminado: #5e72e4)" + +#: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +msgid "Argon Config" +msgstr "Configuración de Argon" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:195 +msgid "Background file list" +msgstr "Lista de archivos de fondo" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:60 +msgid "Bing Wallpapers" +msgstr "Fondos de Bing" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:59 +msgid "Built-in" +msgstr "Integrado" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:2 +msgid "Choose local file:" +msgstr "Elija un archivo local:" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:149 +msgid "Create upload file error." +msgstr "Crear archivo de error de carga." + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:200 +msgid "File name" +msgstr "Nombre del archivo" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:159 +msgid "File saved to" +msgstr "Archivo guardado en" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:65 +msgid "Follow System" +msgstr "Seguir el sistema" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:67 +msgid "Force Dark" +msgstr "Fuerza oscuro" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:66 +msgid "Force Light" +msgstr "Forzar claro" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +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]" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +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)" + +#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 +msgid "Luci Argon theme config" +msgstr "Configuración del tema Luci Argon" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:201 +msgid "Modify time" +msgstr "Modificar la hora" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:167 +msgid "No specify upload file." +msgstr "No especificar archivo de carga." + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:203 +msgid "Remove" +msgstr "Eliminar" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:110 +msgid "Save Changes" +msgstr "Guardar cambios" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:202 +msgid "Size" +msgstr "Tamaño" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:64 +msgid "Theme mode" +msgstr "Modo del tema" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:4 +msgid "Upload" +msgstr "Cargar" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "Upload (Free:" +msgstr "Cargar (Libre:" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:128 +msgid "Upload file to '/www/luci-static/argon/background/'" +msgstr "Subir archivo a '/www/luci-static/argon/background/'" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:58 +msgid "Wallpaper Source" +msgstr "Fuente del fondo de pantalla" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:70 +msgid "You can choose Theme color mode here" +msgstr "Puede elegir el modo de color del tema aquí" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "" +"You can upload files such as jpg,png,gif,mp4 files, To change the login page " +"background." +msgstr "" +"Puede cargar archivos como jpg, png, gif, mp4, para cambiar el fondo de la " +"página de inicio de sesión." + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "[Dark mode] Frosted Glass Radius" +msgstr "[Modo oscuro] Radio de vidrio esmerilado" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "[Dark mode] Primary Color" +msgstr "[Modo oscuro] Color primario" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "[Dark mode] Transparency" +msgstr "[Modo oscuro] Transparencia" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +msgid "[Light mode] Frosted Glass Radius" +msgstr "[Modo claro] Radio de vidrio esmerilado" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "[Light mode] Primary Color" +msgstr "[Modo claro] Color primario" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "[Light mode] Transparency" +msgstr "[Modo claro] Transparencia" diff --git a/po/templates/argon-config.pot b/po/templates/argon-config.pot new file mode 100644 index 0000000..b078a8a --- /dev/null +++ b/po/templates/argon-config.pot @@ -0,0 +1,155 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "" +"0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: " +"0.5 )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +msgid "Argon Config" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:195 +msgid "Background file list" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:60 +msgid "Bing Wallpapers" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:59 +msgid "Built-in" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:2 +msgid "Choose local file:" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:149 +msgid "Create upload file error." +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:200 +msgid "File name" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:159 +msgid "File saved to" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:65 +msgid "Follow System" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:67 +msgid "Force Dark" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:66 +msgid "Force Light" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +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/luasrc/model/cbi/argon-config/configuration.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "" +"Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" +msgstr "" + +#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 +msgid "Luci Argon theme config" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:201 +msgid "Modify time" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:167 +msgid "No specify upload file." +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:203 +msgid "Remove" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:110 +msgid "Save Changes" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:202 +msgid "Size" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:64 +msgid "Theme mode" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:4 +msgid "Upload" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "Upload (Free:" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:128 +msgid "Upload file to '/www/luci-static/argon/background/'" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:58 +msgid "Wallpaper Source" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:70 +msgid "You can choose Theme color mode here" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "" +"You can upload files such as jpg,png,gif,mp4 files, To change the login page " +"background." +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "[Dark mode] Frosted Glass Radius" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "[Dark mode] Primary Color" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "[Dark mode] Transparency" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +msgid "[Light mode] Frosted Glass Radius" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "[Light mode] Primary Color" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "[Light mode] Transparency" +msgstr "" From 24dd3169edf02474d5f13c7594af37325c175c41 Mon Sep 17 00:00:00 2001 From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> Date: Tue, 20 Apr 2021 07:42:04 +0000 Subject: [PATCH 08/10] Tidy up files --- luasrc/controller/argon-config.lua | 7 +- .../configuration.lua => argon-config.lua} | 0 po/es/argon-config.po | 68 +++++++++---------- po/templates/argon-config.pot | 68 +++++++++---------- 4 files changed, 72 insertions(+), 71 deletions(-) rename luasrc/model/cbi/{argon-config/configuration.lua => argon-config.lua} (100%) diff --git a/luasrc/controller/argon-config.lua b/luasrc/controller/argon-config.lua index 8810e37..68bff28 100644 --- a/luasrc/controller/argon-config.lua +++ b/luasrc/controller/argon-config.lua @@ -6,7 +6,8 @@ module("luci.controller.argon-config", package.seeall) function index() if not nixio.fs.access('/www/luci-static/argon/css/cascade.css') then - return - end - entry({"admin", "system", "argon-config"}, form("argon-config/configuration"), _("Argon Config"),90) + return + end + + entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90) end diff --git a/luasrc/model/cbi/argon-config/configuration.lua b/luasrc/model/cbi/argon-config.lua similarity index 100% rename from luasrc/model/cbi/argon-config/configuration.lua rename to luasrc/model/cbi/argon-config.lua diff --git a/po/es/argon-config.po b/po/es/argon-config.po index 951ced4..d5c178a 100644 --- a/po/es/argon-config.po +++ b/po/es/argon-config.po @@ -12,12 +12,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "Language: es\n" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:97 msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" msgstr "" "0 transparente - 1 opaco; (Sugerencia: negro translúcido preestablecido: 0.5)" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:79 msgid "" "0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: " "0.5 )" @@ -25,28 +25,28 @@ msgstr "" "0 transparente - 1 opaco; (Sugerencia: transparente: 0 o translúcido " "preestablecido: 0.5)" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:92 msgid "A HEX Color ; ( Default: #483d8b )" msgstr "Un color HEX; (Predeterminado: #483d8b)" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:72 msgid "A HEX Color ; ( Default: #5e72e4 )" msgstr "Un color HEX; (Predeterminado: #5e72e4)" #: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 msgid "Argon Config" msgstr "Configuración de Argon" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:195 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:195 msgid "Background file list" msgstr "Lista de archivos de fondo" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:60 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:60 msgid "Bing Wallpapers" msgstr "Fondos de Bing" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:59 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:59 msgid "Built-in" msgstr "Integrado" @@ -54,31 +54,31 @@ msgstr "Integrado" msgid "Choose local file:" msgstr "Elija un archivo local:" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:149 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:149 msgid "Create upload file error." msgstr "Crear archivo de error de carga." -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:200 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:200 msgid "File name" msgstr "Nombre del archivo" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:159 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:159 msgid "File saved to" msgstr "Archivo guardado en" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:65 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:65 msgid "Follow System" msgstr "Seguir el sistema" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:67 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:67 msgid "Force Dark" msgstr "Fuerza oscuro" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:66 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:66 msgid "Force Light" msgstr "Forzar claro" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 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]" @@ -87,8 +87,8 @@ msgstr "" "inicio de sesión del tema argon y administrar las imágenes de fondo y los " "videos. [Se recomienda Chrome]" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:105 msgid "" "Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" msgstr "" @@ -99,27 +99,27 @@ msgstr "" msgid "Luci Argon theme config" msgstr "Configuración del tema Luci Argon" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:201 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:201 msgid "Modify time" msgstr "Modificar la hora" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:167 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:167 msgid "No specify upload file." msgstr "No especificar archivo de carga." -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:203 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:203 msgid "Remove" msgstr "Eliminar" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:110 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:110 msgid "Save Changes" msgstr "Guardar cambios" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:202 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:202 msgid "Size" msgstr "Tamaño" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:64 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:64 msgid "Theme mode" msgstr "Modo del tema" @@ -127,23 +127,23 @@ msgstr "Modo del tema" msgid "Upload" msgstr "Cargar" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:124 msgid "Upload (Free:" msgstr "Cargar (Libre:" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:128 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:128 msgid "Upload file to '/www/luci-static/argon/background/'" msgstr "Subir archivo a '/www/luci-static/argon/background/'" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:58 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:58 msgid "Wallpaper Source" msgstr "Fuente del fondo de pantalla" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:70 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:70 msgid "You can choose Theme color mode here" msgstr "Puede elegir el modo de color del tema aquí" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:124 msgid "" "You can upload files such as jpg,png,gif,mp4 files, To change the login page " "background." @@ -151,26 +151,26 @@ msgstr "" "Puede cargar archivos como jpg, png, gif, mp4, para cambiar el fondo de la " "página de inicio de sesión." -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:105 msgid "[Dark mode] Frosted Glass Radius" msgstr "[Modo oscuro] Radio de vidrio esmerilado" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:92 msgid "[Dark mode] Primary Color" msgstr "[Modo oscuro] Color primario" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:97 msgid "[Dark mode] Transparency" msgstr "[Modo oscuro] Transparencia" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:87 msgid "[Light mode] Frosted Glass Radius" msgstr "[Modo claro] Radio de vidrio esmerilado" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:72 msgid "[Light mode] Primary Color" msgstr "[Modo claro] Color primario" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:79 msgid "[Light mode] Transparency" msgstr "[Modo claro] Transparencia" diff --git a/po/templates/argon-config.pot b/po/templates/argon-config.pot index b078a8a..c74c18f 100644 --- a/po/templates/argon-config.pot +++ b/po/templates/argon-config.pot @@ -1,38 +1,38 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:97 msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:79 msgid "" "0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: " "0.5 )" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:92 msgid "A HEX Color ; ( Default: #483d8b )" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:72 msgid "A HEX Color ; ( Default: #5e72e4 )" msgstr "" #: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 msgid "Argon Config" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:195 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:195 msgid "Background file list" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:60 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:60 msgid "Bing Wallpapers" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:59 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:59 msgid "Built-in" msgstr "" @@ -40,38 +40,38 @@ msgstr "" msgid "Choose local file:" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:149 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:149 msgid "Create upload file error." msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:200 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:200 msgid "File name" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:159 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:159 msgid "File saved to" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:65 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:65 msgid "Follow System" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:67 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:67 msgid "Force Dark" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:66 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:66 msgid "Force Light" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 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/luasrc/model/cbi/argon-config/configuration.lua:87 -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:105 msgid "" "Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" msgstr "" @@ -80,27 +80,27 @@ msgstr "" msgid "Luci Argon theme config" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:201 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:201 msgid "Modify time" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:167 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:167 msgid "No specify upload file." msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:203 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:203 msgid "Remove" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:110 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:110 msgid "Save Changes" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:202 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:202 msgid "Size" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:64 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:64 msgid "Theme mode" msgstr "" @@ -108,48 +108,48 @@ msgstr "" msgid "Upload" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:124 msgid "Upload (Free:" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:128 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:128 msgid "Upload file to '/www/luci-static/argon/background/'" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:58 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:58 msgid "Wallpaper Source" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:70 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:70 msgid "You can choose Theme color mode here" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:124 msgid "" "You can upload files such as jpg,png,gif,mp4 files, To change the login page " "background." msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:105 msgid "[Dark mode] Frosted Glass Radius" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:92 msgid "[Dark mode] Primary Color" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:97 msgid "[Dark mode] Transparency" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:87 msgid "[Light mode] Frosted Glass Radius" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:72 msgid "[Light mode] Primary Color" msgstr "" -#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:79 msgid "[Light mode] Transparency" msgstr "" From f435fceac8f6ea27fe6892f8c850b1cf3fab0539 Mon Sep 17 00:00:00 2001 From: zxlhhyccc <45259624+zxlhhyccc@users.noreply.github.com> Date: Wed, 23 Jun 2021 14:56:08 +0000 Subject: [PATCH 09/10] adapt LuCI style of luci-theme-openwrt-2020 --- luasrc/view/argon-config/other_upload.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luasrc/view/argon-config/other_upload.htm b/luasrc/view/argon-config/other_upload.htm index ceb518e..d853aa2 100644 --- a/luasrc/view/argon-config/other_upload.htm +++ b/luasrc/view/argon-config/other_upload.htm @@ -1,5 +1,5 @@ <%+cbi/valueheader%> - + <%+cbi/valuefooter%> From 4f2ffdf66d4fe116074934e9a039721662e691f8 Mon Sep 17 00:00:00 2001 From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> Date: Fri, 2 Jul 2021 17:32:46 +0000 Subject: [PATCH 10/10] Correct file permissions --- root/etc/uci-defaults/luci-argon-config | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/etc/uci-defaults/luci-argon-config diff --git a/root/etc/uci-defaults/luci-argon-config b/root/etc/uci-defaults/luci-argon-config old mode 100644 new mode 100755