diff options
Diffstat (limited to 'modules-available')
6 files changed, 49 insertions, 54 deletions
diff --git a/modules-available/systemstatus/lang/de/module.json b/modules-available/systemstatus/lang/de/module.json index e69c3fb0..3d25d131 100644 --- a/modules-available/systemstatus/lang/de/module.json +++ b/modules-available/systemstatus/lang/de/module.json @@ -1,3 +1,8 @@ { - "module_name": "System-Status" + "module_name": "System-Status", + "tab_DmsdLog": "bwLehrpool-Suite Server Log", + "tab_LdadpLog": "LDAP\/AD", + "tab_LighttpdLog": "lighttpd log", + "tab_Netstat": "netstat -tulpn", + "tab_PsList": "ps auxf" }
\ No newline at end of file diff --git a/modules-available/systemstatus/lang/de/template-tags.json b/modules-available/systemstatus/lang/de/template-tags.json index 3b929a6b..fa50d546 100644 --- a/modules-available/systemstatus/lang/de/template-tags.json +++ b/modules-available/systemstatus/lang/de/template-tags.json @@ -5,13 +5,10 @@ "lang_average": "Durchschnitt", "lang_capacity": "Kapazit\u00e4t", "lang_cpuLoad": "CPU-Last", - "lang_dmsdLog": "dmsd Log", "lang_foundStore": "Vorgefunden:", "lang_free": "Frei", "lang_goToStoreConf": "Zur VM-Store-Konfiguration wechseln", "lang_iAmSure": "Ja, ich bin sicher", - "lang_ldadpLog": "AD\/LDAP-Proxy Log", - "lang_lighttpdLog": "lighttpd-Error Log", "lang_logicCPUs": "Logische CPUs", "lang_maintenance": "Maintenance", "lang_notDetermined": "Konnte nicht ermittelt werden", diff --git a/modules-available/systemstatus/lang/en/module.json b/modules-available/systemstatus/lang/en/module.json index bb201773..9f6d937a 100644 --- a/modules-available/systemstatus/lang/en/module.json +++ b/modules-available/systemstatus/lang/en/module.json @@ -1,3 +1,8 @@ { - "module_name": "System Status" + "module_name": "System Status", + "tab_DmsdLog": "bwLehrpool-Suite log", + "tab_LdadpLog": "LDAP\/AD", + "tab_LighttpdLog": "lighttpd log", + "tab_Netstat": "netstat -tulpn", + "tab_PsList": "ps auxf" }
\ No newline at end of file diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json index b8730411..69f5740c 100644 --- a/modules-available/systemstatus/lang/en/template-tags.json +++ b/modules-available/systemstatus/lang/en/template-tags.json @@ -5,13 +5,10 @@ "lang_average": "Average", "lang_capacity": "Capacity", "lang_cpuLoad": "CPU Load", - "lang_dmsdLog": "dmsd log", "lang_foundStore": "Found:", "lang_free": "Free", "lang_goToStoreConf": "Go to VM store configuration", "lang_iAmSure": "Yes, I am sure", - "lang_ldadpLog": "AD\/LDAP proxy log", - "lang_lighttpdLog": "lighttpd-error log", "lang_logicCPUs": "Logic CPUs", "lang_maintenance": "Maintenance", "lang_notDetermined": "Could not be determined", diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php index b9fef0fd..a8deeecb 100644 --- a/modules-available/systemstatus/page.inc.php +++ b/modules-available/systemstatus/page.inc.php @@ -29,6 +29,14 @@ class Page_SystemStatus extends Page if (is_array($this->rebootTask) && isset($this->rebootTask['id'])) { $data['rebootTask'] = $this->rebootTask['id']; } + $tabs = array('DmsdLog', 'Netstat', 'PsList', 'LdadpLog', 'LighttpdLog'); + $data['tabs'] = array(); + foreach ($tabs as $tab) { + $data['tabs'][] = array( + 'type' => $tab, + 'name' => Dictionary::translate('tab_' . $tab) + ); + } Render::addTemplate('_page', $data); } diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html index 0573a20c..7e8c0e7d 100644 --- a/modules-available/systemstatus/templates/_page.html +++ b/modules-available/systemstatus/templates/_page.html @@ -79,60 +79,43 @@ <h3>{{lang_advanced}}</h3> -<div class="panel panel-default"> - <div class="panel-heading"> - {{lang_dmsdLog}} - </div> - <div class="panel-body" id="dmsd-log"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - {{lang_ldadpLog}} - </div> - <div class="panel-body" id="ldadp-log"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - {{lang_lighttpdLog}} - </div> - <div class="panel-body" id="lighttpd-log"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - netstat -tulpn - </div> - <div class="panel-body" id="netstat"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - ps auxf - </div> - <div class="panel-body" id="pslist"> +<ul class="nav nav-tabs tabs-up"> +{{#tabs}} + <li> + <a href="#id-{{type}}_pane" class="ajax-tab" id="id-{{type}}" data-toggle="tab" role="tab"> + {{name}} + </a> + </li> +{{/tabs}} +</ul> + +<div class="tab-content"> +{{#tabs}} + <div class="tab-pane" id="id-{{type}}_pane"> <span class="glyphicon glyphicon-refresh slx-rotation"></span> </div> +{{/tabs}} </div> -<script type="text/javascript"> +<div> </div> + +<script type="text/javascript"><!-- document.addEventListener("DOMContentLoaded", function() { $('#diskstat').load('?do=SystemStatus&action=DiskStat'); $('#addresses').load('?do=SystemStatus&action=AddressList'); $('#systeminfo').load('?do=SystemStatus&action=SystemInfo'); $('#services').load('?do=SystemStatus&action=Services'); $('#dmsd-users').load('?do=SystemStatus&action=DmsdUsers'); - setTimeout(function() { - $('#dmsd-log').load('?do=SystemStatus&action=DmsdLog'); - $('#netstat').load('?do=SystemStatus&action=Netstat'); - $('#pslist').load('?do=SystemStatus&action=PsList'); - $('#ldadp-log').load('?do=SystemStatus&action=LdadpLog'); - $('#lighttpd-log').load('?do=SystemStatus&action=LighttpdLog'); - }, 300); + var slxDone = {}; + $('.ajax-tab').click(function (e) { + e.preventDefault(); + var $this = $(this); + var w = $this.attr('id'); + if (!slxDone[w]) { + slxDone[w] = true; + var $pane = $('#' + w + '_pane'); + $pane.load('?do=SystemStatus&action=' + w.substring(3)); + } + }); }, false); -</script> +//--></script> |