diff --git a/web/skins/bootstrap/css/skin.css b/web/skins/bootstrap/css/skin.css index 05a4b6f88..f7ab7c74f 100644 --- a/web/skins/bootstrap/css/skin.css +++ b/web/skins/bootstrap/css/skin.css @@ -348,39 +348,6 @@ th.table-th-sort-rev span.table-th-sort-span { * Primary layout styles */ -#header { - width: 96%; - line-height: 24px; - margin: 8px auto; - text-align: left; -} - -#header h2 { - left: 0; -} - -#header h2.floating { - float: left; -} - -#headerControl { - width: 50%; - text-align: center; - margin: 0 auto; -} - -#headerButtons { - float: right; -} - -#headerButtons a { - margin-left: 8px; -} - -#headerButtons input { - margin-left: 4px; -} - #content { width: 96%; margin: 8px auto; @@ -428,7 +395,8 @@ th.table-th-sort-rev span.table-th-sort-span { } #footer { - width: 96%; - margin: 8px auto; + position: absolute; + bottom: 0px; + width: 100%; + background-color: #F5F5F5; } - diff --git a/web/skins/bootstrap/views/console.php b/web/skins/bootstrap/views/console.php index a5909f36b..6d195c0fe 100644 --- a/web/skins/bootstrap/views/console.php +++ b/web/skins/bootstrap/views/console.php @@ -70,6 +70,11 @@ $eventCounts = array( $running = daemonCheck(); $status = $running?$SLANG['Running']:$SLANG['Stopped']; +if ($status == 'Running') { + $statusClass = 'success'; +} else { + $statusClass = 'danger'; +} $group = NULL; if ( ! empty($_COOKIE['zmGroup']) ) { @@ -181,55 +186,36 @@ $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText' xhtmlHeaders( __FILE__, $SLANG['Console'] ); ?> -
- -
- + +
+
@@ -258,7 +244,7 @@ if ( canEdit('Monitors') ) @@ -272,7 +258,7 @@ for ( $i = 0; $i < count($eventCounts); $i++ ) } ?> - + @@ -338,7 +324,7 @@ foreach( $displayMonitors as $monitor ) - +
- +
disabled="disabled"/> disabled="disabled"/>
+
-