Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-dockerman: fix markup which is not valid XHTML

Browse source 
XHTML does not specify ` `, use ` ` instead.
Also replace `<br>` with `<br />`.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2021-10-08 19:42:04 +02:00
parent 99019024ad
commit 12cdacdb3f
11 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-dockerman/luasrc/controller/dockerman.lua
View file

@ -183,7 +183,7 @@ end
function action_confirm()
local data = docker:read_status()
if data then
data = data:gsub("\n","<br>"):gsub(" ","&nbsp;")
data = data:gsub("\n","<br />"):gsub(" ","&#160;")
code = 202
msg = data
else

20
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua
View file

@ -37,7 +37,7 @@ local get_ports = function(d)
if d.HostConfig and d.HostConfig.PortBindings then
for inter, out in pairs(d.HostConfig.PortBindings) do
data = (data and (data .. "<br>") or "") .. out[1]["HostPort"] .. ":" .. inter
data = (data and (data .. "<br />") or "") .. out[1]["HostPort"] .. ":" .. inter
end
end
@ -49,7 +49,7 @@ local get_env = function(d)
if d.Config and d.Config.Env then
for _,v in ipairs(d.Config.Env) do
data = (data and (data .. "<br>") or "") .. v
data = (data and (data .. "<br />") or "") .. v
end
end
@ -90,7 +90,7 @@ local get_mounts = function(d)
v_dest = v_dest .."/".. v_dest_d
end
end
data = (data and (data .. "<br>") or "") .. v_sorce .. ":" .. v["Destination"] .. (v["Mode"] ~= "" and (":" .. v["Mode"]) or "")
data = (data and (data .. "<br />") or "") .. v_sorce .. ":" .. v["Destination"] .. (v["Mode"] ~= "" and (":" .. v["Mode"]) or "")
end
end
@ -102,7 +102,7 @@ local get_device = function(d)
if d.HostConfig and d.HostConfig.Devices then
for _,v in ipairs(d.HostConfig.Devices) do
data = (data and (data .. "<br>") or "") .. v["PathOnHost"] .. ":" .. v["PathInContainer"] .. (v["CgroupPermissions"] ~= "" and (":" .. v["CgroupPermissions"]) or "")
data = (data and (data .. "<br />") or "") .. v["PathOnHost"] .. ":" .. v["PathInContainer"] .. (v["CgroupPermissions"] ~= "" and (":" .. v["CgroupPermissions"]) or "")
end
end
@ -114,7 +114,7 @@ local get_links = function(d)
if d.HostConfig and d.HostConfig.Links then
for _,v in ipairs(d.HostConfig.Links) do
data = (data and (data .. "<br>") or "") .. v
data = (data and (data .. "<br />") or "") .. v
end
end
@ -126,7 +126,7 @@ local get_tmpfs = function(d)
if d.HostConfig and d.HostConfig.Tmpfs then
for k, v in pairs(d.HostConfig.Tmpfs) do
data = (data and (data .. "<br>") or "") .. k .. (v~="" and ":" or "")..v
data = (data and (data .. "<br />") or "") .. k .. (v~="" and ":" or "")..v
end
end
@ -138,7 +138,7 @@ local get_dns = function(d)
if d.HostConfig and d.HostConfig.Dns then
for _, v in ipairs(d.HostConfig.Dns) do
data = (data and (data .. "<br>") or "") .. v
data = (data and (data .. "<br />") or "") .. v
end
end
@ -150,7 +150,7 @@ local get_sysctl = function(d)
if d.HostConfig and d.HostConfig.Sysctls then
for k, v in pairs(d.HostConfig.Sysctls) do
data = (data and (data .. "<br>") or "") .. k..":"..v
data = (data and (data .. "<br />") or "") .. k..":"..v
end
end
@ -203,7 +203,7 @@ m.redirect = luci.dispatcher.build_url("admin/docker/containers")
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err=docker:read_status()
s.err=s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err=s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end
@ -294,7 +294,7 @@ if action == "info" then
},
["03image"] = {
_key = translate("Image"),
_value = container_info.Config.Image .. "<br>" .. container_info.Image
_value = container_info.Config.Image .. "<br />" .. container_info.Image
},
["04status"] = {
_key = translate("Status"),

2
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua
View file

@ -99,7 +99,7 @@ m.reset=false
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err=docker:read_status()
s.err=s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err=s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end

6
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua
View file

@ -40,7 +40,7 @@ function get_images()
if v.RepoTags and next(v.RepoTags)~=nil then
for i, v1 in ipairs(v.RepoTags) do
data[index]["_tags"] =(data[index]["_tags"] and ( data[index]["_tags"] .. "<br>" )or "") .. ((v1:match("<none>") or (#v.RepoTags == 1)) and v1 or ('<a href="javascript:un_tag(\''..v1..'\')" class="dockerman_link" title="'..translate("Remove tag")..'" >' .. v1 .. '</a>'))
data[index]["_tags"] =(data[index]["_tags"] and ( data[index]["_tags"] .. "<br />" )or "") .. ((v1:match("<none>") or (#v.RepoTags == 1)) and v1 or ('<a href="javascript:un_tag(\''..v1..'\')" class="dockerman_link" title="'..translate("Remove tag")..'" >' .. v1 .. '</a>'))
if not data[index]["tag"] then
data[index]["tag"] = v1
@ -155,7 +155,7 @@ local remove_action = function(force)
for k in pairs(image_list) do
if image_list[k]._selected == 1 then
image_selected[#image_selected+1] = (image_list[k]["_tags"]:match("<br>") or image_list[k]["_tags"]:match("&lt;none&gt;")) and image_list[k].id or image_list[k].tag
image_selected[#image_selected+1] = (image_list[k]["_tags"]:match("<br />") or image_list[k]["_tags"]:match("&lt;none&gt;")) and image_list[k].id or image_list[k].tag
end
end
@ -194,7 +194,7 @@ end
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err = docker:read_status()
s.err = s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err = s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end

2
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua
View file

@ -87,7 +87,7 @@ o = s:option(DummyValue, "_gateway", translate("Gateway"))
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err = docker:read_status()
s.err = s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err = s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end

2
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua
View file

@ -442,7 +442,7 @@ m.redirect = luci.dispatcher.build_url("admin", "docker", "containers")
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err=docker:read_status()
s.err=s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err=s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end

2
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua
View file

@ -15,7 +15,7 @@ m.redirect = luci.dispatcher.build_url("admin", "docker", "networks")
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err=docker:read_status()
s.err=s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err=s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end

2
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua
View file

@ -94,7 +94,7 @@ o = s:option(DummyValue, "_created", translate("Created"))
s = m:section(SimpleSection)
s.template = "dockerman/apply_widget"
s.err=docker:read_status()
s.err=s.err and s.err:gsub("\n","<br>"):gsub(" ","&nbsp;")
s.err=s.err and s.err:gsub("\n","<br />"):gsub(" ","&#160;")
if s.err then
docker:clear_status()
end

2
applications/luci-app-dockerman/luasrc/view/dockerman/container.htm
View file

@ -1,4 +1,4 @@
<br>
<br />
<ul class="cbi-tabmenu">
<li id="cbi-tab-container_info"><a id="a-cbi-tab-container_info" href=""><%:Info%></a></li>
<li id="cbi-tab-container_resources"><a id="a-cbi-tab-container_resources" href=""><%:Resources%></a></li>

4
applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm
View file

@ -3,12 +3,12 @@
<div class="cbi-value-field">
<input type="file" name="upload_archive" accept="application/x-tar" id="upload_archive" />
</div>
<br>
<br />
<label class="cbi-value-title" for="path"><%:Path%></label>
<div class="cbi-value-field">
<input type="text" class="cbi-input-text" name="path" value="/tmp/" id="path" />
</div>
<br>
<br />
<div class="cbi-value-field">
<input type="button"" class="btn cbi-button cbi-button-action important" id="upload" name="upload" value="<%:Upload%>" />
<input type="button"" class="btn cbi-button cbi-button-action important" id="download" name="download" value="<%:Download%>" />

2
applications/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm
View file

@ -88,7 +88,7 @@
}
function show_reslov_dialog() {
document.getElementById('dialog_reslov') || document.body.insertAdjacentHTML("beforeend", '<div id="dialog_reslov"><div class="dialog_box"><div class="dialog_line"></div><div class="dialog_line"><span><%:Plese input <docker create/run> command line:%></span><br><span id="cmd-line-status"></span></div><div class="dialog_line"><textarea class="cbi-input-textarea" id="dialog_reslov_text" style="width: 100%; height:100%;" rows="15" onkeyup="clear_text()"></textarea></div><div class="dialog_line" style="text-align: right;"><input type="button" class="btn cbi-button cbi-button-apply" type="submit" value="<%:Submit%>" onclick="reslov_container()" /> <input type="button" class="btn cbi-button cbi-button-reset" type="reset" value="<%:Cancel%>" onclick="close_reslov_dialog()" /></div><div class="dialog_line"></div></div></div>')
document.getElementById('dialog_reslov') || document.body.insertAdjacentHTML("beforeend", '<div id="dialog_reslov"><div class="dialog_box"><div class="dialog_line"></div><div class="dialog_line"><span><%:Plese input <docker create/run> command line:%></span><br /><span id="cmd-line-status"></span></div><div class="dialog_line"><textarea class="cbi-input-textarea" id="dialog_reslov_text" style="width: 100%; height:100%;" rows="15" onkeyup="clear_text()"></textarea></div><div class="dialog_line" style="text-align: right;"><input type="button" class="btn cbi-button cbi-button-apply" type="submit" value="<%:Submit%>" onclick="reslov_container()" /> <input type="button" class="btn cbi-button cbi-button-reset" type="reset" value="<%:Cancel%>" onclick="close_reslov_dialog()" /></div><div class="dialog_line"></div></div></div>')
document.body.classList.add('dialog-reslov-active')
let s = document.getElementById('cmd-line-status')
s.innerHTML = ""