From c02c18b23f7f6530c1f088409a8671a32aeedbaf Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 10 Oct 2013 16:21:56 +0200
Subject: [PATCH] Add logo and remove old struct survivors

refs #4824
---
 application/layouts/scripts/parts/topbar.phtml         |  8 +++-----
 .../application/views/scripts/show/service.phtml       | 10 ----------
 public/css/main.css                                    |  9 +++++++++
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/application/layouts/scripts/parts/topbar.phtml b/application/layouts/scripts/parts/topbar.phtml
index 5642900b8..7528d9b70 100755
--- a/application/layouts/scripts/parts/topbar.phtml
+++ b/application/layouts/scripts/parts/topbar.phtml
@@ -1,9 +1,7 @@
 <nav class="navbar navbar-default navbar-fixed-top" id="icingatopbar" role="navigation">
-  <ul class="nav navbar-nav pull-left">
-    <li>
-      <a href="<?= $this->baseUrl('/') ?>" class="brand" style="margin-left:0px;">Icinga</a>
-    </li>
-  </ul>
+  <div class="navbar-header">
+    <a href="<?= $this->baseUrl('/') ?>" class="navbar-brand icinga-logo">Icinga</a>
+  </div>
   <?php if ($this->auth()->isAuthenticated()): ?>
   <ul class="nav navbar-nav pull-right" >
 <!--        Remove component as of #4583 since it's not working-->
diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml
index 8ee3683e2..4fab84322 100644
--- a/modules/monitoring/application/views/scripts/show/service.phtml
+++ b/modules/monitoring/application/views/scripts/show/service.phtml
@@ -1,21 +1,11 @@
 <?= $this->tabs->render($this); ?>
-
 <?= $this->render('show/components/status.phtml'); ?>
-
 <?= $this->render('show/components/command.phtml') ?>
-
 <?= $this->render('show/components/downtime.phtml'); ?>
-
 <?= $this->render('show/components/comments.phtml'); ?>
-
 <?= $this->render('show/components/properties.phtml'); ?>
-
 <?= $this->render('show/components/flags.phtml'); ?>
-
 <?= $this->render('show/components/customvars.phtml'); ?>
-
 <?= $this->render('show/components/servicegroups.phtml'); ?>
-
 <?= $this->render('show/components/contacts.phtml'); ?>
-
 <?= $this->render('show/components/eventHistory.phtml'); ?>
diff --git a/public/css/main.css b/public/css/main.css
index 306952e08..02fdfeed9 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -38,6 +38,15 @@ body { padding-top: 70px; }
     font-weight: normal;
 }
 
+.icinga-logo {
+    background: transparent url("../img/logo_icinga.png") center center no-repeat;
+    width: 94px;
+    height: 33px;
+    display: block;
+    text-indent: -999px;
+    margin: 8px 0 0 8px;
+}
+
 /* ==========================================================================
    Icinga Design
    ========================================================================== */