From ac6c573b0a2b0166e953722b1b4d1d6ce94f9f7b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 6 Feb 2020 20:31:10 +0800 Subject: [PATCH] luci-app-dockerman: sync with upstream source --- .../luasrc/controller/dockerman.lua | 7 +------ .../luasrc/model/cbi/docker/container.lua | 7 +------ .../luasrc/model/cbi/docker/containers.lua | 9 ++------- .../luasrc/model/cbi/docker/images.lua | 7 +------ .../luasrc/model/cbi/docker/networks.lua | 7 +------ .../luasrc/model/cbi/docker/newcontainer.lua | 7 +------ .../luasrc/model/cbi/docker/newnetwork.lua | 7 +------ .../luasrc/model/cbi/docker/overview.lua | 7 +------ .../luasrc/model/cbi/docker/volumes.lua | 7 +------ .../luci-app-dockerman/luasrc/model/docker.lua | 9 ++------- .../luci-app-dockerman/luasrc/view/docker/logs.htm | 14 -------------- .../luci-app-dockerman/po/zh-cn/dockerman.po | 4 ++-- 12 files changed, 14 insertions(+), 78 deletions(-) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua b/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua index 0886cf92df..01e06a18ac 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" local docker = require "luci.model.docker" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua index 6e1f906fa4..7a0d483724 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua index 6939f05d36..01d1e0e22c 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" @@ -94,7 +89,7 @@ container_selecter.default = 0 container_id = c_table:option(DummyValue, "_id", translate("ID")) container_id.width="10%" -container_name = c_table:option(DummyValue, "_name", translate("Name")) +container_name = c_table:option(DummyValue, "_name", translate("Container Name")) container_name.width="20%" container_name.template="docker/cbi/dummyvalue" container_name.href = function (self, section) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua index 6cbb208589..5400fd6485 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua index b1e924228e..e53a849938 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua index 9e48bc880f..afbe7b078c 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua index 7cd15dbc42..08b0c01fb3 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/overview.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/overview.lua index b56fe7dfdf..d9cdb1327f 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/overview.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/overview.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua index f5e3281ade..b2d5e52182 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua index e1e3a943db..925cd82cba 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua @@ -1,11 +1,6 @@ --[[ LuCI - Lua Configuration Interface -Copyright 2019 lisaac -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -$Id$ +Copyright 2019 lisaac ]]-- require "luci.util" @@ -231,4 +226,4 @@ _docker.clear_status=function(self) nixio.fs.remove(self.options.status_path) end -return _docker +return _docker \ No newline at end of file diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm index 6147e95290..aba03bab55 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm +++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm @@ -1,17 +1,3 @@ -<%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> <% if self.title == translate("Docker Events") then %> <%+header%> <% end %> diff --git a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po index 4ffd541d86..a2bcb293aa 100644 --- a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po +++ b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po @@ -59,7 +59,7 @@ msgid "Update" msgstr "更新" msgid "Device" -msgstr "设备(--device)" +msgstr "设备" msgid "Mount/Volume" msgstr "挂载/存储卷" @@ -296,4 +296,4 @@ msgid "Pull Image" msgstr "拉取镜像" msgid "Pull" -msgstr "拉取" +msgstr "拉取" \ No newline at end of file