• R/O
  • HTTP
  • SSH
  • HTTPS

luci: Commit

LuCI - OpenWrt Configuration Interface


Commit MetaInfo

Revisão3adfb7e6e16573ea3ef822bb1d647f9c8f712d00 (tree)
Hora2022-05-20 22:40:13
AutorTianling Shen <cnsztl@immo...>
CommiterTianling Shen

Mensagem de Log

Merge Mainline

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Mudança Sumário

Diff

--- a/applications/luci-app-argon-config/Makefile
+++ b/applications/luci-app-argon-config/Makefile
@@ -11,7 +11,7 @@ PKG_VERSION:=0.9
1111 PKG_RELEASE:=20210309
1212
1313 LUCI_TITLE:=LuCI page for Argon Config
14-LUCI_DEPENDS:=+luci-theme-argonv3
14+LUCI_DEPENDS:=+luci-lib-ipkg +luci-theme-argonv3
1515 LUCI_PKGARCH:=all
1616
1717 include ../../luci.mk
--- a/applications/luci-app-cupsd/Makefile
+++ b/applications/luci-app-cupsd/Makefile
@@ -7,7 +7,7 @@
77 include $(TOPDIR)/rules.mk
88
99 LUCI_TITLE:=LuCI Support for cupsd
10-LUCI_DEPENDS:= +cups
10+LUCI_DEPENDS:=+cups +luci-lib-ipkg
1111 PKG_VERSION:=1.2
1212
1313 include ../../luci.mk
--- a/applications/luci-app-rclone/Makefile
+++ b/applications/luci-app-rclone/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:=1.4.1
99 PKG_RELEASE:=2
1010
1111 LUCI_TITLE:=LuCI support for Rclone
12-LUCI_DEPENDS:=+rclone-config \
12+LUCI_DEPENDS:=+luci-lib-ipkg +rclone-config \
1313 +PACKAGE_$(PKG_NAME)_INCLUDE_rclone-webui:rclone-webui-react \
1414 +PACKAGE_$(PKG_NAME)_INCLUDE_rclone-ng:rclone-ng
1515 LUCI_PKGARCH:=all
--- a/applications/luci-app-syncthing/Makefile
+++ b/applications/luci-app-syncthing/Makefile
@@ -1,15 +1,9 @@
1-# Copyright (C) 2016 Openwrt.org
2-#
3-# This is free software, licensed under the Apache License, Version 2.0 .
4-#
5-
61 include $(TOPDIR)/rules.mk
72
83 LUCI_TITLE:=LuCI support for syncthing
94 LUCI_DEPENDS:=+syncthing
105 LUCI_PKGARCH:=all
11-PKG_VERSION:=1.0
12-PKG_RELEASE:=2
6+PKG_RELEASE:=$(COMMITCOUNT)
137
148 include ../../luci.mk
159
--- a/applications/luci-app-syncthing/luasrc/model/cbi/syncthing.lua
+++ b/applications/luci-app-syncthing/luasrc/model/cbi/syncthing.lua
@@ -3,17 +3,50 @@
33
44 require("nixio.fs")
55
6-m = Map("syncthing", translate("SyncThing Synchronization Tool"))
6+m = Map("syncthing", translate("Syncthing Synchronization Tool"))
77
88 m:section(SimpleSection).template = "syncthing/syncthing_status"
99
10-s = m:section(TypedSection, "setting", translate("Settings"))
10+s = m:section(TypedSection, "syncthing")
11+s.addremove = false
1112 s.anonymous = true
1213
13-s:option(Flag, "enabled", translate("Enable"))
14-
15-s:option(Value, "port", translate("port")).default = 8384
16-s.rmempty = true
14+o = s:option(Flag, "enabled", translate("Enabled"))
15+o.default = 0
16+o.rmempty = false
17+
18+gui_address = s:option(Value, "gui_address", translate("GUI access address"))
19+gui_address.description = translate("Use 0.0.0.0:8384 to monitor all access.")
20+gui_address.default = "http://0.0.0.0:8384"
21+gui_address.placeholder = "http://0.0.0.0:8384"
22+gui_address.rmempty = false
23+
24+home = s:option(Value, "home", translate("Configuration file directory"))
25+home.description = translate("Only the configuration saved in /etc/syncthing will be automatically backed up!")
26+home.default = "/etc/syncthing"
27+home.placeholder = "/etc/syncthing"
28+home.rmempty = false
29+
30+user = s:option(ListValue, "user", translate("User"))
31+user.description = translate("The default is syncthing, but it may cause permission denied. Syncthing officially does not recommend running as root.")
32+user:value("", translate("syncthing"))
33+for u in luci.util.execi("cat /etc/passwd | cut -d ':' -f1") do
34+ user:value(u)
35+end
36+
37+macprocs = s:option(Value, "macprocs", translate("Thread limit"))
38+macprocs.description = translate("0 to match the number of CPUs (default), >0 to explicitly specify concurrency.")
39+macprocs.default = "0"
40+macprocs.placeholder = "0"
41+macprocs.datatype="range(0,32)"
42+macprocs.rmempty = false
43+
44+nice = s:option(Value, "nice", "Nice")
45+nice.description = translate("Explicitly specify nice. 0 is the highest and 19 is the lowest. (negative values are not allowed to be set temporarily)")
46+nice.default = "19"
47+nice.placeholder = "19"
48+nice.datatype="range(0,19)"
49+nice.rmempty = false
1750
1851
1952 return m
--- a/applications/luci-app-syncthing/luasrc/view/syncthing/syncthing_status.htm
+++ b/applications/luci-app-syncthing/luasrc/view/syncthing/syncthing_status.htm
@@ -1,27 +1,22 @@
11 <script type="text/javascript">//<![CDATA[
2-XHR.poll(1, '<%=url([[admin]], [[nas]], [[syncthing]], [[status]])%>', null,
3- function(x, data) {
4- var tb = document.getElementById('syncthing_status');
5- if (data && tb) {
6- if (data.running) {
7- var links = '<font color=green>Syncthing <%:RUNNING%></font><input class="cbi-button mar-10" type="button" value="<%:Open Web Interface%>" onclick="openClient();" />';
8- tb.innerHTML = links;
9- } else {
10- tb.innerHTML = '<font color=red>Syncthing <%:NOT RUNNING%></font>';
2+ XHR.poll(1, '<%=url([[admin]], [[nas]], [[syncthing]], [[status]])%>', null,
3+ function (x, data) {
4+ var tb = document.getElementById('syncthing_status');
5+ if (data && tb) {
6+ if (data.running) {
7+ var links = '<em><b><font color="green">Syncthing <%:RUNNING%></font></b></em><input class="btn cbi-button mar-10" type="button" value="<%:Open Syncthing page%>" onclick="openwebui();" />';
8+ tb.innerHTML = links;
9+ } else {
10+ tb.innerHTML = '<em><b><font color="red">Syncthing <%:NOT RUNNING%></font></b></em>';
11+ }
1112 }
1213 }
13- }
14-);
14+ );
1515
16-function openClient() {
17- var curWwwPath = window.document.location.href;
18- var pathName = window.document.location.pathname;
19- var pos = curWwwPath.indexOf(pathName);
20- var localhostPath = curWwwPath.substring(0, pos);
21- var clientPort = window.document.getElementById("cbid.syncthing.config.port").value
22- var url = localhostPath + ":" + clientPort;
23- window.open(url)
24-};
16+function openwebui(){
17+ var url = window.location.host+":<%=luci.sys.exec("uci -q get syncthing.syncthing.gui_address"):match(":[0-9]+"):gsub(":", "")%>";
18+ window.open('http://'+url,'target','');
19+}
2520 //]]>
2621 </script>
2722 <style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
--- a/applications/luci-app-syncthing/po/zh-cn/syncthing.po
+++ b/applications/luci-app-syncthing/po/zh-cn/syncthing.po
@@ -1,8 +1,35 @@
11 msgid "Syncthing"
2-msgstr "储存同步"
2+msgstr "Syncthing"
33
4-msgid "SyncThing Synchronization Tool"
5-msgstr "syncthing同步工具"
4+msgid "Syncthing Synchronization Tool"
5+msgstr "Syncthing 存储同步工具"
66
7-msgid "Open Web Interface"
8-msgstr "打开管理页面"
7+msgid "Open Syncthing page"
8+msgstr "打开储存同步页面"
9+
10+msgid "GUI access address"
11+msgstr "GUI访问地址"
12+
13+msgid "Use 0.0.0.0:8384 to monitor all access."
14+msgstr "使用0.0.0.0:8384监听所有访问。"
15+
16+msgid "Configuration file directory"
17+msgstr "配置文件存储目录"
18+
19+msgid "Only the configuration saved in /etc/syncthing will be automatically backed up!"
20+msgstr "只有保存在 /etc/syncthing 的配置会被自动备份!"
21+
22+msgid "User"
23+msgstr "用户"
24+
25+msgid "The default is syncthing, but it may cause permission denied. Syncthing officially does not recommend running as root."
26+msgstr "默认为syncthing,但可能引起权限不足问题。Syncthing官方不建议以root身份运行。"
27+
28+msgid "Thread limit"
29+msgstr "线程限制"
30+
31+msgid "0 to match the number of CPUs (default), >0 to explicitly specify concurrency."
32+msgstr "使用0来匹配CPU核心数,或输入大于0的数来显式指定并发数。"
33+
34+msgid "Explicitly specify nice. 0 is the highest and 19 is the lowest. (negative values are not allowed to be set temporarily)"
35+msgstr "显式指定进程Nice值。其中0最高,19最低。(暂不允许设置负值)"
--- a/applications/luci-app-syncthing/root/etc/config/syncthing
+++ /dev/null
@@ -1,4 +0,0 @@
1-
2-config setting 'config'
3- option enabled '0'
4- option port '8384'
--- a/applications/luci-app-syncthing/root/etc/init.d/syncthing
+++ /dev/null
@@ -1,43 +0,0 @@
1-#!/bin/sh /etc/rc.common
2-START=50
3-
4-run_syncthing()
5-{
6- local enabled
7- config_get_bool enabled $1 enabled
8- if [ $enabled = 1 ]; then
9- local port
10- config_get port $1 port
11- state=`pgrep syncthing | wc -l`
12- if [ $state = 0 ] ; then
13- export HOME="/root"
14- syncthing -gui-address="0.0.0.0:$port" -logfile="/var/log/syncthing.log" -no-browser >/dev/null &
15- echo "启动中..."
16- start=`pgrep syncthing | wc -l`
17- if [ $start = 0 ] ; then
18- echo "启动失败"
19- else
20- echo "启动成功"
21- fi
22- else
23- echo "已在运行"
24- fi
25- fi
26-}
27-
28-start()
29-{
30- config_load syncthing
31- config_foreach run_syncthing setting
32-}
33-
34-stop()
35-{
36- kill -9 `pgrep syncthing`
37- stop=`pgrep syncthing | wc -l`
38- if [ $stop = 0 ] ; then
39- echo "已停止运行"
40- else
41- echo "未停止运行"
42- fi
43-}
--- a/applications/luci-app-v2ray-server/Makefile
+++ b/applications/luci-app-v2ray-server/Makefile
@@ -6,7 +6,7 @@
66 include $(TOPDIR)/rules.mk
77
88 LUCI_TITLE:=LuCI support for V2ray Server
9-LUCI_DEPENDS:=+xray-core
9+LUCI_DEPENDS:=+luci-lib-ipkg +xray-core
1010 LUCI_PKGARCH:=all
1111 PKG_VERSION:=1.1
1212 PKG_RELEASE:=5
--- a/applications/luci-app-vssr/Makefile
+++ b/applications/luci-app-vssr/Makefile
@@ -14,7 +14,7 @@ PKG_CONFIG_DEPENDS:= \
1414 LUCI_TITLE:=A New SS/SSR/Xray/Trojan LuCI interface
1515 LUCI_PKGARCH:=all
1616 LUCI_DEPENDS:= \
17- +bash +coreutils +coreutils-base64 +dnsmasq-full +ip-full +ipset +iptables-mod-tproxy \
17+ +bash +coreutils +coreutils-base64 +dnsmasq-full +ip-full +ipset +iptables-mod-tproxy +luci-lib-ipkg \
1818 +lua +lua-cjson +lua-maxminddb +luasocket +pdnsd-alt +shadowsocksr-libev-ssr-check +shadowsocksr-libev-ssr-redir \
1919 +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +wget-ssl \
2020 +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
--- a/applications/luci-app-wrtbwmon/Makefile
+++ b/applications/luci-app-wrtbwmon/Makefile
@@ -6,7 +6,7 @@
66 include $(TOPDIR)/rules.mk
77
88 LUCI_TITLE:=LuCI support for Wrtbwmon
9-LUCI_DEPENDS:=+luci-app-nlbwmon
9+LUCI_DEPENDS:=+luci-app-nlbwmon +luci-lib-ipkg
1010 LUCI_PKGARCH:=all
1111 PKG_VERSION:=1.0
1212 PKG_RELEASE:=7
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -1237,7 +1237,7 @@ msgstr "Espai lliure"
12371237
12381238 msgid ""
12391239 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1240-"wireguard.io\">wireguard.io</a>."
1240+"wireguard.com\">wireguard.com</a>."
12411241 msgstr ""
12421242
12431243 msgid "GHz"
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -1266,7 +1266,7 @@ msgstr "Volné místo"
12661266
12671267 msgid ""
12681268 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1269-"wireguard.io\">wireguard.io</a>."
1269+"wireguard.com\">wireguard.com</a>."
12701270 msgstr ""
12711271
12721272 msgid "GHz"
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -1279,10 +1279,10 @@ msgstr "Freier Platz"
12791279
12801280 msgid ""
12811281 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1282-"wireguard.io\">wireguard.io</a>."
1282+"wireguard.com\">wireguard.com</a>."
12831283 msgstr ""
12841284 "Weitere Informationen zu WireGuard-Schnittstellen und Peers unter <a href="
1285-"\"http://wireguard.io\">wireguard.io</a>."
1285+"\"http://wireguard.com\">wireguard.com</a>."
12861286
12871287 msgid "GHz"
12881288 msgstr "GHz"
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -1257,7 +1257,7 @@ msgstr "Ελεύθερος χώρος"
12571257
12581258 msgid ""
12591259 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1260-"wireguard.io\">wireguard.io</a>."
1260+"wireguard.com\">wireguard.com</a>."
12611261 msgstr ""
12621262
12631263 msgid "GHz"
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -1232,7 +1232,7 @@ msgstr ""
12321232
12331233 msgid ""
12341234 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1235-"wireguard.io\">wireguard.io</a>."
1235+"wireguard.com\">wireguard.com</a>."
12361236 msgstr ""
12371237
12381238 msgid "GHz"
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -1274,7 +1274,7 @@ msgstr "Espacio libre"
12741274
12751275 msgid ""
12761276 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1277-"wireguard.io\">wireguard.io</a>."
1277+"wireguard.com\">wireguard.com</a>."
12781278 msgstr ""
12791279
12801280 msgid "GHz"
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -1287,7 +1287,7 @@ msgstr "Espace libre"
12871287
12881288 msgid ""
12891289 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1290-"wireguard.io\">wireguard.io</a>."
1290+"wireguard.com\">wireguard.com</a>."
12911291 msgstr ""
12921292
12931293 msgid "GHz"
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -1215,7 +1215,7 @@ msgstr ""
12151215
12161216 msgid ""
12171217 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1218-"wireguard.io\">wireguard.io</a>."
1218+"wireguard.com\">wireguard.com</a>."
12191219 msgstr ""
12201220
12211221 msgid "GHz"
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -1272,7 +1272,7 @@ msgstr "Szabad hely"
12721272
12731273 msgid ""
12741274 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1275-"wireguard.io\">wireguard.io</a>."
1275+"wireguard.com\">wireguard.com</a>."
12761276 msgstr ""
12771277
12781278 msgid "GHz"
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -1256,7 +1256,7 @@ msgstr "Spazio libero"
12561256
12571257 msgid ""
12581258 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1259-"wireguard.io\">wireguard.io</a>."
1259+"wireguard.com\">wireguard.com</a>."
12601260 msgstr ""
12611261
12621262 msgid "GHz"
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -1264,10 +1264,10 @@ msgstr "ディスクの空き容量"
12641264
12651265 msgid ""
12661266 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1267-"wireguard.io\">wireguard.io</a>."
1267+"wireguard.com\">wireguard.com</a>."
12681268 msgstr ""
12691269 "WireGuard インターフェースとピアについての詳細情報: <a href=\"http://"
1270-"wireguard.io\">wireguard.io</a>"
1270+"wireguard.com\">wireguard.com</a>"
12711271
12721272 msgid "GHz"
12731273 msgstr "GHz"
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -1242,7 +1242,7 @@ msgstr "여유 공간"
12421242
12431243 msgid ""
12441244 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1245-"wireguard.io\">wireguard.io</a>."
1245+"wireguard.com\">wireguard.com</a>."
12461246 msgstr ""
12471247
12481248 msgid "GHz"
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -1200,7 +1200,7 @@ msgstr ""
12001200
12011201 msgid ""
12021202 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1203-"wireguard.io\">wireguard.io</a>."
1203+"wireguard.com\">wireguard.com</a>."
12041204 msgstr ""
12051205
12061206 msgid "GHz"
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -1238,7 +1238,7 @@ msgstr "Ledig plass"
12381238
12391239 msgid ""
12401240 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1241-"wireguard.io\">wireguard.io</a>."
1241+"wireguard.com\">wireguard.com</a>."
12421242 msgstr ""
12431243
12441244 msgid "GHz"
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -1277,7 +1277,7 @@ msgstr "Wolna przestrzeń"
12771277
12781278 msgid ""
12791279 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1280-"wireguard.io\">wireguard.io</a>."
1280+"wireguard.com\">wireguard.com</a>."
12811281 msgstr ""
12821282
12831283 msgid "GHz"
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -1307,10 +1307,10 @@ msgstr "Espaço livre"
13071307
13081308 msgid ""
13091309 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1310-"wireguard.io\">wireguard.io</a>."
1310+"wireguard.com\">wireguard.com</a>."
13111311 msgstr ""
13121312 "Mais informações sobre interfaces e parceiros WireGuard em <a href=\"http://"
1313-"wireguard.io\">wireguard.io</a>."
1313+"wireguard.com\">wireguard.com</a>."
13141314
13151315 msgid "GHz"
13161316 msgstr "GHz"
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -1279,7 +1279,7 @@ msgstr "Espaço livre"
12791279
12801280 msgid ""
12811281 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1282-"wireguard.io\">wireguard.io</a>."
1282+"wireguard.com\">wireguard.com</a>."
12831283 msgstr ""
12841284
12851285 msgid "GHz"
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -1209,7 +1209,7 @@ msgstr "Spatiu liber"
12091209
12101210 msgid ""
12111211 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1212-"wireguard.io\">wireguard.io</a>."
1212+"wireguard.com\">wireguard.com</a>."
12131213 msgstr ""
12141214
12151215 msgid "GHz"
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -1280,8 +1280,10 @@ msgstr "Свободное место"
12801280
12811281 msgid ""
12821282 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1283-"wireguard.io\">wireguard.io</a>."
1283+"wireguard.com\">wireguard.com</a>."
12841284 msgstr ""
1285+"Дополнительная информация о интерфейсах и партнерах WireGuard приведена в <a "
1286+"href=\"http://wireguard.com\">wireguard.com</a>."
12851287
12861288 msgid "GHz"
12871289 msgstr "ГГц"
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -1206,7 +1206,7 @@ msgstr ""
12061206
12071207 msgid ""
12081208 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1209-"wireguard.io\">wireguard.io</a>."
1209+"wireguard.com\">wireguard.com</a>."
12101210 msgstr ""
12111211
12121212 msgid "GHz"
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -1212,7 +1212,7 @@ msgstr "Fritt utrymme"
12121212
12131213 msgid ""
12141214 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1215-"wireguard.io\">wireguard.io</a>."
1215+"wireguard.com\">wireguard.com</a>."
12161216 msgstr ""
12171217
12181218 msgid "GHz"
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -1247,7 +1247,7 @@ msgstr "Boş alan"
12471247
12481248 msgid ""
12491249 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1250-"wireguard.io\">wireguard.io</a>."
1250+"wireguard.com\">wireguard.com</a>."
12511251 msgstr ""
12521252
12531253 msgid "GHz"
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -1286,7 +1286,7 @@ msgstr "Вільне місце"
12861286
12871287 msgid ""
12881288 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1289-"wireguard.io\">wireguard.io</a>."
1289+"wireguard.com\">wireguard.com</a>."
12901290 msgstr ""
12911291
12921292 msgid "GHz"
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -1250,7 +1250,7 @@ msgstr ""
12501250
12511251 msgid ""
12521252 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1253-"wireguard.io\">wireguard.io</a>."
1253+"wireguard.com\">wireguard.com</a>."
12541254 msgstr ""
12551255
12561256 msgid "GHz"
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -1329,10 +1329,10 @@ msgstr "空闲空间"
13291329
13301330 msgid ""
13311331 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1332-"wireguard.io\">wireguard.io</a>."
1332+"wireguard.com\">wireguard.com</a>."
13331333 msgstr ""
1334-"有关 WireGuard 接口和 Peer 的更多信息:<a href=\"http://wireguard.io"
1335-"\">wireguard.io</a>。"
1334+"有关 WireGuard 接口和 Peer 的更多信息:<a href=\"http://wireguard.com"
1335+"\">wireguard.com</a>。"
13361336
13371337 msgid "GHz"
13381338 msgstr "GHz"
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -1226,7 +1226,7 @@ msgstr "剩餘空間"
12261226
12271227 msgid ""
12281228 "Further information about WireGuard interfaces and peers at <a href=\"http://"
1229-"wireguard.io\">wireguard.io</a>."
1229+"wireguard.com\">wireguard.com</a>."
12301230 msgstr ""
12311231
12321232 msgid "GHz"
--- a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua
+++ b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua
@@ -5,7 +5,7 @@
55 local map, section, net = ...
66 local ifname = net:get_interface():name()
77 local private_key, listen_port
8-local metric, mtu, preshared_key
8+local metric, mtu, preshared_key, description
99 local peers, public_key, allowed_ips, endpoint, persistent_keepalive
1010
1111
@@ -89,13 +89,23 @@ peers = map:section(
8989 "wireguard_" .. ifname,
9090 translate("Peers"),
9191 translate("Further information about WireGuard interfaces and peers " ..
92- "at <a href=\"http://wireguard.io\">wireguard.io</a>.")
92+ "at <a href=\"http://wireguard.com\">wireguard.com</a>.")
9393 )
9494 peers.template = "cbi/tsection"
9595 peers.anonymous = true
9696 peers.addremove = true
9797
9898
99+description = peers:option(
100+ Value,
101+ "description",
102+ translate("Description"),
103+ translate("Optional. Description of peer."))
104+description.placeholder = "My Peer"
105+description.datatype = "string"
106+description.optional = true
107+
108+
99109 public_key = peers:option(
100110 Value,
101111 "public_key",
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -47,8 +47,6 @@
4747 border-bottom: 1px solid #eee;
4848 }
4949
50-
51-
5250 .th {
5351 font-weight: bold;
5452 }
@@ -669,7 +667,7 @@ td > table > tbody > tr > td,
669667 .cbi-button-apply.important,
670668 .cbi-button-reload.important,
671669 .cbi-button-action.important {
672- color: #fff;
670+ color: #fff;
673671 background-color: #F24C7C;
674672 }
675673
@@ -1742,6 +1740,19 @@ header > .container > .pull-right > * {
17421740 background-color: #8A4568;
17431741 }
17441742
1743+.login .cbi-page-actions .cbi-button-apply,
1744+.login .cbi-button-apply {
1745+ color: #fff;
1746+ border: 1px solid #f24b7c;
1747+ background-color: #f24b7c;
1748+}
1749+
1750+.login .cbi-button-reset {
1751+ color: #fff;
1752+ border: 1px solid #9a4569;
1753+ background-color: #9a4569;
1754+}
1755+
17451756 .login footer {
17461757 bottom: 0;
17471758 position: absolute;
@@ -1946,7 +1957,7 @@ body.lang_pl.login .cbi-value-title {
19461957 .login {
19471958 background: #354057;
19481959 }
1949-
1960+
19501961 .logged-in .main-left {
19511962 width: 0;
19521963 position: fixed;
@@ -2032,7 +2043,7 @@ body.lang_pl.login .cbi-value-title {
20322043 .cbi-section {
20332044 padding: 1rem;
20342045 }
2035-
2046+
20362047 table, .table {
20372048 border-bottom: 1px solid #eee;
20382049 }
@@ -2133,7 +2144,7 @@ body.lang_pl.login .cbi-value-title {
21332144 .hide-xs {
21342145 display: none;
21352146 }
2136-
2147+
21372148 /* The scroll bar of the navigation bar is compatible with each browser. */
21382149 /* Google */
21392150 .main-left .navbar-container::-webkit-scrollbar {
--- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm
+++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm
@@ -1,4 +1,4 @@
1-<%#
1+<%#
22 Rosy is a theme for LuCI. It is based on luci-theme-bootstrap
33 luci-theme-rosy
44 Copyright 2018 Rosy Song <rosysong@rosinson.com>
Show on old repository browser