[dnbd3] Redesign proxy detail view, add image list

7 files changed, 111 insertions, 59 deletions

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 @@
-<div class="col-md-6">
+<div role="tabpanel" class="tab-pane" id="tab-altservers">
 	<h2>{{lang_altservers}}</h2>
 	<table class="table table-condensed">
 		<tr>
-			<th>{{lang_proxyServerTHead}}</th>
-			<th>{{lang_numFails}}</th>
-			<th class="text-right">{{lang_latency}}</th>
-			<th>{{lang_flags}}</th>
+			<th class="slx-smallcol">{{lang_proxyServerTHead}}</th>
+			<th class="slx-smallcol">{{lang_numFails}}</th>
+			<th class="text-right slx-smallcol">{{lang_latency}}</th>
+			<th class="slx-smallcol">{{lang_flags}}</th>
 			<th>{{lang_comment}}</th>
 		</tr>
 		{{#altservers}}
@@ -21,7 +21,7 @@
 						{{rtt}}&thinsp;ms
 					{{/isClientOnly}}
 				</td>
-				<td>
+				<td class="text-nowrap">
 					{{#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 @@
-<div class="col-md-6">
-	<h2>{{lang_clientList}}</h2>
+<div role="tabpanel" class="tab-pane" id="tab-clients">
+	<div class="row">
+		<div class="col-md-6">
+			{{#loclist.0}}
+				<h2>{{lang_clientsByLocation}}</h2>
 
-	<table class="table table-condensed">
-		<tr>
-			<th>{{lang_client}}</th>
-			<th class="text-right">{{lang_bytesSent}}</th>
-		</tr>
-		{{#clients}}
-			<tr>
-				<td>
-					{{address}}
-				</td>
-				<td data-sort="int" data-sort-value="{{bytesSent}}" class="text-right">
-					{{bytesSent_s}}
-				</td>
-			</tr>
-		{{/clients}}
-	</table>
+				<table class="table table-condensed">
+					<tr>
+						<th>{{lang_location}}</th>
+						<th class="text-right">{{lang_count}}</th>
+						<th class="text-right">{{lang_recursiveCount}}</th>
+					</tr>
+					{{#loclist}}
+						<tr>
+							<td>
+								{{#depth}}
+									<div style="display:inline-block;width:{{depth}}em"></div>
+								{{/depth}}
+								{{locationname}}
+							</td>
+							<td class="text-right">
+								{{clientCount}}
+							</td>
+							<td class="text-right">
+								{{recCount}}
+							</td>
+						</tr>
+					{{/loclist}}
+				</table>
+			{{/loclist.0}}
+		</div>
+		<div class="col-md-6">
+			<h2>{{lang_clientList}}</h2>
+
+			<table class="table table-condensed">
+				<tr>
+					<th>{{lang_client}}</th>
+					<th class="text-right">{{lang_bytesSent}}</th>
+				</tr>
+				{{#clients}}
+					<tr>
+						<td>
+							{{address}}
+						</td>
+						<td data-sort="int" data-sort-value="{{bytesSent}}" class="text-right">
+							{{bytesSent_s}}
+						</td>
+					</tr>
+				{{/clients}}
+			</table>
+		</div>
+	</div>
 </div>
\ 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 @@
-<div class="col-md-6">
+<div role="tabpanel" class="tab-pane active" id="tab-config">
 	<h2>{{lang_proxyConfig}}</h2>
 	<pre>{{config}}</pre>
 </div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-header.html b/modules-available/dnbd3/templates/page-proxy-header.html
index 6f3f1b7f..7f3418cc 100644
--- a/modules-available/dnbd3/templates/page-proxy-header.html
+++ b/modules-available/dnbd3/templates/page-proxy-header.html
@@ -1 +1,2 @@
-<h1>{{ip}}</h1>
\ No newline at end of file
+<h1>{{ip}}</h1>
+
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 @@
+<div role="tabpanel" class="tab-pane" id="tab-images">
+	<h2>{{lang_imageList}}</h2>
+	<table class="table table-condensed">
+		<tr>
+			<th>{{lang_image}}</th>
+			<th class="text-right slx-smallcol">{{lang_clients}}</th>
+			<th class="text-right slx-smallcol">{{lang_size}}</th>
+			<th class="text-right slx-smallcol">{{lang_complete}}</th>
+			<th class="slx-smallcol">{{lang_uplink}}</th>
+		</tr>
+		{{#images}}
+			<tr>
+				<td class="text-nowrap">
+					{{name}}:{{rid}}
+				</td>
+				<td class="text-right text-nowrap">
+					{{users}}
+				</td>
+				<td class="text-right text-nowrap">
+					{{size_s}}
+				</td>
+				<td class="text-right text-nowrap">
+					{{complete}}&thinsp;%
+				</td>
+				<td class="text-nowrap">
+					{{uplinkServer}}
+				</td>
+			</tr>
+		{{/images}}
+	</table>
+</div>
\ 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 @@
-<div class="col-md-6">
-	<h2>{{lang_clientsByLocation}}</h2>
-
-	<table class="table table-condensed">
-		<tr>
-			<th>{{lang_location}}</th>
-			<th class="text-right">{{lang_count}}</th>
-			<th class="text-right">{{lang_recursiveCount}}</th>
-		</tr>
-		{{#list}}
-			<tr>
-				<td>
-					{{#depth}}
-						<div style="display:inline-block;width:{{depth}}em"></div>
-					{{/depth}}
-					{{locationname}}
-				</td>
-				<td class="text-right">
-					{{clientCount}}
-				</td>
-				<td class="text-right">
-					{{recCount}}
-				</td>
-			</tr>
-		{{/list}}
-	</table>
-</div>
\ 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 @@
 <div class="panel panel-default">
 	<div class="panel-body">
-		{{lang_sessionTx}}: <b>{{bytesSent_s}}</b>
-		––
-		{{lang_sessionRx}}: <b>{{bytesReceived_s}}</b>
-		––
-		{{lang_uptime}}: <b>{{uptime_s}}</b>
+		<div>
+			{{lang_sessionTx}}: <b>{{bytesSent_s}}</b>
+			––
+			{{lang_sessionRx}}: <b>{{bytesReceived_s}}</b>
+			––
+			{{lang_uptime}}: <b>{{uptime_s}}</b>
+		</div>
+		<div>
+			{{lang_storageSize}}: <b>{{spaceTotal_s}}</b>
+			––
+			{{lang_diskFree}}: <b>{{spaceFree_s}} ({{percentFree}}&thinsp;%)</b>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<ul class="nav nav-tabs text-center" role="tablist">
+	<li role="presentation" class="active"><a href="#tab-config" role="tab" data-toggle="tab">{{lang_proxyConfig}}</a></li>
+	<li role="presentation"><a href="#tab-clients" role="tab" data-toggle="tab">{{lang_clientList}}</a></li>
+	<li role="presentation"><a href="#tab-images" role="tab" data-toggle="tab">{{lang_imageList}}</a></li>
+	<li role="presentation"><a href="#tab-altservers" role="tab" data-toggle="tab">{{lang_altservers}}</a></li>
+</ul>
\ No newline at end of file