Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537

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'; } /* '' */
+.icon-magic:before { content: '\e873'; } /* '' */

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',
+        'css/icinga/login.less'
-        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
-        'css/vendor/tipsy.css'
     );
 
     public static function compileForPdf()

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
             )

modules/monitoring/application/views/scripts/alertsummary/index.phtml

@@ -11,19 +11,19 @@ $helper = $this->getHelper('MonitoringState');
 </div>
 
 <div class="content alertsummary">
-    <h1><?= $this->translate('Alert summary'); ?></h1>
+    <!-- <h1><?= $this->translate('Alert summary'); ?></h1> -->
 
-    <div class="alertsummary-flex-container">
+    <div class="hbox">
-        <div class="alertsummary-flex">
+        <div class="hbox-item">
-            <h2><?= $this->translate('Notifications and problems'); ?></h2>
+            <h2><?= $this->translate('Notifications and Problems'); ?></h2>
-            <div>
+            <div style="width: 400px; height: 400px;">
                 <?= $defectChart->render(); ?>
             </div>
         </div>
 
-        <div class="alertsummary-flex">
+        <div class="hbox-item">
-            <h2><?= $this->translate('Time to reaction (Ack, Recover)'); ?></h2>
+            <h2><?= $this->translate('Time to Reaction (Ack, Recover)'); ?></h2>
-            <div>
+            <div style="width: 400px; height: 400px;">
                 <?= $healingChart->render(); ?>
             </div>
         </div>
@@ -56,7 +56,7 @@ $helper = $this->getHelper('MonitoringState');
     </div>
 
     <?php if ($this->recentAlerts): ?>
-        <h2><?= $this->translate('Top 5 recent alerts'); ?></h2>
+        <h1><?= $this->translate('Top 5 Recent Alerts'); ?></h1>
 
         <div class="alertsummary-flex-container">
             <div class="alertsummary-flex">
@@ -69,7 +69,7 @@ $helper = $this->getHelper('MonitoringState');
         </div>
     <?php endif; ?>
 
-    <h2><?= $this->translate('History'); ?></h2>
+    <h1><?= $this->translate('History'); ?></h1>
     <div class="alertsummary-flex-container">
         <div class="alertsummary-flex">
             <?= $this->partial('list/notifications.phtml', array(

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;
+}