diff --git a/application/fonts/fontello-ifont/css/ifont-embedded.css b/application/fonts/fontello-ifont/css/ifont-embedded.css index 593eb8bc0..92bcfdff9 100644 --- a/application/fonts/fontello-ifont/css/ifont-embedded.css +++ b/application/fonts/fontello-ifont/css/ifont-embedded.css @@ -167,4 +167,4 @@ .icon-chart-area:before { content: '\e870'; } /* '' */ .icon-chart-bar:before { content: '\e871'; } /* '' */ .icon-beaker:before { content: '\e872'; } /* '' */ -.icon-magic:before { content: '\e873'; } /* '' */ \ No newline at end of file +.icon-magic:before { content: '\e873'; } /* '' */ diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php index b40b37927..719d1c829 100644 --- a/library/Icinga/Web/StyleSheet.php +++ b/library/Icinga/Web/StyleSheet.php @@ -11,6 +11,8 @@ use Icinga\Web\LessCompiler; class StyleSheet { protected static $lessFiles = array( + '../application/fonts/fontello-ifont/css/ifont-embedded.css', + 'css/vendor/tipsy.css', 'css/icinga/defaults.less', 'css/icinga/layout-colors.less', 'css/icinga/layout-structure.less', @@ -24,9 +26,7 @@ class StyleSheet 'css/icinga/pagination.less', 'css/icinga/monitoring-colors.less', 'css/icinga/selection-toolbar.less', - 'css/icinga/login.less', - '../application/fonts/fontello-ifont/css/ifont-embedded.css', - 'css/vendor/tipsy.css' + 'css/icinga/login.less' ); public static function compileForPdf() diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index e90bc1c5e..8fd70627d 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -64,7 +64,7 @@ class Monitoring_AlertsummaryController extends Controller */ public function indexAction() { - $this->addTitleTab('alertsummary'); + $this->addTitleTab('alertsummary', t('Alert Summary')); $this->view->intervalBox = $this->createIntervalBox(); $this->view->recentAlerts = $this->createRecentAlerts(); $this->view->interval = $this->getInterval(); @@ -433,7 +433,7 @@ class Monitoring_AlertsummaryController extends Controller $gridChart->drawBars( array( 'label' => $this->translate('Notifications'), - 'color' => 'blue', + 'color' => '#049baf', 'data' => $notifications, 'showPoints' => true ) @@ -442,7 +442,7 @@ class Monitoring_AlertsummaryController extends Controller $gridChart->drawLines( array( 'label' => $this->translate('Avg (min)'), - 'color' => 'orange', + 'color' => '#ffaa44', 'data' => $dAvg, 'showPoints' => true ) @@ -451,7 +451,7 @@ class Monitoring_AlertsummaryController extends Controller $gridChart->drawLines( array( 'label' => $this->translate('Max (min)'), - 'color' => 'red', + 'color' => '#ff5566', 'data' => $dMax, 'showPoints' => true ) @@ -478,7 +478,7 @@ class Monitoring_AlertsummaryController extends Controller $gridChart->drawBars( array( 'label' => $this->translate('Notifications'), - 'color' => 'green', + 'color' => '#049baf', 'data' => $this->notificationData, 'showPoints' => true ) @@ -487,7 +487,7 @@ class Monitoring_AlertsummaryController extends Controller $gridChart->drawLines( array( 'label' => $this->translate('Defects'), - 'color' => 'red', + 'color' => '#ff5566', 'data' => $this->problemData, 'showPoints' => true ) diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml index 2a9a5e067..624b942b3 100644 --- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml +++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml @@ -11,19 +11,19 @@ $helper = $this->getHelper('MonitoringState');
-

translate('Alert summary'); ?>

+ -
-
-

translate('Notifications and problems'); ?>

-
+
+
+

translate('Notifications and Problems'); ?>

+
render(); ?>
-
-

translate('Time to reaction (Ack, Recover)'); ?>

-
+
+

translate('Time to Reaction (Ack, Recover)'); ?>

+
render(); ?>
@@ -56,7 +56,7 @@ $helper = $this->getHelper('MonitoringState');
recentAlerts): ?> -

translate('Top 5 recent alerts'); ?>

+

translate('Top 5 Recent Alerts'); ?>

@@ -69,7 +69,7 @@ $helper = $this->getHelper('MonitoringState');
-

translate('History'); ?>

+

translate('History'); ?>

partial('list/notifications.phtml', array( diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less index 7f6914e3d..6972e95dc 100644 --- a/public/css/icinga/main-content.less +++ b/public/css/icinga/main-content.less @@ -193,3 +193,12 @@ table.benchmark { .controls a { color: inherit; } + +/* controls have no padding as of tabs */ +.controls > h1 { + margin-right: 1em; +} + +[class^="icon-"]:before, [class*=" icon-"]:before { + text-decoration: none; +}