diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml index 9b253dad8..8e8c08e1c 100644 --- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml +++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml @@ -13,57 +13,70 @@ $helper = $this->getHelper('MonitoringState');

translate('Alert summary'); ?>

-

translate('Notifications and problems'); ?>

+
+
+

translate('Notifications and problems'); ?>

+
+ render(); ?> +
+
-
- render(); ?> -
- -

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

- -
- render(); ?> +
+

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

+
+ render(); ?> +
+

translate('Trend'); ?>

-
- translate('Average') ?> - perf->avg; ?> - translate('notifications per hour'); ?>, - perf->last; ?> - translate('in the last hour'); ?>. -
+
+
+ translate('Average') ?> + perf->avg; ?> + translate('notifications per hour'); ?>, + perf->last; ?> + translate('in the last hour'); ?>. -
- translate('Trend, problems in 24h'); ?> - (trend->percent; ?>% - translate($this->trend->trend); ?>) + translate('Trend for the last 24h'); ?> + (trend->percent; ?>% + translate($this->trend->trend); ?>) - - trend->trend === 'up'): ?> - icon('up.png'); ?> - trend->trend === 'unchanged'): ?> - icon('next.png'); ?> - - icon('down.png'); ?> - - + + trend->trend === 'up'): ?> + icon('up.png'); ?> + trend->trend === 'unchanged'): ?> + icon('next.png'); ?> + + icon('down.png'); ?> + + +
recentAlerts): ?>

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

- partial('list/notifications.phtml', array( - 'notifications' => $this->recentAlerts, - 'compact' => true, - 'inline' => true - )); ?> + +
+
+ partial('list/notifications.phtml', array( + 'notifications' => $this->recentAlerts, + 'compact' => true, + 'inline' => true + )); ?> +
+

translate('History'); ?>

- partial('list/notifications.phtml', array( - 'notifications' => $this->notifications, - 'compact' => true, - 'inline' => true - )); ?> +
+
+ partial('list/notifications.phtml', array( + 'notifications' => $this->notifications, + 'compact' => true, + 'inline' => true + )); ?> +
+
\ No newline at end of file diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less index 5ab6d9c82..7e734bb33 100644 --- a/modules/monitoring/public/css/module.less +++ b/modules/monitoring/public/css/module.less @@ -134,3 +134,27 @@ span.state.pending { form.instance-features span.description, form.object-features span.description { display: inline; } + +.alertsummary-flex-container { + display: -ms-Flexbox; + -ms-box-orient: horizontal; + + display: -webkit-flex; + display: -moz-flex; + display: -ms-flex; + display: flex; + + -webkit-flex-flow: row wrap; + -moz-flex-flow: row wrap; + -ms-flex-flow: row wrap; + flex-flow: row wrap; +} + +.alertsummary-flex { + flex: 1 1 auto; + overflow: auto; + border: 1px #333 solid; + padding: 5px; + margin: 0 10px 0 0; + border-spacing: 10px 10px; +}