From 2f254851e3fe4fbddd3047740f525955183a8617 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 3 Feb 2015 17:33:30 +0100
Subject: [PATCH] Fix pieChart layout and add indicator for truncated piecharts

---
 .../monitoring/application/views/helpers/Perfdata.php    | 5 +++++
 .../application/views/scripts/list/services.phtml        | 2 +-
 public/css/icinga/monitoring-colors.less                 | 9 ---------
 public/css/icinga/widgets.less                           | 5 ++++-
 public/js/icinga/behavior/sparkline.js                   | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 8e79fceeb..930a4e61e 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -57,8 +57,13 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         }
 
         if ($limit > 0) {
+            $count = max (count($table), count ($results));
             $table = array_slice ($table, 0, $limit);
             $results = array_slice ($results, 0, $limit);
+            if ($count > $limit) {
+                $mess = sprintf(t('%d more ...'), $count - $limit);
+                $results[] = '<span title="' . $mess . '">...</span>';
+            }
         }
 
         if ($compact) {
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index f7bbffe57..4cb073fc3 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -65,7 +65,7 @@ foreach ($services as $service):
       </td>
 
       <td>
-        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?></div>
+        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
 
         <?php if (!$service->service_handled && $service->service_state > 0): ?>
         <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index c7a24ed5f..0b365e503 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -64,15 +64,6 @@ table.action td a:hover {
   text-decoration: underline;
 }
 
-table.action span.sparkline, table.action img.inlinepie {
-  margin: 0.5em 0.25em 0.5em 0.25em;
-  float:right;
-}
-
-.dashboard table.action span.sparkline, .dashboard table.action img.inlinepie {
-  margin: 0em 0.25em 0em 0.25em;
-}
-
 /* END of Action table */
 
 
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 6263a6f0b..cfe5bb6e1 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -287,7 +287,8 @@ li li .badge {
 
 .sparkline-box {
   position: relative;
-  top: -9px;
+  top: -3px;
+  float: right;
 }
 
 .dashboard .sparkline-box {
@@ -299,4 +300,6 @@ li li .badge {
   height: 12px;
   position: relative;
   top: 4px;
+
+  margin: 0em 0em 0em 0.1em;
 }
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 4a5cbefd5..44bac4fb9 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -15,7 +15,7 @@
     Sparkline.prototype.onRendered = function(evt) {
         var el = evt.target;
 
-        $('span.sparkline', el).each(function(i, element) {
+        $('.sparkline', el).each(function(i, element) {
             // read custom options
             var $spark = $(element);
             var title  = $spark.attr('title');