diff --git a/.editorconfig b/.editorconfig index b637fff8..18a01207 100644 --- a/.editorconfig +++ b/.editorconfig @@ -21,6 +21,8 @@ indent_size = unset indent_style = space indent_size = 2 +[*.html] + [*.js] [*{.json,.ecrc}] diff --git a/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html b/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html index 3209ede8..9633531a 100644 --- a/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html +++ b/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html @@ -38,7 +38,7 @@ SPDX-FileCopyrightText: 2008-2010 Jo-Philipp Wich table.sort(ret, function(a, b) return (node.nodes[a].order or 100) - < (node.nodes[b].order or 100) + < (node.nodes[b].order or 100) end ) return ret @@ -120,7 +120,7 @@ SPDX-FileCopyrightText: 2008-2010 Jo-Philipp Wich
- <% + <% if not hidenav then menutree(unpack(request)) end diff --git a/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html b/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html index 13ac94d2..d61ed462 100644 --- a/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html +++ b/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0

<%:Upgrade firmware%>

- <%: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".%>

<% if flashsize > 0 and filesize > flashsize then %> @@ -15,40 +15,40 @@ SPDX-License-Identifier: Apache-2.0 <% end %>

-

    -
  • sha256sum: <%=checksum%>
  • -
  • <%:Size%>: <% - function byte_format(byte) - local suff = {"B", "KB", "MB", "GB", "TB"} - for i=1, 5 do - if byte > 1024 and i < 5 then - byte = byte / 1024 - else - return string.format("%.2f %s", byte, suff[i]) - end - end - end +
      +
    • sha256sum: <%=checksum%>
    • +
    • <%:Size%>: <% + function byte_format(byte) + local suff = {"B", "KB", "MB", "GB", "TB"} + for i=1, 5 do + if byte > 1024 and i < 5 then + byte = byte / 1024 + else + return string.format("%.2f %s", byte, suff[i]) + end + end + end - write(byte_format(filesize)) + write(byte_format(filesize)) - if flashsize > 0 then - write(translatef( - " (%s available)", - byte_format(flashsize) - )) - end - %>
    • -
    + if flashsize > 0 then + write(translatef( + " (%s available)", + byte_format(flashsize) + )) + end + %>
  • +

-
- - "> - -
-
- - "> - -
+
+ + "> + +
+
+ + "> + +
diff --git a/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html b/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html index e0ef55dd..3e815de4 100644 --- a/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html +++ b/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html @@ -1,34 +1,34 @@
-
- > - > -
-
- class="gluon-value-title"><%:Security mode%> -
- <%| translate( - '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 ' .. - 'data is exchanged over your node.' - ) %> -
-
-
+
+ > + > +
+
+ class="gluon-value-title"><%:Security mode%> +
+ <%| translate( + '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 ' .. + 'data is exchanged over your node.' + ) %> +
+
+
-
- > - > -
-
- class="gluon-value-title"><%:Performance mode%> -
- <%| translate( - '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.' - ) %> -
-
-
+
+ > + > +
+
+ class="gluon-value-title"><%:Performance mode%> +
+ <%| translate( + '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.' + ) %> +
+
+
diff --git a/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html b/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html index 41688b77..af063ec5 100644 --- a/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html +++ b/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html @@ -1,14 +1,14 @@ <%- if self.title or self.content then -%>
> - <%- if self.content then -%> - <%=self.content%> - <%- else -%> - <%=self.title%>
- <%=self.description%> - <%- end -%> + <%- if self.content then -%> + <%=self.content%> + <%- else -%> + <%=self.title%>
+ <%=self.description%> + <%- end -%>
<%- end -%>