Skip to content

Commit

Permalink
Merge pull request #24 from jjm2473/dev
Browse files Browse the repository at this point in the history
支持上传webm视频作为登录界面背景
  • Loading branch information
jerrykuku authored May 5, 2022
2 parents 1dd6811 + f8d6446 commit 49501a7
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-argon-config
PKG_VERSION:=0.9
PKG_RELEASE:=20220423
PKG_RELEASE:=20220424

PKG_MAINTAINER:=jerrykuku <[email protected]>

Expand Down
8 changes: 1 addition & 7 deletions luasrc/model/cbi/argon-config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function br.handle(self, state, data)
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 = SimpleForm('upload', translate('Upload (Free: ') .. wa.byte_format(free_byte) .. ')', translate("You can upload files such as jpg,png,gif,mp4,webm files, To change the login page background."))
ful.reset = false
ful.submit = false

Expand Down Expand Up @@ -214,10 +214,4 @@ btnrm.write = function(self, section)
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
2 changes: 1 addition & 1 deletion luasrc/view/argon-config/other_upload.htm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%+cbi/valueheader%>
<label class="cbi-value" style="display:inline-block; width: 130px" for="ulfile"><%:Choose local file:%></label>
<input class="cbi-input-file" style="width: 400px" type="file" id="ulfile" name="ulfile" accept="image/png, image/jpeg, image/gif, video/mp4"/>
<input class="cbi-input-file" style="width: 400px" type="file" id="ulfile" name="ulfile" accept="image/png, image/jpeg, image/gif, video/mp4, video/webm"/>
<input type="submit" class="btn cbi-button cbi-input-apply" name="upload" value="<%:Upload%>" />
<%+cbi/valuefooter%>
4 changes: 2 additions & 2 deletions po/es/argon-config.po
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ msgstr "Puede elegir el modo de color del tema aquí"

#: 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 "
"You can upload files such as jpg,png,gif,mp4,webm files, To change the login page "
"background."
msgstr ""
"Puede cargar archivos como jpg, png, gif, mp4, para cambiar el fondo de la "
"Puede cargar archivos como jpg, png, gif, mp4, webm, para cambiar el fondo de la "
"página de inicio de sesión."

#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:105
Expand Down
2 changes: 1 addition & 1 deletion po/templates/argon-config.pot
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ msgstr ""

#: 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 "
"You can upload files such as jpg,png,gif,mp4,webm files, To change the login page "
"background."
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions po/zh-cn/argon-config.po
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ 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 "You can upload files such as jpg,png,gif,mp4,webm files, To change the login page background."
msgstr "你可以上传jpg、png、gif或mp4、webm文件,以创建自己喜欢的登录界面"

msgid "Save Changes"
msgstr "保存更改"
Expand Down

0 comments on commit 49501a7

Please sign in to comment.