diff options
| author | Simon Rettberg | 2018-03-21 16:08:52 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-03-21 16:08:52 +0100 |
| commit | c98e08ea376b793e6d98b7a0e03d4d92afc2cca7 (patch) | |
| tree | 7ec4344851bce9cac8e935a78e33061df1abd883 /modules-available/dnbd3 | |
| parent | [vmstore] Deliver mount options to clients (diff) | |
| download | slx-admin-c98e08ea376b793e6d98b7a0e03d4d92afc2cca7.tar.gz slx-admin-c98e08ea376b793e6d98b7a0e03d4d92afc2cca7.tar.xz slx-admin-c98e08ea376b793e6d98b7a0e03d4d92afc2cca7.zip | |
[dnbd3] Hide tabs that aren't available
Diffstat (limited to 'modules-available/dnbd3')
4 files changed, 16 insertions, 11 deletions
diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php index 8a9abdc1..4fe5dea1 100644 --- a/modules-available/dnbd3/page.inc.php +++ b/modules-available/dnbd3/page.inc.php @@ -264,7 +264,7 @@ class Page_Dnbd3 extends Page User::assertPermission('view.details'); $server = $this->getServerById(); Render::addTemplate('page-proxy-header', $server); - $stats = Dnbd3Rpc::query($server['ip'], 5003, true, true, true, true); + $stats = Dnbd3Rpc::query($server['ip'], 5003, true, true, true, true, true, true); if (!is_array($stats) || !isset($stats['runId'])) { Message::addError('server-unreachable'); return; @@ -277,9 +277,10 @@ class Page_Dnbd3 extends Page $stats['percentFree'] = round($stats['percentFree'], $stats['percentFree'] < 10 ? 1 : 0); } $stats['uptime_s'] = floor($stats['uptime'] / 86400) . 'd ' . gmdate('H:i:s', $stats['uptime']); + $stats['tab_config'] = is_string($stats['config']); + $stats['tab_altservers'] = is_array($stats['altservers']); Render::addTemplate('page-proxy-stats', $stats); Render::openTag('div', ['class' => 'tab-content']); - $confAlts = Dnbd3Rpc::query($server['ip'], 5003, false, false, false, false, true, true); $ips = array(); $sort = array(); foreach ($stats['clients'] as &$c) { @@ -290,15 +291,15 @@ class Page_Dnbd3 extends Page $ips = array_keys($ips); array_multisort($sort, SORT_DESC, $stats['clients']); // Config - if (is_string($confAlts['config'])) { - Render::addTemplate('page-proxy-config', $confAlts); + if (is_string($stats['config'])) { + Render::addTemplate('page-proxy-config', $stats); } - if (is_array($confAlts['altservers'])) { - foreach ($confAlts['altservers'] as &$as) { + if (is_array($stats['altservers'])) { + foreach ($stats['altservers'] as &$as) { $as['rtt'] = round(array_sum($as['rtt']) / count($as['rtt']) / 1000, 2); } unset($as); - Render::addTemplate('page-proxy-altservers', $confAlts); + Render::addTemplate('page-proxy-altservers', $stats); } // Count locations $res = Database::simpleQuery("SELECT locationid, Count(*) AS cnt FROM machine diff --git a/modules-available/dnbd3/templates/page-proxy-clients.html b/modules-available/dnbd3/templates/page-proxy-clients.html index dde20632..6733a056 100644 --- a/modules-available/dnbd3/templates/page-proxy-clients.html +++ b/modules-available/dnbd3/templates/page-proxy-clients.html @@ -1,4 +1,4 @@ -<div role="tabpanel" class="tab-pane" id="tab-clients"> +<div role="tabpanel" class="tab-pane active" id="tab-clients"> <div class="row"> <div class="col-md-6"> {{#loclist.0}} diff --git a/modules-available/dnbd3/templates/page-proxy-config.html b/modules-available/dnbd3/templates/page-proxy-config.html index 46e732c1..79f56015 100644 --- a/modules-available/dnbd3/templates/page-proxy-config.html +++ b/modules-available/dnbd3/templates/page-proxy-config.html @@ -1,4 +1,4 @@ -<div role="tabpanel" class="tab-pane active" id="tab-config"> +<div role="tabpanel" class="tab-pane" 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-stats.html b/modules-available/dnbd3/templates/page-proxy-stats.html index 9a03b718..a866903c 100644 --- a/modules-available/dnbd3/templates/page-proxy-stats.html +++ b/modules-available/dnbd3/templates/page-proxy-stats.html @@ -16,8 +16,12 @@ </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> + {{#tab_config}} + <li role="presentation"><a href="#tab-config" role="tab" data-toggle="tab">{{lang_proxyConfig}}</a></li> + {{/tab_config}} + <li role="presentation" class="active"><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> + {{#tab_altservers}} <li role="presentation"><a href="#tab-altservers" role="tab" data-toggle="tab">{{lang_altservers}}</a></li> + {{/tab_altservers}} </ul>
\ No newline at end of file |