From 833aebaa644979d69c39b22f137e0357602ea309 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 29 Jul 2020 16:27:03 +0200 Subject: luci-app-dockerman: view/dockerman: update coding style Signed-off-by: Florian Eckert --- .../luasrc/view/dockerman/apply_widget.htm | 277 +++++++------ .../luasrc/view/dockerman/container.htm | 15 +- .../luasrc/view/dockerman/container_console.htm | 4 +- .../luasrc/view/dockerman/container_file.htm | 128 +++--- .../luasrc/view/dockerman/container_stats.htm | 1 + .../luasrc/view/dockerman/images_import.htm | 174 ++++---- .../luasrc/view/dockerman/images_load.htm | 51 +-- .../luasrc/view/dockerman/newcontainer_resolve.htm | 181 ++++---- .../luasrc/view/dockerman/overview.htm | 459 +++++++++------------ 9 files changed, 634 insertions(+), 656 deletions(-) (limited to 'applications/luci-app-dockerman/luasrc/view/dockerman') diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm index 4deb6a88a..189055c20 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm @@ -1,140 +1,147 @@ + diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/container.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/container.htm index dab1dee56..9f05d9d58 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/container.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/container.htm @@ -1,12 +1,12 @@
diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm index 8be43fbdd..ab5ecdd48 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm @@ -1,63 +1,73 @@ -
- -
- -
-
- -
- -
-
-
- - -
+ +
+ +
+
+ +
+ +
+
+
+ + +
+ diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/container_stats.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/container_stats.htm index b5600e497..bbcd633e7 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/container_stats.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/container_stats.htm @@ -2,6 +2,7 @@ let last_bw_tx let last_bw_rx let interval = 3 + function progressbar(v, m, pc, np, f) { m = m || 100 diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm index 6587087b6..b87759d00 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm @@ -1,88 +1,104 @@
- - + +
diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/images_load.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/images_load.htm index 3ea4bd066..9a90a90f0 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/images_load.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/images_load.htm @@ -1,29 +1,30 @@
- - + +
diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm index 1b130b4ec..dd6cafa06 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm @@ -1,95 +1,102 @@ + <%+cbi/valueheader%> + <%+cbi/valuefooter%> diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm index 474009dfd..d11105bdc 100644 --- a/applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm +++ b/applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm @@ -1,280 +1,215 @@
-
-
-
-
- - Docker icon - - -
-
-
-

<%:Containers%>

-

- <%- if self.containers_total ~= "-" then -%><%- end -%> - <%=self.containers_running%> - /<%=self.containers_total%> - <%- if self.containers_total ~= "-" then -%><%- end -%> -

-
-
-
-
-
-
-
- - - - - -
-
-
-

<%:Images%>

-

- <%- if self.images_total ~= "-" then -%><%- end -%> - <%=self.images_used%> - /<%=self.images_total%> - <%- if self.images_total ~= "-" then -%><%- end -%> -

-
-
-
-
-
-
-
- - - - - - - - - -
-
-
-

<%:Networks%>

-

- <%- if self.networks_total ~= "-" then -%><%- end -%> - <%=self.networks_total%> - - <%- if self.networks_total ~= "-" then -%><%- end -%> -

-
-
-
-
-
-
-
- - - -
-
-
-

<%:Volumes%>

-

- <%- if self.volumes_total ~= "-" then -%><%- end -%> - <%=self.volumes_total%> - - <%- if self.volumes_total ~= "-" then -%><%- end -%> -

-
-
-
+
+
+
+
+ + Docker icon + + +
+
+
+

<%:Containers%>

+

+ <%- if self.containers_total ~= "-" then -%><%- end -%> + <%=self.containers_running%> + /<%=self.containers_total%> + <%- if self.containers_total ~= "-" then -%><%- end -%> +

+
+
+
+
+
+
+
+ + + + + +
+
+
+

<%:Images%>

+

+ <%- if self.images_total ~= "-" then -%><%- end -%> + <%=self.images_used%> + /<%=self.images_total%> + <%- if self.images_total ~= "-" then -%><%- end -%> +

+
+
+
+
+
+
+
+ + + + + + + + + +
+
+
+

<%:Networks%>

+

+ <%- if self.networks_total ~= "-" then -%><%- end -%> + <%=self.networks_total%> + + <%- if self.networks_total ~= "-" then -%><%- end -%> +

+
+
+
+
+
+
+
+ + + +
+
+
+

<%:Volumes%>

+

+ <%- if self.volumes_total ~= "-" then -%><%- end -%> + <%=self.volumes_total%> + + <%- if self.volumes_total ~= "-" then -%><%- end -%> +

+
+
+
-- cgit v1.2.3