From 02111ed9a4935baf6c1f2968e50daf1b663702fe Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 20 Mar 2018 11:30:53 +0100 Subject: [dnbd3] Redesign proxy detail view, add image list --- .../dnbd3/templates/page-proxy-altservers.html | 12 ++-- .../dnbd3/templates/page-proxy-clients.html | 69 ++++++++++++++++------ .../dnbd3/templates/page-proxy-config.html | 2 +- .../dnbd3/templates/page-proxy-header.html | 3 +- .../dnbd3/templates/page-proxy-images.html | 31 ++++++++++ .../dnbd3/templates/page-proxy-loclist.html | 27 --------- .../dnbd3/templates/page-proxy-stats.html | 26 ++++++-- 7 files changed, 111 insertions(+), 59 deletions(-) create mode 100644 modules-available/dnbd3/templates/page-proxy-images.html delete mode 100644 modules-available/dnbd3/templates/page-proxy-loclist.html (limited to 'modules-available/dnbd3/templates') diff --git a/modules-available/dnbd3/templates/page-proxy-altservers.html b/modules-available/dnbd3/templates/page-proxy-altservers.html index 00a884cc..d2e520f9 100644 --- a/modules-available/dnbd3/templates/page-proxy-altservers.html +++ b/modules-available/dnbd3/templates/page-proxy-altservers.html @@ -1,11 +1,11 @@ -
{{lang_proxyServerTHead}} | -{{lang_numFails}} | -{{lang_latency}} | -{{lang_flags}} | +{{lang_proxyServerTHead}} | +{{lang_numFails}} | +{{lang_latency}} | +{{lang_flags}} | {{lang_comment}} | + |
{{#isClientOnly}}
[CO]
{{/isClientOnly}}
diff --git a/modules-available/dnbd3/templates/page-proxy-clients.html b/modules-available/dnbd3/templates/page-proxy-clients.html
index 9e7cec4c..dde20632 100644
--- a/modules-available/dnbd3/templates/page-proxy-clients.html
+++ b/modules-available/dnbd3/templates/page-proxy-clients.html
@@ -1,20 +1,53 @@
-
- {{lang_clientList}}+
+
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-config.html b/modules-available/dnbd3/templates/page-proxy-config.html
index adc73a57..46e732c1 100644
--- a/modules-available/dnbd3/templates/page-proxy-config.html
+++ b/modules-available/dnbd3/templates/page-proxy-config.html
@@ -1,4 +1,4 @@
-
+
+ {{#loclist.0}}
+
+ {{lang_clientsByLocation}}-
+
+ {{lang_clientList}}+ +
+
+
+
\ No newline at end of file
--
cgit v1.2.3-55-g7522
{{lang_proxyConfig}}{{config}} {{ip}}\ No newline at end of file +{{ip}}+ diff --git a/modules-available/dnbd3/templates/page-proxy-images.html b/modules-available/dnbd3/templates/page-proxy-images.html new file mode 100644 index 00000000..7e30de20 --- /dev/null +++ b/modules-available/dnbd3/templates/page-proxy-images.html @@ -0,0 +1,31 @@ +
+
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-loclist.html b/modules-available/dnbd3/templates/page-proxy-loclist.html
deleted file mode 100644
index 67c90683..00000000
--- a/modules-available/dnbd3/templates/page-proxy-loclist.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{{lang_imageList}}+
-
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-stats.html b/modules-available/dnbd3/templates/page-proxy-stats.html
index e7811028..9a03b718 100644
--- a/modules-available/dnbd3/templates/page-proxy-stats.html
+++ b/modules-available/dnbd3/templates/page-proxy-stats.html
@@ -1,9 +1,23 @@
{{lang_clientsByLocation}}- -
- {{lang_sessionTx}}: {{bytesSent_s}}
- ––
- {{lang_sessionRx}}: {{bytesReceived_s}}
- ––
- {{lang_uptime}}: {{uptime_s}}
+
-
+ {{lang_sessionTx}}: {{bytesSent_s}}
+ ––
+ {{lang_sessionRx}}: {{bytesReceived_s}}
+ ––
+ {{lang_uptime}}: {{uptime_s}}
+
+
+ {{lang_storageSize}}: {{spaceTotal_s}}
+ ––
+ {{lang_diskFree}}: {{spaceFree_s}} ({{percentFree}} %)
+
|
---|