Merge pull request #2746 from AiyionPrime/html-indentation
html indentation
This commit is contained in:
commit
cd38de1bda
@ -21,6 +21,8 @@ indent_size = unset
|
|||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.html]
|
||||||
|
|
||||||
[*.js]
|
[*.js]
|
||||||
|
|
||||||
[*{.json,.ecrc}]
|
[*{.json,.ecrc}]
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
<%#
|
<%#
|
||||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
SPDX-License-Identifier: Apache-2.0
|
||||||
Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
|
SPDX-FileCopyrightText: 2008 Steven Barth <steven@midlink.org>
|
||||||
|
SPDX-FileCopyrightText: 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
|
||||||
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
|
|
||||||
-%>
|
-%>
|
||||||
<%
|
<%
|
||||||
local pretty_hostname = require "pretty_hostname"
|
local pretty_hostname = require "pretty_hostname"
|
||||||
@ -43,7 +38,7 @@ You may obtain a copy of the License at
|
|||||||
table.sort(ret,
|
table.sort(ret,
|
||||||
function(a, b)
|
function(a, b)
|
||||||
return (node.nodes[a].order or 100)
|
return (node.nodes[a].order or 100)
|
||||||
< (node.nodes[b].order or 100)
|
< (node.nodes[b].order or 100)
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
return ret
|
return ret
|
||||||
@ -125,7 +120,7 @@ You may obtain a copy of the License at
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="maincontainer">
|
<div id="maincontainer">
|
||||||
<%
|
<%
|
||||||
if not hidenav then
|
if not hidenav then
|
||||||
menutree(unpack(request))
|
menutree(unpack(request))
|
||||||
end
|
end
|
||||||
|
@ -1,18 +1,13 @@
|
|||||||
<%#
|
<%#
|
||||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
SPDX-FileCopyrightText: 2008 Steven Barth <steven@midlink.org>
|
||||||
Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
|
SPDX-FileCopyrightText: 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
|
||||||
|
SPDX-License-Identifier: Apache-2.0
|
||||||
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
|
|
||||||
-%>
|
-%>
|
||||||
|
|
||||||
<h2><%:Upgrade firmware%></h2>
|
<h2><%:Upgrade firmware%></h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%:The firmware image has been transmitted. Please ensure the SHA-256 checksum and image size are correct and click "continue".%>
|
<%:The firmware image has been transmitted. Please ensure the SHA-256 checksum and image size are correct and click "continue".%>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<% if flashsize > 0 and filesize > flashsize then %>
|
<% if flashsize > 0 and filesize > flashsize then %>
|
||||||
@ -20,40 +15,40 @@ You may obtain a copy of the License at
|
|||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>sha256sum: <code><%=checksum%></code></li>
|
<li>sha256sum: <code><%=checksum%></code></li>
|
||||||
<li><%:Size%>: <%
|
<li><%:Size%>: <%
|
||||||
function byte_format(byte)
|
function byte_format(byte)
|
||||||
local suff = {"B", "KB", "MB", "GB", "TB"}
|
local suff = {"B", "KB", "MB", "GB", "TB"}
|
||||||
for i=1, 5 do
|
for i=1, 5 do
|
||||||
if byte > 1024 and i < 5 then
|
if byte > 1024 and i < 5 then
|
||||||
byte = byte / 1024
|
byte = byte / 1024
|
||||||
else
|
else
|
||||||
return string.format("%.2f %s", byte, suff[i])
|
return string.format("%.2f %s", byte, suff[i])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
write(byte_format(filesize))
|
write(byte_format(filesize))
|
||||||
|
|
||||||
if flashsize > 0 then
|
if flashsize > 0 then
|
||||||
write(translatef(
|
write(translatef(
|
||||||
" (%s available)",
|
" (%s available)",
|
||||||
byte_format(flashsize)
|
byte_format(flashsize)
|
||||||
))
|
))
|
||||||
end
|
end
|
||||||
%></li>
|
%></li>
|
||||||
</ul>
|
</ul>
|
||||||
</p>
|
</p>
|
||||||
<div class="gluon-page-actions">
|
<div class="gluon-page-actions">
|
||||||
<form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
|
<form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
|
||||||
<input type="hidden" name="step" value="3">
|
<input type="hidden" name="step" value="3">
|
||||||
<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>">
|
<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>">
|
||||||
<input class="gluon-button gluon-button-submit" type="submit" value="<%:Continue%>">
|
<input class="gluon-button gluon-button-submit" type="submit" value="<%:Continue%>">
|
||||||
</form>
|
</form>
|
||||||
<form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
|
<form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
|
||||||
<input type="hidden" name="step" value="1">
|
<input type="hidden" name="step" value="1">
|
||||||
<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>">
|
<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>">
|
||||||
<input class="gluon-button gluon-button-reset" type="submit" value="<%:Cancel%>">
|
<input class="gluon-button gluon-button-reset" type="submit" value="<%:Cancel%>">
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,34 +1,34 @@
|
|||||||
<div class="gluon-value">
|
<div class="gluon-value">
|
||||||
<div class="gluon-value-title">
|
<div class="gluon-value-title">
|
||||||
<input data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %>>
|
<input data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %>>
|
||||||
<label<%= attr("for", id..'.1')%>></label>
|
<label<%= attr("for", id..'.1')%>></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="gluon-value-field-long">
|
<div class="gluon-value-field-long">
|
||||||
<label<%= attr("for", id..'.1') %> class="gluon-value-title"><%:Security mode%></label>
|
<label<%= attr("for", id..'.1') %> class="gluon-value-title"><%:Security mode%></label>
|
||||||
<br>
|
<br>
|
||||||
<%| translate(
|
<%| translate(
|
||||||
'In security mode, the mesh VPN uses an encrypted tunnel to connect to the VPN servers. ' ..
|
'In security mode, the mesh VPN uses an encrypted tunnel to connect to the VPN servers. ' ..
|
||||||
'The encryption ensures that it is impossible for your internet access provider to see what ' ..
|
'The encryption ensures that it is impossible for your internet access provider to see what ' ..
|
||||||
'data is exchanged over your node.'
|
'data is exchanged over your node.'
|
||||||
) %>
|
) %>
|
||||||
<br>
|
<br>
|
||||||
</div>
|
</div>
|
||||||
<div class="gluon-value-field-long-after"></div>
|
<div class="gluon-value-field-long-after"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="gluon-value gluon-value-last">
|
<div class="gluon-value gluon-value-last">
|
||||||
<div class="gluon-value-title">
|
<div class="gluon-value-title">
|
||||||
<input data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %>>
|
<input data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %>>
|
||||||
<label<%= attr("for", id..'.2')%>></label>
|
<label<%= attr("for", id..'.2')%>></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="gluon-value-field-long">
|
<div class="gluon-value-field-long">
|
||||||
<label<%= attr("for", id..'.2') %> class="gluon-value-title"><%:Performance mode%></label>
|
<label<%= attr("for", id..'.2') %> class="gluon-value-title"><%:Performance mode%></label>
|
||||||
<br>
|
<br>
|
||||||
<%| translate(
|
<%| translate(
|
||||||
'In performance mode, no encryption is used. This usually allows for higher throughput, but the data exchanged over your node is not ' ..
|
'In performance mode, no encryption is used. This usually allows for higher throughput, but the data exchanged over your node is not ' ..
|
||||||
'protected against eavesdropping.'
|
'protected against eavesdropping.'
|
||||||
) %>
|
) %>
|
||||||
<br>
|
<br>
|
||||||
</div>
|
</div>
|
||||||
<div class="gluon-value-field-long-after"></div>
|
<div class="gluon-value-field-long-after"></div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
<%- if self.title or self.content then -%>
|
<%- if self.title or self.content then -%>
|
||||||
<div class="gluon-warning"<%=
|
<div class="gluon-warning"<%=
|
||||||
attr("id", id) ..
|
attr("id", id) ..
|
||||||
attr("data-index", self.index) ..
|
attr("data-index", self.index) ..
|
||||||
attr("data-depends", self:deplist(self.deps))
|
attr("data-depends", self:deplist(self.deps))
|
||||||
%>>
|
%>>
|
||||||
<%- if self.content then -%>
|
<%- if self.content then -%>
|
||||||
<%=self.content%>
|
<%=self.content%>
|
||||||
<%- else -%>
|
<%- else -%>
|
||||||
<b><%=self.title%></b><br>
|
<b><%=self.title%></b><br>
|
||||||
<%=self.description%>
|
<%=self.description%>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
</div>
|
</div>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<%#
|
<%#
|
||||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
SPDX-FileCopyrightText: 2008 Steven Barth <steven@midlink.org>
|
||||||
Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
|
SPDX-FileCopyrightText: 2008 Jo-Philipp Wich <jow@openwrt.org>
|
||||||
Licensed to the public under the Apache License 2.0.
|
SPDX-License-Identifier: Apache-2.0
|
||||||
-%>
|
-%>
|
||||||
|
|
||||||
<h2 name="content">404 <%:Not Found%></h2>
|
<h2 name="content">404 <%:Not Found%></h2>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<%#
|
<%#
|
||||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
SPDX-FileCopyrightText: 2008 Steven Barth <steven@midlink.org>
|
||||||
Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
|
SPDX-FileCopyrightText: 2008 Jo-Philipp Wich <jow@openwrt.org>
|
||||||
Licensed to the public under the Apache License 2.0.
|
SPDX-License-Identifier: Apache-2.0
|
||||||
-%>
|
-%>
|
||||||
|
|
||||||
<h2 name="content">500 <%:Internal Server Error%></h2>
|
<h2 name="content">500 <%:Internal Server Error%></h2>
|
||||||
|
Loading…
Reference in New Issue
Block a user