diff --git a/src/psm/Module/AbstractController.class.php b/src/psm/Module/AbstractController.class.php
index 175dbe62..cb6062f3 100644
--- a/src/psm/Module/AbstractController.class.php
+++ b/src/psm/Module/AbstractController.class.php
@@ -183,7 +183,7 @@ abstract class AbstractController implements ControllerInterface {
// add sidebar to page?
if($this->sidebar !== null) {
$tpl_data['html_sidebar'] = $this->sidebar->createHTML();
- $tpl_data['content_span'] = '9';
+ $tpl_data['content_span'] = '10';
} else {
$tpl_data['content_span'] = '12';
}
@@ -227,10 +227,10 @@ abstract class AbstractController implements ControllerInterface {
switch($ulvl) {
case PSM_USER_ADMIN:
- $items = array('server', 'server_status', 'server_log', 'user', 'config', 'server_update');
+ $items = array('server_status', 'server', 'server_log', 'user', 'config', 'server_update');
break;
case PSM_USER_USER:
- $items = array('server', 'server_status', 'server_log', 'server_update');
+ $items = array('server_status', 'server', 'server_log', 'server_update');
break;
default:
$items = array();
diff --git a/src/psm/Module/Server/Controller/AbstractServerController.class.php b/src/psm/Module/Server/Controller/AbstractServerController.class.php
index 23a63ca9..aef1e717 100644
--- a/src/psm/Module/Server/Controller/AbstractServerController.class.php
+++ b/src/psm/Module/Server/Controller/AbstractServerController.class.php
@@ -71,7 +71,7 @@ abstract class AbstractServerController extends AbstractController {
`s`.`warning_threshold_counter`
FROM `".PSM_DB_PREFIX."servers` AS `s`
{$sql_join}
- ORDER BY `active` ASC, `status` DESC, `type` ASC, `label` ASC";
+ ORDER BY `active` ASC, `status` DESC, `label` ASC";
$servers = $this->db->query($sql);
return $servers;
diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php
index 6d8fbcf1..3a0c2f83 100644
--- a/src/psm/Module/Server/Controller/ServerController.class.php
+++ b/src/psm/Module/Server/Controller/ServerController.class.php
@@ -89,24 +89,15 @@ class ServerController extends AbstractServerController {
// will also be replaced in the html_actions template itself
$servers[$x] = $html_actions + $servers[$x];
$servers[$x]['class'] = ($x & 1) ? 'odd' : 'even';
- $servers[$x] = $this->formatServer($servers[$x]);
if($servers[$x]['type'] == 'website') {
// add link to label
$servers[$x]['ip'] = ''.$servers[$x]['ip'].'';
}
+ $servers[$x] = $this->formatServer($servers[$x]);
}
// add servers to template
$this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers', $servers);
-
- // check if we need to add the auto refresh
- $auto_refresh = psm_get_conf('auto_refresh_servers');
- if(intval($auto_refresh) > 0) {
- // add it
- $this->tpl->newTemplate('main_auto_refresh', 'main.tpl.html');
- $this->tpl->addTemplateData('main_auto_refresh', array('seconds' => $auto_refresh));
- $this->tpl->addTemplateData('main', array('auto_refresh' => $this->tpl->getTemplate('main_auto_refresh')));
- }
}
/**
@@ -317,6 +308,7 @@ class ServerController extends AbstractServerController {
array(
'subtitle' => psm_get_lang('menu', 'server'),
'label_label' => psm_get_lang('servers', 'label'),
+ 'label_status' => psm_get_lang('menu', 'server_status'),
'label_domain' => psm_get_lang('servers', 'domain'),
'label_port' => psm_get_lang('servers', 'port'),
'label_type' => psm_get_lang('servers', 'type'),
diff --git a/src/psm/Module/Server/Controller/StatusController.class.php b/src/psm/Module/Server/Controller/StatusController.class.php
index 5fa5b6ca..4f70ac6a 100644
--- a/src/psm/Module/Server/Controller/StatusController.class.php
+++ b/src/psm/Module/Server/Controller/StatusController.class.php
@@ -90,10 +90,15 @@ class StatusController extends AbstractServerController {
// add servers to template
$this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_offline', $offline);
$this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_online', $online);
- // add refresh (bit overkill perhaps to do it this way..?)
- $this->tpl->newTemplate('main_auto_refresh', 'main.tpl.html');
- $this->tpl->addTemplateData('main_auto_refresh', array('seconds' => 30));
- $this->tpl->addTemplateData('main', array('auto_refresh' => $this->tpl->getTemplate('main_auto_refresh')));
+
+ // check if we need to add the auto refresh
+ $auto_refresh = psm_get_conf('auto_refresh_servers');
+ if(intval($auto_refresh) > 0) {
+ // add it
+ $this->tpl->newTemplate('main_auto_refresh', 'main.tpl.html');
+ $this->tpl->addTemplateData('main_auto_refresh', array('seconds' => $auto_refresh));
+ $this->tpl->addTemplateData('main', array('auto_refresh' => $this->tpl->getTemplate('main_auto_refresh')));
+ }
}
protected function createHTMLLabels() {
diff --git a/src/psm/Router.class.php b/src/psm/Router.class.php
index 91fcff03..6072f37e 100644
--- a/src/psm/Router.class.php
+++ b/src/psm/Router.class.php
@@ -46,7 +46,7 @@ class Router {
* Default module (if none given or invalid one)
* @var string $default_module
*/
- public $default_module = 'server';
+ public $default_module = 'server_status';
/**
* Controller map
diff --git a/src/templates/main_sidebar.tpl.html b/src/templates/main_sidebar.tpl.html
index 0f4d3aac..61593810 100755
--- a/src/templates/main_sidebar.tpl.html
+++ b/src/templates/main_sidebar.tpl.html
@@ -1,5 +1,5 @@
-