[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 3dd687c289041c5d8a28725a7f2fb83b4dde7191
Author: Naparuba <naparuba at gmail.com>
Date:   Fri Nov 18 13:49:05 2011 +0100

    Fix : buttons in the /flow page.

diff --git a/shinken/webui/plugins/flow/flow.py b/shinken/webui/plugins/flow/flow.py
index ac4decc..baf088a 100644
--- a/shinken/webui/plugins/flow/flow.py
+++ b/shinken/webui/plugins/flow/flow.py
@@ -30,6 +30,7 @@ def get_div(elt):
     lnk = app.helper.get_link_dest(elt)
     button = app.helper.get_button('', img='/static/images/search.png')
     button_recheck = '''<a href="#" onclick="recheck_now('%s')">%s</a>''' % (elt.get_full_name(), app.helper.get_button('Recheck', img='/static/images/delay.gif'))
+    button_ack = '''<a href="#" onclick="acknowledge('%s')">%s</a>''' % (elt.get_full_name(), app.helper.get_button('Ack', img='/static/images/wrench.png'))
     pulse = ''
     if elt.is_problem or (elt.state_id != 0 and elt.business_impact > 2):
         pulse = '<span class="wall-pulse pulse" title=""></span>'
@@ -51,7 +52,7 @@ def get_div(elt):
         <div class="ack-button">
            %s
         </div>
-        """ % (stars, pulse, icon,  elt.state.lower(), elt.state, elt.get_full_name(), lnk, button, button_recheck, button_recheck)
+        """ % (stars, pulse, icon,  elt.state.lower(), elt.state, elt.get_full_name(), lnk, button, button_recheck, button_ack)
     s = s.encode('utf8', 'ignore')
     return s
 
diff --git a/shinken/webui/plugins/flow/htdocs/css/wall.css b/shinken/webui/plugins/flow/htdocs/css/wall.css
index 23f8f76..d873132 100644
--- a/shinken/webui/plugins/flow/htdocs/css/wall.css
+++ b/shinken/webui/plugins/flow/htdocs/css/wall.css
@@ -1,20 +1,20 @@
 .item-button{
-    top: 150px;
+    top: 170px;
     left: 0px;
     float:right;
     position: absolute;
 }
 
 .recheck-button{
-    top: 150px;
+    top: 170px;
     left: 50px;
     float:right;
     position: absolute;
 }
 
 .ack-button{
-    top: 150px;
-    left: 100px;
+    top: 170px;
+    left: 150px;
     float:right;
     position: absolute;
 }
@@ -22,9 +22,11 @@
 
 .item-text{
     font-size : 150%;
-    top: 100px;
+    padding-top: 30px;
+    top: 150px;
     left: 10px;
-    position: relative;
+    /*position: relative;*/
+    float : left;
 }
 
 

-- 
UNNAMED PROJECT