OSDN Git Service

Merge Official Source
authorTianling Shen <cnsztl@immortalwrt.org>
Thu, 18 Nov 2021 17:21:19 +0000 (01:21 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Thu, 18 Nov 2021 17:21:19 +0000 (01:21 +0800)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
1  2 
applications/luci-app-aria2/Makefile
applications/luci-app-aria2/root/usr/share/luci/menu.d/luci-app-aria2.json
modules/luci-base/po/en/base.po
modules/luci-base/po/zh_Hans/base.po

@@@ -7,7 -7,7 +7,7 @@@
  include $(TOPDIR)/rules.mk
  
  LUCI_TITLE:=LuCI Support for Aria2
- LUCI_DEPENDS:=+luci-compat +aria2 +luci-lib-ipkg +ariang
 -LUCI_DEPENDS:=+aria2
++LUCI_DEPENDS:=+aria2+ +ariang
  LUCI_PKGARCH:=all
  
  PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
index 0000000,8728252..961e938
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,40 +1,40 @@@
 -      "admin/services/aria2": {
+ {
 -      "admin/services/aria2/config": {
++      "admin/nas/aria2": {
+               "title": "Aria2",
+               "order": 30,
+               "action": {
+                       "type": "firstchild"
+               },
+               "depends": {
+                       "acl": [ "luci-app-aria2" ],
+                       "uci": { "aria2": true }
+               }
+       },
 -      "admin/services/aria2/files": {
++      "admin/nas/aria2/config": {
+               "title": "Configuration",
+               "order": 10,
+               "action": {
+                       "type": "view",
+                       "path": "aria2/config"
+               }
+       },
 -      "admin/services/aria2/log": {
++      "admin/nas/aria2/files": {
+               "title": "Files",
+               "order": 20,
+               "action": {
+                       "type": "view",
+                       "path": "aria2/files"
+               }
+       },
++      "admin/nas/aria2/log": {
+               "title": "Log",
+               "order": 30,
+               "action": {
+                       "type": "view",
+                       "path": "aria2/log"
+               }
+       }
+ }
Simple merge
Simple merge