diff --git a/src/psm/Module/AbstractController.class.php b/src/psm/Module/AbstractController.class.php index 92bde95a..abbcbd6d 100644 --- a/src/psm/Module/AbstractController.class.php +++ b/src/psm/Module/AbstractController.class.php @@ -86,6 +86,12 @@ abstract class AbstractController implements ControllerInterface { */ protected $modal = array(); + /** + * html code of header accessories + * @var string $header_accessories + */ + protected $header_accessories; + /** * Database object * @var \psm\Service\Database $db @@ -125,6 +131,12 @@ abstract class AbstractController implements ControllerInterface { */ protected $user_level_required_actions = array(); + /* + * Required using black background layout + * @var boolean $black_background + */ + protected $black_background = false; + /** * XHR mode? * @var boolean $xhr @@ -214,6 +226,10 @@ abstract class AbstractController implements ControllerInterface { if($this->add_menu) { $tpl_data['html_menu'] = $this->createHTMLMenu(); } + // add header accessories to page ? + if($this->header_accessories) { + $tpl_data['header_accessories'] = $this->header_accessories; + } // add modal dialog to page ? if(sizeof($this->modal)) { $html_modal = ''; @@ -240,6 +256,10 @@ abstract class AbstractController implements ControllerInterface { if(psm_update_available()) { $tpl_data['update_available'] = str_replace('{version}', 'v'.psm_get_conf('version_update_check'), psm_get_lang('system', 'update_available')); } + + if($this->black_background) { + $tpl_data['body_class'] = 'black_background'; + } // add the module's custom template to the main template to get some content $this->setTemplateId('main'); @@ -497,6 +517,14 @@ abstract class AbstractController implements ControllerInterface { return $this; } + /** + * Set the html code of the header accessories + * @param string $html + */ + public function setHeaderAccessories($html) { + $this->header_accessories = $html; + } + /** * Check if XHR is on * @return boolean diff --git a/src/psm/Module/Server/Controller/StatusController.class.php b/src/psm/Module/Server/Controller/StatusController.class.php index 60673aaf..c09e890d 100644 --- a/src/psm/Module/Server/Controller/StatusController.class.php +++ b/src/psm/Module/Server/Controller/StatusController.class.php @@ -46,6 +46,14 @@ class StatusController extends AbstractServerController { * @todo move the background colurs to the config */ protected function executeIndex() { + // set background color to black + $this->black_background = true; + + // add header accessories + $this->tpl->newTemplate('status_layout_selector', 'server/status.tpl.html'); + $html_accessories = $this->tpl->getTemplate('status_layout_selector'); + $this->setHeaderAccessories($html_accessories); + $this->setTemplateId('server_status', 'server/status.tpl.html'); $this->addFooter(false); @@ -76,6 +84,8 @@ class StatusController extends AbstractServerController { // add servers to template $this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_offline', $offline); $this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_online', $online); + $this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_offline2', $offline); + $this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_online2', $online); // check if we need to add the auto refresh $auto_refresh = psm_get_conf('auto_refresh_servers'); diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html index de2d1752..a317917a 100755 --- a/src/templates/main.tpl.html +++ b/src/templates/main.tpl.html @@ -22,7 +22,7 @@ - +
@@ -43,7 +43,8 @@
-

{subtitle}

+

{subtitle}

+
{header_accessories}
{html_sidebar} diff --git a/src/templates/server/status.tpl.html b/src/templates/server/status.tpl.html index eb870da5..f26a7c4a 100755 --- a/src/templates/server/status.tpl.html +++ b/src/templates/server/status.tpl.html @@ -1,43 +1,73 @@ - -
- -
-
-

{label}

-

{label_last_online}: {last_online_nice}

-

{label_last_check}: {last_checked_nice}

+
+
+
+ +
+
+

{label}

+

{label_last_online}: {last_online_nice}

+

{label_last_check}: {last_checked_nice}

+
+
+ + {servers_offline} + +
+
+

{label}

+

{label_last_online}: {last_checked_nice}

+

{label_rtime}: {rtime}s

+
+
+ + {servers_online}
- - {servers_offline} - -
-
-

{label}

-

{label_last_online}: {last_checked_nice}

-

{label_rtime}: {rtime}s

+
+
+ + + + + + + + + + {servers_offline2} + + + + + + + + {servers_online2} + +
{label}
+
+
+
{label_last_online}:  
{last_online_nice}
+
{label_last_check}:  
{last_checked_nice}
+
+
+ 		{label_last_online}: {last_online_nice}{label_last_check}: {last_checked_nice}
{label}
+
+
+
{label_last_online}:  
{last_online_nice}
+
{label_rtime}:  
{rtime}
+
+
+ 		{label_last_online}: {last_online_nice}{label_rtime}: {rtime}s
- - {servers_online}
- \ No newline at end of file + + + +
+ + +
+ diff --git a/static/css/style.css b/static/css/style.css index f779ff13..c81b9de4 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -10,6 +10,19 @@ body { -ms-user-select: none; user-select: none; } + +body.black_background { + background: black; +} + +body.black_background .page-header { + border-bottom: 0; +} + +body.black_background .page-header h1 { + color: #888; +} + .navbar-fixed-top { position: fixed; margin: 0; @@ -55,6 +68,23 @@ body { white-space: nowrap; } +.page-header { + display: table; + width: 100%; +} +.header-label { + display: table-cell; +} +.header-accessories { + display: table-cell; + white-space: nowrap; + text-align: right; +} +.header-accessories .btn-group { + display: inline-block; + vertical-align: bottom; +} + table { background-color: white; } @@ -64,9 +94,12 @@ fieldset { .tab-content { display: block; width: auto; - padding-top: 19px; + padding-top: 0; padding-bottom: 0; } +.tab-content.well { + padding-top: 19px; +} .nav-tabs { position: relative; top: 1px; @@ -163,6 +196,7 @@ legend { color: #666; } +/* Status page */ .offline, .online { display: inline-block; width: 100%; @@ -177,6 +211,13 @@ legend { margin-bottom: 20px; cursor: pointer; } +.entity h2 { + margin-bottom: 10px; +} +.entity p { + margin: 0; + padding: 0; +} .offline .entity { background: #a00000; color: #f7cece; @@ -192,6 +233,33 @@ legend { color: #d8f7ce; border: 2px solid #d8f7ce; } +.entity-container table td { + padding: 6px 8px; + vertical-align: middle; +} +.row-offline td, .row-offline tr:hover td { + background: #a00000 !important; + color: #f7cece; +} +.row-offline td.warning, .row-offline tr:hover tr.warning { + background: #FAA732 !important; + color: #F3F3B1; +} +.row-online td, .row-online tr:hover td { + background: #53a000 !important; + color: #d8f7ce; +} +.entity-container .server-name { + display: inline-block; + font-size: 1.15em; + line-height: 18px; + font-weight: bold; + white-space: nowrap; +} + +.visible-small { + display: none; +} td.visible-desktop, th.visible-desktop, td.hidden-phone, th.hidden-phone, @@ -239,7 +307,7 @@ span.hidden-desktop, span.hidden-desktop { .visible-desktop { display: none !important; } - .tab-content { + .tab-content.well { padding-left: 10px; padding-right: 10px; } @@ -306,6 +374,12 @@ span.hidden-desktop, span.hidden-desktop { text-align: center !important; background-color: white; } + .visible-small { + display: block; + } + td.visible-small { + display: table-cell; + } } body.install{