Skip to content
Snippets Groups Projects
Commit 89e4329a authored by Marius Cramer's avatar Marius Cramer
Browse files

Layout fix: tab toggle and monitor tables

parent 5d742c79
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
interface/lib/classes/tools_monitor.inc.php
+ 29
− 23
View file @ 89e4329a
...@@ -91,16 +91,18 @@ class tools_monitor { ...@@ -91,16 +91,18 @@ class tools_monitor {
$html = $html =
'<div class="systemmonitor-state state-'.$record['state'].'"> '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'"> <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table> <table class="table">
<thead class="dark">
<tr> <tr>
<td>'.$app->lng("monitor_diskusage_filesystem_txt").'</td> <th>'.$app->lng("monitor_diskusage_filesystem_txt").'</th>
<td>'.$app->lng("monitor_diskusage_type_txt").'</td> <th class="small-col">'.$app->lng("monitor_diskusage_type_txt").'</th>
<td>'.$app->lng("monitor_diskusage_size_txt").'</td> <th class="tiny-col">'.$app->lng("monitor_diskusage_size_txt").'</th>
<td>'.$app->lng("monitor_diskusage_used_txt").'</td> <th class="tiny-col">'.$app->lng("monitor_diskusage_used_txt").'</th>
<td>'.$app->lng("monitor_diskusage_available_txt").'</td> <th class="tiny-col">'.$app->lng("monitor_diskusage_available_txt").'</th>
<td>'.$app->lng("monitor_diskusage_usage_txt").'</td> <th class="tiny-col">'.$app->lng("monitor_diskusage_usage_txt").'</th>
<td>'.$app->lng("monitor_diskusage_mounted_txt").'</td> <th>'.$app->lng("monitor_diskusage_mounted_txt").'</th>
</tr>'; </tr></thead>
<tbody>';
foreach($data as $line) { foreach($data as $line) {
$html .= '<tr>'; $html .= '<tr>';
foreach ($line as $item) { foreach ($line as $item) {
...@@ -108,7 +110,7 @@ class tools_monitor { ...@@ -108,7 +110,7 @@ class tools_monitor {
} }
$html .= '</tr>'; $html .= '</tr>';
} }
$html .= '</table>'; $html .= '</tbody></table>';
$html .= '</div></div>'; $html .= '</div></div>';
} else { } else {
$html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>'; $html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
...@@ -128,12 +130,13 @@ class tools_monitor { ...@@ -128,12 +130,13 @@ class tools_monitor {
$html = $html =
'<div class="systemmonitor-state state-'.$record['state'].'"> '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'"> <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table><thead><tr> <table class="table"><thead class="dark"><tr>
<td>'.$app->lng("monitor_database_name_txt").'</td> <th>'.$app->lng("monitor_database_name_txt").'</th>
<td>'.$app->lng("monitor_database_size_txt").'</td> <th class="tiny-col">'.$app->lng("monitor_database_size_txt").'</th>
<td>'.$app->lng("monitor_database_client_txt").'</td> <th>'.$app->lng("monitor_database_client_txt").'</th>
<td>'.$app->lng("monitor_database_domain_txt").'</td> <th>'.$app->lng("monitor_database_domain_txt").'</th>
</tr>'; </tr></thead>
<tbody>';
foreach($data as $line) { foreach($data as $line) {
$html .= '<tr>'; $html .= '<tr>';
if ($line['size'] > 0) $line['size'] = $app->functions->formatBytes($line['size']); if ($line['size'] > 0) $line['size'] = $app->functions->formatBytes($line['size']);
...@@ -150,7 +153,7 @@ class tools_monitor { ...@@ -150,7 +153,7 @@ class tools_monitor {
foreach ($line as $item) { foreach ($line as $item) {
$html .= '<td>' . $item . '</td>'; $html .= '<td>' . $item . '</td>';
} }
$html .= '</tr></tmpl loop>'; $html .= '</tr>';
} }
$html .= '</tbody></table></div></div>'; $html .= '</tbody></table></div></div>';
} else { } else {
...@@ -174,7 +177,8 @@ class tools_monitor { ...@@ -174,7 +177,8 @@ class tools_monitor {
$html = $html =
'<div class="systemmonitor-state state-'.$record['state'].'"> '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'"> <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>'; <table class="table">
<tbody>';
foreach($data as $key => $value) { foreach($data as $key => $value) {
if ($key != '') { if ($key != '') {
...@@ -184,7 +188,7 @@ class tools_monitor { ...@@ -184,7 +188,7 @@ class tools_monitor {
</tr>'; </tr>';
} }
} }
$html .= '</table>'; $html .= '</tbody></table>';
$html .= '</div></div>'; $html .= '</div></div>';
} else { } else {
...@@ -209,7 +213,8 @@ class tools_monitor { ...@@ -209,7 +213,8 @@ class tools_monitor {
$html = $html =
'<div class="systemmonitor-state state-'.$record['state'].'"> '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'"> <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>'; <table class="table">
<tbody>';
foreach($data as $key => $value) { foreach($data as $key => $value) {
if ($key != '') { if ($key != '') {
$html .= '<tr> $html .= '<tr>
...@@ -218,7 +223,7 @@ class tools_monitor { ...@@ -218,7 +223,7 @@ class tools_monitor {
</tr>'; </tr>';
} }
} }
$html .= '</table>'; $html .= '</tbody></table>';
$html .= '</div></div>'; $html .= '</div></div>';
} else { } else {
$html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>'; $html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
...@@ -242,7 +247,8 @@ class tools_monitor { ...@@ -242,7 +247,8 @@ class tools_monitor {
$html = $html =
'<div class="systemmonitor-state state-'.$record['state'].'"> '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'"> <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>'; <table class="table">
<tbody>';
if($data['webserver'] != -1) { if($data['webserver'] != -1) {
if($data['webserver'] == 1) { if($data['webserver'] == 1) {
...@@ -330,7 +336,7 @@ class tools_monitor { ...@@ -330,7 +336,7 @@ class tools_monitor {
} }
$html .= '</table></div></div>'; $html .= '</tbody></table></div></div>';
} else { } else {
$html = '<p>'.$app->lng("no_data_services_txt").'</p>'; $html = '<p>'.$app->lng("no_data_services_txt").'</p>';
} }
......
interface/web/themes/default/templates/tabbed_form.tpl.htm
+ 1
− 1
View file @ 89e4329a
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<ul class='nav nav-tabs'> <ul class='nav nav-tabs'>
<tmpl_loop name="formTab"> <tmpl_loop name="formTab">
<li<tmpl_if name="active"> class='active'</tmpl_if>> <li<tmpl_if name="active"> class='active'</tmpl_if>>
<a href='#' data-toggle='tab' onclick="return changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a> <a href='#' onclick="return changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a>
</li> </li>
</tmpl_loop> </tmpl_loop>
</ul> </ul>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment