From af338c1dba13a5ede512189b05b7b664d814e4ce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 1 Oct 2015 17:08:48 +0200
Subject: [PATCH] monitoring: Don't render custom variables as list

refs #5543
---
 .../scripts/show/components/customvars.phtml  |  2 +-
 .../scripts/show/components/perfdata.phtml    |  4 +-
 modules/monitoring/public/css/module.less     | 59 +------------------
 public/css/icinga/layout-structure.less       | 13 ----
 4 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/customvars.phtml b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
index 77a611952..126b148f3 100644
--- a/modules/monitoring/application/views/scripts/show/components/customvars.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
@@ -1,6 +1,6 @@
 <?php foreach ($object->customvars as $name => $value): ?>
 <tr>
     <th><?= $this->escape(ucwords(str_replace('_', ' ', strtolower($name)))) ?></th>
-    <td><?= $this->customvar($value) ?></td>
+    <td class="custom-variables"><?= $this->customvar($value) ?></td>
 </tr>
 <?php endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
index dfb6e95ac..f3cff23cc 100644
--- a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
@@ -1,6 +1,4 @@
 <?php if ($object->perfdata): ?>
 <h2><?= $this->translate('Performance data') ?></h2>
-<div class="performance-data">
-    <?= $this->perfdata($object->perfdata) ?>
-</div>
+<?= $this->perfdata($object->perfdata) ?>
 <?php endif ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 576d829de..ee9d6f66f 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -347,64 +347,7 @@ form.object-features .control-label {
   line-height: 25px;
 }
 
-/* Inline Comments */
-
-.inline-comments {
-    padding: 0;
-    margin: 0;
-    font-size: 0.857em;
-
-    .time-ago {
-        color: #919191;
-    }
-
-    li {
-        list-style-type: none;
-        margin-bottom: 8px;
-    }
-
-    h3 {
-        border: none;
-	border-bottom: 1px solid @gray-lighter;
-        font-weight: normal;
-        color: inherit;
-        margin: 0;
-        padding-bottom: 0.1em;
-    }
-
-    h3 .author {
-    }
-
-    h3 form {
-        display: none;
-    }
-
-    h3 form {
-        float: right;
-    }
-
-    li:hover h3 {
-        background: #F9F9F9;
-        position: relative;
-
-        form {
-            display: inline;
-        }
-    }
-
-    p {
-	font-size 0.5em;
-        margin: 0;
-	color: #9e9e9e;
-	font-family: Menlo, monospace;
-
-        a {
-            color: #222;
-        }
-    }
-}
-
-.performance-data ul {
+.custom-variables ul {
   list-style-type: none;
   margin: 0;
   padding: 0;
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 2b3a447d5..e285df895 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -376,19 +376,6 @@ html {
   width: 1px;
 }
 
-.clearfix:after {
-  content: ".";
-  visibility: hidden;
-  display: block;
-  height: 0;
-  clear: both;
-}
-
-.multi-commands {
-  padding-top: 0em;
-  font-size: 0.9em;
-}
-
 // Hide non-javascript elements if javascript is enabled
 html.js *.no-js {
   .sr-only;