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

[Naparuba]

The following commit has been merged in the master branch:
commit 88013646474138ebc65ec14b6d90c05e0be73953
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Nov 15 13:20:53 2011 +0100

    Fix : some div bugs in the wall page.

diff --git a/shinken/webui/plugins/eltdetail/htdocs/js/gesture.js b/shinken/webui/plugins/eltdetail/htdocs/js/gesture.js
index 8c2ed45..c08d18e 100644
--- a/shinken/webui/plugins/eltdetail/htdocs/js/gesture.js
+++ b/shinken/webui/plugins/eltdetail/htdocs/js/gesture.js
@@ -4,7 +4,7 @@ var ctx;
 var _r = new DollarRecognizer();
 var _points = [];
 var isMouseDown = false; // mouse only bool
-var threshold = 10; // number of pixels required to be moved for a movement to count
+var threshold = 3; // number of pixels required to be moved for a movement to count
 
 
 window.addEvent('domready',function(){
diff --git a/shinken/webui/plugins/wall/htdocs/css/snowstack.css b/shinken/webui/plugins/wall/htdocs/css/snowstack.css
index 8b23bac..5de7388 100644
--- a/shinken/webui/plugins/wall/htdocs/css/snowstack.css
+++ b/shinken/webui/plugins/wall/htdocs/css/snowstack.css
@@ -61,6 +61,8 @@ div.cell
 div.cell .media
 {
 	display: block;
+	width: 250px; 
+	height: 150px;
 /*	position: absolute;*/
 
 	-webkit-transition-property: -webkit-transform;
diff --git a/shinken/webui/plugins/wall/htdocs/css/wall.css b/shinken/webui/plugins/wall/htdocs/css/wall.css
index b81f4b9..800f87d 100644
--- a/shinken/webui/plugins/wall/htdocs/css/wall.css
+++ b/shinken/webui/plugins/wall/htdocs/css/wall.css
@@ -1,12 +1,40 @@
 .item-button{
-    margin-top : 10px;
-    margin-right : 10px;
+    top: 15px;
+    left: 220px;
     float:right;
+    position: absolute;
 }
 
 
 .item-text{
     font-size : 150%;
+    top: 50px;
+    left: 10px;
+    position: relative;
+}
+
+
+/* We override some properties of the classic pulse
+ for huge size of wall icons */
+.wall-pulse {
+    width: 64px;
+    height: 64px;
+    top: 10px;
+    left: 27px;
+}
+
+.item-icon{
+    width: 64px;
+    height: 64px;
+    top: 10px;
+    left: 30px;
+    position: relative;
+    float : left;
+}
+
+.wall-icon{
+    width: 64px;
+    height: 64px;
 }
 
 /* The same stars, but in the proble panel */
@@ -18,6 +46,7 @@
     z-index: 1;
     outline: none;
     left: 20px;
+    top : 10px;
 }
 
 
@@ -30,6 +59,7 @@
     z-index: 1;
     outline: none;
     left: 20px;
+    top : 10px;
 }
 
 
@@ -42,4 +72,5 @@
     z-index: 1;
     outline: none;
     left: 20px;
+    top : 10px;
 }
diff --git a/shinken/webui/plugins/wall/wall.py b/shinken/webui/plugins/wall/wall.py
index c81cfcf..23fb63d 100644
--- a/shinken/webui/plugins/wall/wall.py
+++ b/shinken/webui/plugins/wall/wall.py
@@ -25,14 +25,23 @@ def get_div(elt):
               </div>''' % (i-1)
     lnk = app.helper.get_link_dest(elt)
     button = app.helper.get_button('', img='/static/images/search.png')
+    pulse = ''
+    if elt.is_problem or (elt.state_id != 0 and elt.business_impact > 2):
+        pulse = '<span class="wall-pulse pulse" title=""></span>'
     s = """
         %s
-	<img style="width: 64px;height: 64px;" src="%s">
+          %s
+        <div class="item-icon">
+	  <img class="wall-icon" src="%s"></img>
+        </div>
+        <div class="item-text">
+          <span class="state_%s">%s <br/> %s</span>
+        </div>
 	<div class="item-button">
 	<a href="%s">%s</a>
         </div>
-	<span class="state_%s item-text">%s : %s</span>
-        """ % (stars, icon, lnk, button, elt.state.lower(), elt.state, elt.get_full_name())
+
+        """ % (stars, pulse, icon,  elt.state.lower(), elt.state, elt.get_full_name(), lnk, button)#stars, button)
     s = s.encode('utf8', 'ignore')
     return s
 

-- 
UNNAMED PROJECT