[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 016db4e7560fc8ef5ccdb6357745ef691650d94a

[Frescha]

The following commit has been merged in the master branch:
commit 1435356c13c522b0b228d18ad35ca2aa8a3a9359
Author: Frescha <frescha at unitedseed.de>
Date:   Tue Nov 15 21:00:35 2011 +0100

    Add sateicon to detail mockup

diff --git a/shinken/webui/htdocs/css/layout.css b/shinken/webui/htdocs/css/layout.css
index e653738..2709739 100644
--- a/shinken/webui/htdocs/css/layout.css
+++ b/shinken/webui/htdocs/css/layout.css
@@ -310,10 +310,11 @@ td.actions a {
  *  Classes: Images
  * ----------------------------------------------------------------*/
 
-.host_img_80 {
-	height: 80px;
-	width: 80px;
-	float: right;
+.host_img_25 {
+	height: 25px;
+	width: 25px;
+	margin-right: 2px;
+    vertical-align: -3px;
 }
  
 .img_stars {
@@ -732,9 +733,6 @@ overall status */
     border: 0;
 }
 
-
-
-
 /***                 OPACITY        ******/
 #opacity_hover { opacity : 0.5;}
 
@@ -1106,5 +1104,4 @@ li.critical{
  background-repeat: no-repeat;
  background-position: 0 0.16em;
  padding-left: 20px;
-}
-
+}
\ No newline at end of file
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index cf2cac7..51bc192 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -10,7 +10,6 @@
 
 Invalid element name
 
-
 %else:
 
 %helper = app.helper
@@ -20,9 +19,7 @@ Invalid element name
 
 %top_right_banner_state = datamgr.get_overall_state()
 
-
-%rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(),  js=['eltdetail/js/graphs.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js'],  css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/gesture.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
-
+%rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(),  js=['eltdetail/js/switchbuttons.js', 'eltdetail/js/graphs.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js'],  css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/gesture.css', 'eltdetail/css/switchbuttons.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
 
 %#  "This is the background canvas for all gesture detection things " 
 <canvas id="canvas"></canvas>
@@ -38,7 +35,7 @@ Invalid element name
 
 %#  "Content Container Start"
 <div id="content_container" class="grid_13">
-	<h1 class="grid_16 state_{{elt.state.lower()}} icon_down">{{elt.state}}: {{elt.get_full_name()}}</h1>
+	<h1 class="grid_16 state_{{elt.state.lower()}} icon_down"><img class="host_img_25" src="{{helper.get_icon_state(elt)}}" />{{elt.state}}: {{elt.get_full_name()}}</h1>
 	<div id="overview_container" class="grid_16">
 		<dl class="grid_4">
 		%#Alias, Parents and Hostgroups are for host only

-- 
UNNAMED PROJECT