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

[Naparuba]

The following commit has been merged in the master branch:
commit 4b16ceeca4fcbc93604d323bc60435b15ecc344e
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Nov 15 14:00:06 2011 +0100

    Add : autoslide to the wall view.

diff --git a/shinken/modules/webui_broker/webui_broker.py b/shinken/modules/webui_broker/webui_broker.py
index f8bf416..513e14c 100644
--- a/shinken/modules/webui_broker/webui_broker.py
+++ b/shinken/modules/webui_broker/webui_broker.py
@@ -413,7 +413,7 @@ class Webui_broker(BaseModule, Daemon):
 
 
     def check_auth(self, user, password):
-        print "Checking auth of", user, password
+        print "Checking auth of", user #, password
         c = self.datamgr.get_contact(user)
         print "Got", c
         if not c:
diff --git a/shinken/webui/plugins/wall/htdocs/js/snowstack.js b/shinken/webui/plugins/wall/htdocs/js/snowstack.js
index 177c544..2b66df1 100644
--- a/shinken/webui/plugins/wall/htdocs/js/snowstack.js
+++ b/shinken/webui/plugins/wall/htdocs/js/snowstack.js
@@ -12,14 +12,15 @@ var global = this;
 
 var CWIDTH;
 var CHEIGHT;
-var CGAP = 10;
+var CGAP = 20;
 var CXSPACING;
 var CYSPACING;
 
 var snowstack_options = {
     rows: 2,
     refreshzoom: true,
-    captions: false
+    captions: false,
+    autoslide: false
 };
 
 var vfx = {
@@ -356,6 +357,24 @@ global.snowstack_init = function (imagefun, options)
     var keytimer = null;
     var keydelay = 330;
 
+    function go_right(){
+	var newCellIndex = currentCellIndex;
+	/* Right Arrow */
+	if ((newCellIndex + snowstack_options.rows) < cells.length)
+	{
+	    newCellIndex += snowstack_options.rows;
+	}else{
+	    newCellIndex = 1;
+	}
+	snowstack_update(newCellIndex, magnifyMode);
+    }
+
+    //Each 10s, go right
+    if(snowstack_options.autoslide){
+	setInterval( go_right, 10000 );
+    }
+
+
     function updatekeys()
     {
 	var newCellIndex = currentCellIndex;
diff --git a/shinken/webui/plugins/wall/htdocs/js/wall.js b/shinken/webui/plugins/wall/htdocs/js/wall.js
index 00c14d5..9754b8b 100644
--- a/shinken/webui/plugins/wall/htdocs/js/wall.js
+++ b/shinken/webui/plugins/wall/htdocs/js/wall.js
@@ -24,5 +24,6 @@
 
 
 window.addEvent('domready', function(){
-	snowstack_init(images);
+    options = {'autoslide' : true};
+    snowstack_init(images, options);
 });
diff --git a/shinken/webui/plugins/wall/wall.py b/shinken/webui/plugins/wall/wall.py
index 23fb63d..ad509e0 100644
--- a/shinken/webui/plugins/wall/wall.py
+++ b/shinken/webui/plugins/wall/wall.py
@@ -56,9 +56,13 @@ def get_page():
         redirect("/user/login")
     
 
-    all_imp_impacts = app.datamgr.get_services()#important_elements()
+    all_imp_impacts = app.datamgr.get_important_elements()
+    all_imp_impacts.sort(hst_srv_sort)
     #all_imp_impacts.sort(hst_srv_sort)
 
+    #all_imp_impacts = app.datamgr.get_services()#important_elements()
+
+
     impacts = []
     for imp in all_imp_impacts:
         safe_print("FIND A BAD SERVICE IN IMPACTS", imp.get_dbg_name())

-- 
UNNAMED PROJECT