From 28ad881cb3d3ae16afe0c759d69a14a59c7dc79f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 20:31:31 +0800 Subject: [PATCH] update-12.03 --- luci-app-argonne-config/Makefile | 46 ++++ luci-app-argonne-config/README.md | 8 + .../luasrc/controller/argonne-config.lua | 13 + .../luasrc/model/cbi/argonne-config.lua | 223 ++++++++++++++++++ .../view/argonne-config/other_button.htm | 7 + .../view/argonne-config/other_dvalue.htm | 8 + .../view/argonne-config/other_upload.htm | 5 + .../po/es/argonne-config.po | 176 ++++++++++++++ .../po/templates/argonne-config.pot | 155 ++++++++++++ .../po/zh-cn/argonne-config.po | 133 +++++++++++ .../po/zh_Hans/argonne-config.po | 133 +++++++++++ .../root/etc/config/argonne | 9 + .../root/etc/uci-defaults/luci-argonne-config | 6 + .../rpcd/acl.d/luci-app-argonne-config.json | 11 + luci-app-store/Makefile | 2 +- luci-app-store/luasrc/controller/store.lua | 8 +- 16 files changed, 939 insertions(+), 4 deletions(-) create mode 100644 luci-app-argonne-config/Makefile create mode 100644 luci-app-argonne-config/README.md create mode 100755 luci-app-argonne-config/luasrc/controller/argonne-config.lua create mode 100755 luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua create mode 100755 luci-app-argonne-config/luasrc/view/argonne-config/other_button.htm create mode 100755 luci-app-argonne-config/luasrc/view/argonne-config/other_dvalue.htm create mode 100755 luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm create mode 100755 luci-app-argonne-config/po/es/argonne-config.po create mode 100755 luci-app-argonne-config/po/templates/argonne-config.pot create mode 100755 luci-app-argonne-config/po/zh-cn/argonne-config.po create mode 100755 luci-app-argonne-config/po/zh_Hans/argonne-config.po create mode 100755 luci-app-argonne-config/root/etc/config/argonne create mode 100755 luci-app-argonne-config/root/etc/uci-defaults/luci-argonne-config create mode 100755 luci-app-argonne-config/root/usr/share/rpcd/acl.d/luci-app-argonne-config.json diff --git a/luci-app-argonne-config/Makefile b/luci-app-argonne-config/Makefile new file mode 100644 index 000000000..df156fc2d --- /dev/null +++ b/luci-app-argonne-config/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-argonne-config +LUCI_PKGARCH:=all +PKG_VERSION:=0.10 +PKG_RELEASE:=20211203 + +include $(INCLUDE_DIR)/package.mk + +define Package/luci-app-argonne-config + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=3. Applications + TITLE:=LuCI page for argonne Config + PKGARCH:=all + DEPENDS:=+luci-compat +endef + +define Build/Prepare +endef + +define Build/Compile +endef + + +define Package/luci-app-argonne-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/argonne-config.po $(1)/usr/lib/lua/luci/i18n/argonne-config.zh-cn.lmo +endef + + +$(eval $(call BuildPackage,luci-app-argonne-config)) + +# call BuildPackage - OpenWrt buildroot signature + + diff --git a/luci-app-argonne-config/README.md b/luci-app-argonne-config/README.md new file mode 100644 index 000000000..f597aaef2 --- /dev/null +++ b/luci-app-argonne-config/README.md @@ -0,0 +1,8 @@ +# luci-app-argonne-config +argonne Theme Config Plugin + +You can set the blur and transparency of the login page of argonne theme, and manage the background pictures and videos. + ++ 修改为argonne ，用于配合luci-app-argonne主题， + ++ lean源码编译时无需再去删除源码自带的argon主题。 diff --git a/luci-app-argonne-config/luasrc/controller/argonne-config.lua b/luci-app-argonne-config/luasrc/controller/argonne-config.lua new file mode 100755 index 000000000..d0d246f23 --- /dev/null +++ b/luci-app-argonne-config/luasrc/controller/argonne-config.lua @@ -0,0 +1,13 @@ +--[[ +luci-app-argonne-config +]]-- + +module("luci.controller.argonne-config", package.seeall) + +function index() + if not nixio.fs.access('/www/luci-static/argonne/css/cascade.css') then + return + end + + entry({"admin", "system", "argonne-config"}, form("argonne-config"), _("argonne Config"), 90) +end diff --git a/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua b/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua new file mode 100755 index 000000000..9bdb7f75b --- /dev/null +++ b/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua @@ -0,0 +1,223 @@ +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 = 'argonne' +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/argonne') then + primary = uci:get_first('argonne', 'global', 'primary') + dark_primary = uci:get_first('argonne', 'global', 'dark_primary') + blur_radius = uci:get_first('argonne', 'global', 'blur') + blur_radius_dark = uci:get_first('argonne', 'global', 'blur_dark') + blur_opacity = uci:get_first('argonne', 'global', 'transparency') + blur_opacity_dark = uci:get_first('argonne', 'global', 'transparency_dark') + mode = uci:get_first('argonne', 'global', 'mode') + bing_background = uci:get_first('argonne', 'global', 'bing_background') +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('argonne Config'), translate('Here you can set the blur and transparency of the login page of argonne theme, and manage the background pictures and videos.[Chrome is recommended]')) +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')) +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.default = 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.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.default = 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.default = 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('argonne','@global[0]',key,value) + end + uci:commit('argonne') + 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/argonne/background/'")) +fu = sul:option(FileUpload, '') +fu.template = 'argonne-config/other_upload' +um = sul:option(DummyValue, '', nil) +um.template = 'argonne-config/other_dvalue' + +local dir, fd +dir = '/www/luci-static/argonne/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/argonne/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/luci-app-argonne-config/luasrc/view/argonne-config/other_button.htm b/luci-app-argonne-config/luasrc/view/argonne-config/other_button.htm new file mode 100755 index 000000000..1c391ad98 --- /dev/null +++ b/luci-app-argonne-config/luasrc/view/argonne-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/luci-app-argonne-config/luasrc/view/argonne-config/other_dvalue.htm b/luci-app-argonne-config/luasrc/view/argonne-config/other_dvalue.htm new file mode 100755 index 000000000..296c61e4d --- /dev/null +++ b/luci-app-argonne-config/luasrc/view/argonne-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/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm b/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm new file mode 100755 index 000000000..d853aa240 --- /dev/null +++ b/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm @@ -0,0 +1,5 @@ +<%+cbi/valueheader%> + + + +<%+cbi/valuefooter%> diff --git a/luci-app-argonne-config/po/es/argonne-config.po b/luci-app-argonne-config/po/es/argonne-config.po new file mode 100755 index 000000000..919fb78ed --- /dev/null +++ b/luci-app-argonne-config/po/es/argonne-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-argonne-config/luasrc/model/cbi/argonne-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-argonne-config/luasrc/model/cbi/argonne-config.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-argonne-config/luasrc/model/cbi/argonne-config.lua:92 +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "Un color HEX; (Predeterminado: #483d8b)" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:72 +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "Un color HEX; (Predeterminado: #5e72e4)" + +#: applications/luci-app-argonne-config/luasrc/controller/argonne-config.lua:11 +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:53 +msgid "argonne Config" +msgstr "Configuración de argonne" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:195 +msgid "Background file list" +msgstr "Lista de archivos de fondo" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:60 +msgid "Bing Wallpapers" +msgstr "Fondos de Bing" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:59 +msgid "Built-in" +msgstr "Integrado" + +#: applications/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm:2 +msgid "Choose local file:" +msgstr "Elija un archivo local:" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:149 +msgid "Create upload file error." +msgstr "Crear archivo de error de carga." + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:200 +msgid "File name" +msgstr "Nombre del archivo" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:159 +msgid "File saved to" +msgstr "Archivo guardado en" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:65 +msgid "Follow System" +msgstr "Seguir el sistema" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:67 +msgid "Force Dark" +msgstr "Fuerza oscuro" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:66 +msgid "Force Light" +msgstr "Forzar claro" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:53 +msgid "" +"Here you can set the blur and transparency of the login page of argonne 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 argonne y administrar las imágenes de fondo y los " +"videos. [Se recomienda Chrome]" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:87 +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.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-argonne-config/root/usr/share/rpcd/acl.d/luci-app-argonne-config.json:3 +msgid "Luci argonne theme config" +msgstr "Configuración del tema Luci argonne" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:201 +msgid "Modify time" +msgstr "Modificar la hora" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:167 +msgid "No specify upload file." +msgstr "No especificar archivo de carga." + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:203 +msgid "Remove" +msgstr "Eliminar" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:110 +msgid "Save Changes" +msgstr "Guardar cambios" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:202 +msgid "Size" +msgstr "Tamaño" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:64 +msgid "Theme mode" +msgstr "Modo del tema" + +#: applications/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm:4 +msgid "Upload" +msgstr "Cargar" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:124 +msgid "Upload (Free:" +msgstr "Cargar (Libre:" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:128 +msgid "Upload file to '/www/luci-static/argonne/background/'" +msgstr "Subir archivo a '/www/luci-static/argonne/background/'" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:58 +msgid "Wallpaper Source" +msgstr "Fuente del fondo de pantalla" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:70 +msgid "You can choose Theme color mode here" +msgstr "Puede elegir el modo de color del tema aquí" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.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-argonne-config/luasrc/model/cbi/argonne-config.lua:105 +msgid "[Dark mode] Frosted Glass Radius" +msgstr "[Modo oscuro] Radio de vidrio esmerilado" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:92 +msgid "[Dark mode] Primary Color" +msgstr "[Modo oscuro] Color primario" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:97 +msgid "[Dark mode] Transparency" +msgstr "[Modo oscuro] Transparencia" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:87 +msgid "[Light mode] Frosted Glass Radius" +msgstr "[Modo claro] Radio de vidrio esmerilado" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:72 +msgid "[Light mode] Primary Color" +msgstr "[Modo claro] Color primario" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:79 +msgid "[Light mode] Transparency" +msgstr "[Modo claro] Transparencia" diff --git a/luci-app-argonne-config/po/templates/argonne-config.pot b/luci-app-argonne-config/po/templates/argonne-config.pot new file mode 100755 index 000000000..f6fce0d54 --- /dev/null +++ b/luci-app-argonne-config/po/templates/argonne-config.pot @@ -0,0 +1,155 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:97 +msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:79 +msgid "" +"0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: " +"0.5 )" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:92 +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:72 +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/controller/argonne-config.lua:11 +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:53 +msgid "argonne Config" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:195 +msgid "Background file list" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:60 +msgid "Bing Wallpapers" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:59 +msgid "Built-in" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm:2 +msgid "Choose local file:" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:149 +msgid "Create upload file error." +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:200 +msgid "File name" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:159 +msgid "File saved to" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:65 +msgid "Follow System" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:67 +msgid "Force Dark" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:66 +msgid "Force Light" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:53 +msgid "" +"Here you can set the blur and transparency of the login page of argonne theme, " +"and manage the background pictures and videos.[Chrome is recommended]" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:87 +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:105 +msgid "" +"Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" +msgstr "" + +#: applications/luci-app-argonne-config/root/usr/share/rpcd/acl.d/luci-app-argonne-config.json:3 +msgid "Luci argonne theme config" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:201 +msgid "Modify time" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:167 +msgid "No specify upload file." +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:203 +msgid "Remove" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:110 +msgid "Save Changes" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:202 +msgid "Size" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:64 +msgid "Theme mode" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/view/argonne-config/other_upload.htm:4 +msgid "Upload" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:124 +msgid "Upload (Free:" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:128 +msgid "Upload file to '/www/luci-static/argonne/background/'" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:58 +msgid "Wallpaper Source" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:70 +msgid "You can choose Theme color mode here" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-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-argonne-config/luasrc/model/cbi/argonne-config.lua:105 +msgid "[Dark mode] Frosted Glass Radius" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:92 +msgid "[Dark mode] Primary Color" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:97 +msgid "[Dark mode] Transparency" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:87 +msgid "[Light mode] Frosted Glass Radius" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:72 +msgid "[Light mode] Primary Color" +msgstr "" + +#: applications/luci-app-argonne-config/luasrc/model/cbi/argonne-config.lua:79 +msgid "[Light mode] Transparency" +msgstr "" diff --git a/luci-app-argonne-config/po/zh-cn/argonne-config.po b/luci-app-argonne-config/po/zh-cn/argonne-config.po new file mode 100755 index 000000000..44a4451d5 --- /dev/null +++ b/luci-app-argonne-config/po/zh-cn/argonne-config.po @@ -0,0 +1,133 @@ +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 "argonne Config" +msgstr "argonne 主题设置" + +msgid "Here you can set the blur and transparency of the login page of argonne theme, and manage the background pictures and videos.[Chrome is recommended]" +msgstr "在这里你可以设置argonne 主题的登录页面的模糊和透明度，并管理背景图片与视频。[建议使用 Chrome]" + +msgid "Wallpaper Source" +msgstr "壁纸来源" + +msgid "Built-in" +msgstr "内建" + +msgid "Bing Wallpapers" +msgstr "Bing 壁纸" + +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/argonne/background/'" +msgstr "文件将上传到'/www/luci-static/argonne/background/'" diff --git a/luci-app-argonne-config/po/zh_Hans/argonne-config.po b/luci-app-argonne-config/po/zh_Hans/argonne-config.po new file mode 100755 index 000000000..44a4451d5 --- /dev/null +++ b/luci-app-argonne-config/po/zh_Hans/argonne-config.po @@ -0,0 +1,133 @@ +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 "argonne Config" +msgstr "argonne 主题设置" + +msgid "Here you can set the blur and transparency of the login page of argonne theme, and manage the background pictures and videos.[Chrome is recommended]" +msgstr "在这里你可以设置argonne 主题的登录页面的模糊和透明度，并管理背景图片与视频。[建议使用 Chrome]" + +msgid "Wallpaper Source" +msgstr "壁纸来源" + +msgid "Built-in" +msgstr "内建" + +msgid "Bing Wallpapers" +msgstr "Bing 壁纸" + +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/argonne/background/'" +msgstr "文件将上传到'/www/luci-static/argonne/background/'" diff --git a/luci-app-argonne-config/root/etc/config/argonne b/luci-app-argonne-config/root/etc/config/argonne new file mode 100755 index 000000000..c5d631341 --- /dev/null +++ b/luci-app-argonne-config/root/etc/config/argonne @@ -0,0 +1,9 @@ +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' + option bing_background '0' \ No newline at end of file diff --git a/luci-app-argonne-config/root/etc/uci-defaults/luci-argonne-config b/luci-app-argonne-config/root/etc/uci-defaults/luci-argonne-config new file mode 100755 index 000000000..935d7c8be --- /dev/null +++ b/luci-app-argonne-config/root/etc/uci-defaults/luci-argonne-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 diff --git a/luci-app-argonne-config/root/usr/share/rpcd/acl.d/luci-app-argonne-config.json b/luci-app-argonne-config/root/usr/share/rpcd/acl.d/luci-app-argonne-config.json new file mode 100755 index 000000000..3508111a9 --- /dev/null +++ b/luci-app-argonne-config/root/usr/share/rpcd/acl.d/luci-app-argonne-config.json @@ -0,0 +1,11 @@ +{ + "luci-argonne-config": { + "description": "Luci argonne theme config ", + "read": { + "uci": [ "argonne" ] + }, + "write": { + "uci": [ "argonne" ] + } + } +} \ No newline at end of file diff --git a/luci-app-store/Makefile b/luci-app-store/Makefile index 491dbfa56..b1aa78a8e 100644 --- a/luci-app-store/Makefile +++ b/luci-app-store/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI based ipk store LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team LUCI_DEPENDS:=+curl LUCI_PKGARCH:=all -PKG_VERSION:=0.1.2 +PKG_VERSION:=0.1.3 PKG_RELEASE:=1 PKG_MAINTAINER:=jjm2473 diff --git a/luci-app-store/luasrc/controller/store.lua b/luci-app-store/luasrc/controller/store.lua index 1e0ce4a53..3ac243590 100644 --- a/luci-app-store/luasrc/controller/store.lua +++ b/luci-app-store/luasrc/controller/store.lua @@ -206,12 +206,14 @@ function store_action(param) code, out, err = _action(myopkg, action, metapkg) else local meta = json_parse(fs.readfile(metadir .. "/" .. pkg .. ".json")) + local pkgs = meta.depends + table.insert(pkgs, metapkg) if action == "upgrade" then - code, out, err = _action(myopkg, action, unpack(meta.depends), metapkg) + code, out, err = _action(myopkg, action, unpack(pkgs)) else -- remove - code, out, err = _action(myopkg, action, unpack(meta.depends), metapkg) + code, out, err = _action(myopkg, action, unpack(pkgs)) if code ~= 0 then - code, out0, err0 = _action(myopkg, action, unpack(meta.depends), metapkg) + code, out0, err0 = _action(myopkg, action, unpack(pkgs)) out = out .. out0 err = err .. err0 end