[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 016db4e7560fc8ef5ccdb6357745ef691650d94a
Naparuba
naparuba at gmail.com
Wed Nov 16 10:03:09 UTC 2011
The following commit has been merged in the master branch:
commit 31df777f6668e5691f50dce515be1df4a616391d
Author: Naparuba <naparuba at gmail.com>
Date: Mon Nov 14 10:37:13 2011 +0100
Clean : wall page.
diff --git a/shinken/webui/plugins/wall/htdocs/css/wall.css b/shinken/webui/plugins/wall/htdocs/css/wall.css
index 69663c8..b81f4b9 100644
--- a/shinken/webui/plugins/wall/htdocs/css/wall.css
+++ b/shinken/webui/plugins/wall/htdocs/css/wall.css
@@ -1,4 +1,13 @@
+.item-button{
+ margin-top : 10px;
+ margin-right : 10px;
+ float:right;
+}
+
+.item-text{
+ font-size : 150%;
+}
/* The same stars, but in the proble panel */
.criticity-inpb-icon-1 {
diff --git a/shinken/webui/plugins/wall/htdocs/js/snowstack.js b/shinken/webui/plugins/wall/htdocs/js/snowstack.js
index 025898e..afbfdf9 100644
--- a/shinken/webui/plugins/wall/htdocs/js/snowstack.js
+++ b/shinken/webui/plugins/wall/htdocs/js/snowstack.js
@@ -2,14 +2,11 @@
Snow Stack 3D CSS Photo Viewer
Copyright (C) 2009 Charles Ying. All Rights Reserved.
-
- Performance Notes (courtesy of Apple):
- on leopard, animating transforms with a transform list > 1 function, animation falls back to software
- shadows (and animated shadows) plus border animations can cause additional redraws
- offsetWidth / offsetHeight should be avoided.
+
+ License : Apache 2.0 or BSD
*/
-// (function () { // Module pattern
+
var global = this;
@@ -20,44 +17,44 @@ var CXSPACING;
var CYSPACING;
var snowstack_options = {
- rows: 3,
- refreshzoom: true,
- captions: false
+ rows: 2,
+ refreshzoom: true,
+ captions: false
};
var vfx = {
- elem: function (name, attrs, child)
- {
- var e = document.createElement(name);
- if (attrs)
+ elem: function (name, attrs, child)
+ {
+ var e = document.createElement(name);
+ if (attrs)
+ {
+ for (var key in attrs)
+ {
+ if (attrs.hasOwnProperty(key))
{
- for (var key in attrs)
- {
- if (attrs.hasOwnProperty(key))
- {
- e.setAttribute(key, attrs[key]);
- }
- }
- }
-
- if (child)
- {
- e.appendChild(child);
+ e.setAttribute(key, attrs[key]);
}
- return e;
- },
- byid: function (id)
- {
- return document.getElementById(id);
- },
- loadhandler: function (elem, callback)
- {
- elem.addEventListener("load", callback, false);
- },
- translate3d: function (x, y, z)
+ }
+ }
+
+ if (child)
{
- return "translate3d(" + x + "px, " + y + "px, " + z + "px)";
+ e.appendChild(child);
}
+ return e;
+ },
+ byid: function (id)
+ {
+ return document.getElementById(id);
+ },
+ loadhandler: function (elem, callback)
+ {
+ elem.addEventListener("load", callback, false);
+ },
+ translate3d: function (x, y, z)
+ {
+ return "translate3d(" + x + "px, " + y + "px, " + z + "px)";
+ }
};
var currentCellIndex = -1;
@@ -65,10 +62,9 @@ var cells = [];
var dolly;
var camera;
-var caption;
+/*var caption;*/
var cellstack;
-var reflectionstack;
var magnifyMode;
var newbieUser = true;
@@ -78,33 +74,33 @@ var currentTimer = null;
function cameraTransformForCell(n)
{
- var x = Math.floor(n / snowstack_options.rows);
- var y = n - x * snowstack_options.rows;
- var cx = (x + 0.5) * CXSPACING;
- var cy = (y + 0.5) * CYSPACING;
-
- if (magnifyMode)
- {
- return vfx.translate3d(-cx, -cy, 60);
- }
- else
- {
- return vfx.translate3d(-cx, -cy, 0);
- }
+ var x = Math.floor(n / snowstack_options.rows);
+ var y = n - x * snowstack_options.rows;
+ var cx = (x + 0.5) * CXSPACING;
+ var cy = (y + 0.5) * CYSPACING;
+
+ if (magnifyMode)
+ {
+ return vfx.translate3d(-cx, -cy, 60);
+ }
+ else
+ {
+ return vfx.translate3d(-cx, -cy, 0);
+ }
}
function layoutElement(elem, iwidth, iheight)
{
- var ratio = Math.min(CHEIGHT / iheight, CWIDTH / iwidth);
-
- iwidth *= ratio;
- iheight *= ratio;
+ var ratio = Math.min(CHEIGHT / iheight, CWIDTH / iwidth);
+
+ iwidth *= ratio;
+ iheight *= ratio;
- elem.style.width = Math.round(iwidth) + "px";
- elem.style.height = Math.round(iheight) + "px";
+ elem.style.width = Math.round(iwidth) + "px";
+ elem.style.height = Math.round(iheight) + "px";
- elem.style.left = Math.round((CWIDTH - iwidth) / 2) + "px";
- elem.style.top = Math.round((CHEIGHT - iheight) / 2) + "px";
+ elem.style.left = Math.round((CWIDTH - iwidth) / 2) + "px";
+ elem.style.top = Math.round((CHEIGHT - iheight) / 2) + "px";
}
//////////////////////
@@ -113,214 +109,210 @@ var currentVideo = null;
function play_video(newVideo)
{
- if (currentVideo && !currentVideo.isPaused())
- {
-// currentVideo.pause();
- currentVideo.setMuted(true);
- }
-
- currentVideo = newVideo;
-
- currentVideo.setMuted(false);
- currentVideo.play();
+ if (currentVideo && !currentVideo.isPaused())
+ {
+ // currentVideo.pause();
+ currentVideo.setMuted(true);
+ }
+
+ currentVideo = newVideo;
+
+ currentVideo.setMuted(false);
+ currentVideo.play();
}
//////////////////////
function html5video(elem, cell)
{
- var video = vfx.elem("video", { "class": "media" });
-
- var videolayout = function (e)
- {
- layoutElement(video, video.videoWidth, video.videoHeight);
- elem.parentNode.appendChild(video);
- elem.parentNode.removeChild(elem);
- return false;
- };
-
- var playstarter = function (e)
- {
- play_video(cell.video);
- return false;
- };
-
- video.addEventListener("loadedmetadata", videolayout, false);
- video.addEventListener("canplay", playstarter, false);
- video.src = cell.info.video;
- video.load();
-
- cell.video = {
- play: function () { video.play(); },
- pause: function () { video.pause(); },
- isPaused: function () { return video.paused; },
- setMuted: function (muted) { video.muted = muted; },
- isMuted: function () { return video.muted; }
- };
+ var video = vfx.elem("video", { "class": "media" });
+
+ var videolayout = function (e)
+ {
+ layoutElement(video, video.videoWidth, video.videoHeight);
+ elem.parentNode.appendChild(video);
+ elem.parentNode.removeChild(elem);
+ return false;
+ };
+
+ var playstarter = function (e)
+ {
+ play_video(cell.video);
+ return false;
+ };
+
+ video.addEventListener("loadedmetadata", videolayout, false);
+ video.addEventListener("canplay", playstarter, false);
+ video.src = cell.info.video;
+ video.load();
+
+ cell.video = {
+ play: function () { video.play(); },
+ pause: function () { video.pause(); },
+ isPaused: function () { return video.paused; },
+ setMuted: function (muted) { video.muted = muted; },
+ isMuted: function () { return video.muted; }
+ };
}
//////////////////////
function refreshImage(elem, cell)
{
- if (zoomTimer)
- {
- clearTimeout(zoomTimer);
- }
-
- if (cell.video)
- {
- if (cell.video.isPaused() || cell.video.isMuted())
- {
- play_video(cell.video);
- }
- return;
+ if (zoomTimer)
+ {
+ clearTimeout(zoomTimer);
+ }
+
+ if (cell.video)
+ {
+ if (cell.video.isPaused() || cell.video.isMuted())
+ {
+ play_video(cell.video);
}
-
- zoomTimer = setTimeout(function ()
- {
- if (cell.info.zoom && !cell.video)
- {
- elem.src = cell.info.zoom;
- }
-
- zoomTimer = null;
- }, 2000);
+ return;
+ }
+
+ zoomTimer = setTimeout(function ()
+ {
+ if (cell.info.zoom && !cell.video)
+ {
+ elem.src = cell.info.zoom;
+ }
+
+ zoomTimer = null;
+ }, 2000);
}
function setcellclass(c, name)
{
- c.div.className = name;
- if (c.reflection)
- {
- c.reflection.className = name;
- }
+ c.div.className = name;
}
function snowstack_togglemedia(index)
{
- var cell = cells[index];
-
- if (cell.video)
- {
- if (cell.video.isPaused())
- {
- play_video(cell.video);
- }
- else
- {
- cell.video.pause();
- }
- return;
- }
-
- if (cell.info.videoloader)
+ var cell = cells[index];
+
+ if (cell.video)
+ {
+ if (cell.video.isPaused())
{
- cell.info.videoloader(cell.divimage, cell);
+ play_video(cell.video);
}
- else if (cell.info.video)
+ else
{
- html5video(cell.divimage, cell);
+ cell.video.pause();
}
+ return;
+ }
+
+ if (cell.info.videoloader)
+ {
+ cell.info.videoloader(cell.divimage, cell);
+ }
+ else if (cell.info.video)
+ {
+ html5video(cell.divimage, cell);
+ }
}
function snowstack_update(newIndex, newmagnifymode)
{
- if (currentCellIndex == newIndex && magnifyMode == newmagnifymode)
- {
- return;
+ if (currentCellIndex == newIndex && magnifyMode == newmagnifymode)
+ {
+ return;
+ }
+
+ if (currentCellIndex != -1)
+ {
+ var oldCell = cells[currentCellIndex];
+ setcellclass(oldCell, "cell");
+ }
+
+ if (cells.length === 0)
+ {
+ return;
+ }
+
+ newIndex = Math.min(Math.max(newIndex, 0), cells.length - 1);
+ currentCellIndex = newIndex;
+
+ var cell = cells[newIndex];
+ magnifyMode = newmagnifymode;
+
+ if (magnifyMode)
+ {
+ // User figured out magnify mode, not a newbie.
+ if (newbieUser)
+ {
+ newbieUser = false;
}
- if (currentCellIndex != -1)
- {
- var oldCell = cells[currentCellIndex];
- setcellclass(oldCell, "cell");
- }
+ cell.div.className = "cell magnify";
- if (cells.length === 0)
+ if (snowstack_options.refreshzoom)
{
- return;
+ refreshImage(cell.divimage, cell);
}
-
- newIndex = Math.min(Math.max(newIndex, 0), cells.length - 1);
- currentCellIndex = newIndex;
-
- var cell = cells[newIndex];
- magnifyMode = newmagnifymode;
-
- if (magnifyMode)
- {
- // User figured out magnify mode, not a newbie.
- if (newbieUser)
- {
- newbieUser = false;
- }
-
- cell.div.className = "cell magnify";
-
- if (snowstack_options.refreshzoom)
- {
- refreshImage(cell.divimage, cell);
- }
- }
- else
- {
- setcellclass(cell, "cell selected");
- }
-
- // Show the photo caption
- if (snowstack_options.captions && !newbieUser)
- {
- caption.innerText = cell.info.title;
- }
-
- dolly.style.webkitTransform = cameraTransformForCell(newIndex);
-
- var currentMatrix = new WebKitCSSMatrix(document.defaultView.getComputedStyle(dolly, null).webkitTransform);
- var targetMatrix = new WebKitCSSMatrix(dolly.style.webkitTransform);
- var dx = currentMatrix.m41 - targetMatrix.m41;
- var angle = Math.min(Math.max(dx / (CXSPACING * 3), -1), 1) * 45;
-
- camera.style.webkitTransform = "rotateY(" + angle + "deg)";
- camera.style.webkitTransitionDuration = "330ms";
-
- if (currentTimer)
- {
- clearTimeout(currentTimer);
- }
-
- currentTimer = setTimeout(function ()
- {
- camera.style.webkitTransform = "rotateY(0)";
- camera.style.webkitTransitionDuration = "5s";
- }, 330);
+ }
+ else
+ {
+ setcellclass(cell, "cell selected");
+ }
+
+ // Show the photo caption
+/* if (snowstack_options.captions && !newbieUser)
+ {
+ caption.innerText = cell.info.title;
+ }*/
+
+ dolly.style.webkitTransform = cameraTransformForCell(newIndex);
+
+ var currentMatrix = new WebKitCSSMatrix(document.defaultView.getComputedStyle(dolly, null).webkitTransform);
+ var targetMatrix = new WebKitCSSMatrix(dolly.style.webkitTransform);
+ var dx = currentMatrix.m41 - targetMatrix.m41;
+ var angle = Math.min(Math.max(dx / (CXSPACING * 3), -1), 1) * 45;
+
+ camera.style.webkitTransform = "rotateY(" + angle + "deg)";
+ camera.style.webkitTransitionDuration = "330ms";
+
+ if (currentTimer)
+ {
+ clearTimeout(currentTimer);
+ }
+
+ currentTimer = setTimeout(function ()
+ {
+ camera.style.webkitTransform = "rotateY(0)";
+ camera.style.webkitTransitionDuration = "5s";
+ }, 330);
}
function snowstack_addimage(info)
{
- var cell = {};
- var n = cells.length;
- cells.push(cell);
-
- var x = Math.floor(n / snowstack_options.rows);
- var y = n - x * snowstack_options.rows;
-
- if (typeof info === "string")
- {
- var imageurl = info;
- info = { "thumb": imageurl, "zoom": imageurl, "title": "" };
- }
-
- cell.info = info;
-
- function make_celldiv()
- {
- var div = vfx.elem("div", { "class": "cell", "style": 'width: ' + CWIDTH + 'px; height: ' + CHEIGHT + 'px' });
- div.style.webkitTransform = vfx.translate3d(x * CXSPACING, y * CYSPACING, 0);
- return div;
- }
-
- cell.div = make_celldiv();
+ var cell = {};
+ var n = cells.length;
+ cells.push(cell);
+
+ var x = Math.floor(n / snowstack_options.rows);
+ var y = n - x * snowstack_options.rows;
+
+ if (typeof info === "string")
+ {
+ var imageurl = info;
+ info = { "thumb": imageurl, "zoom": imageurl, "title": "" };
+ }
+
+ cell.info = info;
+
+ function make_celldiv()
+ {
+ var div = vfx.elem("div", { "class": "cell", "style": 'width: ' + CWIDTH + 'px; height: ' + CHEIGHT + 'px' });
+ div.style.webkitTransform = vfx.translate3d(x * CXSPACING, y * CYSPACING, 0);
+ return div;
+ }
+
+ cell.div = make_celldiv();
//Jean
cell.divimage = vfx.elem("img", { "class": "media" });
@@ -330,317 +322,295 @@ function snowstack_addimage(info)
//local_div.appendChild(local_text);
local_div.innerHTML = info.html;//'<a href="moncul">My ass is cool</a> TOTO';
- vfx.loadhandler(cell.divimage, function ()
- {
- layoutElement(cell.divimage, cell.divimage.width, cell.divimage.height);
-
- if (cell.info.link)
- {
- //cell.div.appendChild(vfx.elem("a", { "class": "mover view", "href": cell.info.link, "target": "_blank" }, cell.divimage));
- cell.div.appendChild(vfx.elem("a", { "class": "mover view", "href": cell.info.link, "target": "_blank" }, local_div));
- }
- else
- {
- cell.div.appendChild(vfx.elem("div", { "class": "mover view" }, local_div));
- //cell.div.appendChild(vfx.elem("div", { "class": "mover view" }, cell.divimage));
- }
-
- cell.div.style.opacity = 1.0;
- });
-
- cell.div.style.opacity = 0;
- cellstack.appendChild(cell.div);
- cell.divimage.src = info.thumb;
+ vfx.loadhandler(cell.divimage, function ()
+ {
+ layoutElement(cell.divimage, cell.divimage.width, cell.divimage.height);
+
+ if (cell.info.link)
+ {
+ //cell.div.appendChild(vfx.elem("a", { "class": "mover view", "href": cell.info.link, "target": "_blank" }, cell.divimage));
+ cell.div.appendChild(vfx.elem("a", { "class": "mover view", "href": cell.info.link, "target": "_blank" }, local_div));
+ }
+ else
+ {
+ cell.div.appendChild(vfx.elem("div", { "class": "mover view" }, local_div));
+ //cell.div.appendChild(vfx.elem("div", { "class": "mover view" }, cell.divimage));
+ }
- if (y == (snowstack_options.rows - 1))
- {
- cell.reflection = make_celldiv();
+ cell.div.style.opacity = 1.0;
+ });
- cell.reflectionimage = vfx.elem("img", { "class": "media reflection" });
+ cell.div.style.opacity = 0;
+ cellstack.appendChild(cell.div);
+ cell.divimage.src = info.thumb;
- vfx.loadhandler(cell.reflectionimage, function ()
- {
- layoutElement(cell.reflectionimage, cell.reflectionimage.width, cell.reflectionimage.height);
- cell.reflection.appendChild(vfx.elem("div", { "class": "mover view" }, cell.reflectionimage));
- cell.reflection.style.opacity = 1.0;
- });
-
- cell.reflection.style.opacity = 0;
- reflectionstack.appendChild(cell.reflection);
- cell.reflectionimage.src = info.thumb;
- }
}
function snowstack_sort(sortkey)
{
- var sortfunc;
- if (sortkey == 'date')
- {
- sortfunc = function(a, b)
- {
- var adate = new Date('1 ' + a.info.date);
- var bdate = new Date('1 ' + b.info.date);
- return bdate - adate;
- };
- }
- else
- {
- sortfunc = function(a, b)
- {
- var aval = a.info[sortkey];
- var bval = b.info[sortkey];
- return aval > bval ? 1 : aval < bval ? -1 : 0;
- };
- }
+ var sortfunc;
+ if (sortkey == 'date')
+ {
+ sortfunc = function(a, b)
+ {
+ var adate = new Date('1 ' + a.info.date);
+ var bdate = new Date('1 ' + b.info.date);
+ return bdate - adate;
+ };
+ }
+ else
+ {
+ sortfunc = function(a, b)
+ {
+ var aval = a.info[sortkey];
+ var bval = b.info[sortkey];
+ return aval > bval ? 1 : aval < bval ? -1 : 0;
+ };
+ }
- cells.sort(sortfunc);
+ cells.sort(sortfunc);
- for (var i = 0; i < cells.length; ++i)
- {
- // down then across
- var x = Math.floor(i / snowstack_options.rows);
- var y = i - x * snowstack_options.rows;
- cells[i].div.style.webkitTransform = vfx.translate3d(x * CXSPACING, y * CYSPACING, 0);
- }
+ for (var i = 0; i < cells.length; ++i)
+ {
+ // down then across
+ var x = Math.floor(i / snowstack_options.rows);
+ var y = i - x * snowstack_options.rows;
+ cells[i].div.style.webkitTransform = vfx.translate3d(x * CXSPACING, y * CYSPACING, 0);
+ }
}
function snowstack_startsearch()
{
- camera.style.webkitTransform = 'translate3d(0, 0, -500px)';
- camera.style.webkitTransitionDuration = "1s";
+ camera.style.webkitTransform = 'translate3d(0, 0, -500px)';
+ camera.style.webkitTransitionDuration = "1s";
}
function snowstack_endsearch()
{
- camera.style.webkitTransform = '';
+ camera.style.webkitTransform = '';
}
function snowstack_search(searchkey, searchterm)
{
+ if (searchterm.length)
+ {
+ snowstack_startsearch();
+ }
+ else
+ {
+ snowstack_endsearch();
+ }
+
+ var s_re = new RegExp(searchterm, "i");
+
+ for (var i = 0; i < cells.length; ++i)
+ {
+ var match;
if (searchterm.length)
{
- snowstack_startsearch();
+ match = cells[i].info[searchkey].search(s_re) != -1;
}
else
{
- snowstack_endsearch();
- }
-
- var s_re = new RegExp(searchterm, "i");
-
- for (var i = 0; i < cells.length; ++i)
- {
- var match;
- if (searchterm.length)
- {
- match = cells[i].info[searchkey].search(s_re) != -1;
- }
- else
- {
- match = true;
- }
- cells[i].div.style.opacity = match ? 1 : 0.2;
+ match = true;
}
+ cells[i].div.style.opacity = match ? 1 : 0.2;
+ }
}
global.snowstack_init = function (imagefun, options)
{
- var loading = true;
-
- camera = vfx.byid("camera");
-
- reflectionstack = vfx.elem("div", { "class": "view" });
- var mirror = vfx.elem("div", { "class": "view" }, reflectionstack);
- cellstack = vfx.elem("div", { "class": "view" });
- dolly = vfx.elem("div", { "class": "dolly view" });
- dolly.appendChild(cellstack);
- dolly.appendChild(mirror);
-
- while (camera.hasChildNodes())
- {
- camera.removeChild(camera.firstChild);
+ var loading = true;
+
+ camera = vfx.byid("camera");
+
+ cellstack = vfx.elem("div", { "class": "view" });
+ dolly = vfx.elem("div", { "class": "dolly view" });
+ dolly.appendChild(cellstack);
+
+ while (camera.hasChildNodes())
+ {
+ camera.removeChild(camera.firstChild);
+ }
+
+ camera.appendChild(dolly);
+
+ if (options)
+ {
+ for (var key in options)
+ {
+ if (options.hasOwnProperty(key))
+ {
+ snowstack_options[key] = options[key];
+ }
}
+ }
+
+ if (typeof imagefun !== "function")
+ {
+ var images_array = imagefun;
+ imagefun = function (callback)
+ {
+ callback(images_array);
+ images_array = [];
+ };
+ }
- camera.appendChild(dolly);
-
- if (options)
- {
- for (var key in options)
- {
- if (options.hasOwnProperty(key))
- {
- snowstack_options[key] = options[key];
- }
- }
+ CHEIGHT = Math.round(window.innerHeight / (snowstack_options.rows + 2));
+ CWIDTH = Math.round(CHEIGHT * 300 / 180);
+ // HACK
+ CHEIGHT = 150;
+ CWIDTH = 250;
+ CXSPACING = CWIDTH + CGAP;
+ CYSPACING = CHEIGHT + CGAP;
+
+ imagefun(function (images)
+ {
+ images.forEach(snowstack_addimage);
+ snowstack_update(Math.floor(snowstack_options.rows / 2), false);
+ loading = false;
+ });
+
+ var keys = { left: false, right: false, up: false, down: false };
+
+ var keymap = { 37: "left", 38: "up", 39: "right", 40: "down" };
+
+ var keytimer = null;
+ var keydelay = 330;
+
+ function updatekeys()
+ {
+ var newCellIndex = currentCellIndex;
+ if (keys.left)
+ {
+ /* Left Arrow */
+ if (newCellIndex >= snowstack_options.rows)
+ {
+ newCellIndex -= snowstack_options.rows;
+ }
}
-
- if (typeof imagefun !== "function")
- {
- var images_array = imagefun;
- imagefun = function (callback)
- {
- callback(images_array);
- images_array = [];
- };
+ if (keys.right)
+ {
+ /* Right Arrow */
+ if ((newCellIndex + snowstack_options.rows) < cells.length)
+ {
+ newCellIndex += snowstack_options.rows;
+ }
+ else if (!loading)
+ {
+ /* We hit the right wall, add some more */
+ loading = true;
+ imagefun(function (images)
+ {
+ images.forEach(snowstack_addimage);
+ loading = false;
+ });
+ }
}
-
- CHEIGHT = Math.round(window.innerHeight / (snowstack_options.rows + 2));
- CWIDTH = Math.round(CHEIGHT * 300 / 180);
- // HACK
- CHEIGHT = 200;
- CWIDTH = 200;
- CXSPACING = CWIDTH + CGAP;
- CYSPACING = CHEIGHT + CGAP;
-
- mirror.style.webkitTransform = "scaleY(-1.0) " + vfx.translate3d(0, - CYSPACING * (snowstack_options.rows * 2) - 1, 0);
-
- imagefun(function (images)
- {
- images.forEach(snowstack_addimage);
- snowstack_update(Math.floor(snowstack_options.rows / 2), false);
- loading = false;
- });
-
- var keys = { left: false, right: false, up: false, down: false };
-
- var keymap = { 37: "left", 38: "up", 39: "right", 40: "down" };
-
- var keytimer = null;
- var keydelay = 330;
-
- function updatekeys()
+ if (keys.up)
{
- var newCellIndex = currentCellIndex;
- if (keys.left)
- {
- /* Left Arrow */
- if (newCellIndex >= snowstack_options.rows)
- {
- newCellIndex -= snowstack_options.rows;
- }
- }
- if (keys.right)
- {
- /* Right Arrow */
- if ((newCellIndex + snowstack_options.rows) < cells.length)
- {
- newCellIndex += snowstack_options.rows;
- }
- else if (!loading)
- {
- /* We hit the right wall, add some more */
- loading = true;
- imagefun(function (images)
- {
- images.forEach(snowstack_addimage);
- loading = false;
- });
- }
- }
- if (keys.up)
- {
- /* Up Arrow */
- newCellIndex -= 1;
- }
- if (keys.down)
- {
- /* Down Arrow */
- newCellIndex += 1;
- }
-
- snowstack_update(newCellIndex, magnifyMode);
+ /* Up Arrow */
+ newCellIndex -= 1;
}
-
- function repeattimer()
+ if (keys.down)
{
- updatekeys();
- keytimer = setTimeout(repeattimer, keydelay);
- keydelay = 60;
+ /* Down Arrow */
+ newCellIndex += 1;
}
- function keycheck()
- {
- if (keys.left || keys.right || keys.up || keys.down)
- {
- if (keytimer === null)
- {
- keydelay = 330;
- repeattimer();
- }
- }
- else
- {
- clearTimeout(keytimer);
- keytimer = null;
- }
+ snowstack_update(newCellIndex, magnifyMode);
+ }
+
+ function repeattimer()
+ {
+ updatekeys();
+ keytimer = setTimeout(repeattimer, keydelay);
+ keydelay = 60;
+ }
+
+ function keycheck()
+ {
+ if (keys.left || keys.right || keys.up || keys.down)
+ {
+ if (keytimer === null)
+ {
+ keydelay = 330;
+ repeattimer();
+ }
}
-
- /* Limited keyboard support for now */
- window.addEventListener('keydown', function (e)
+ else
{
- // So the key will now move sliders
- e.preventDefault();
-
- if (e.keyCode == 32)
- {
- /* Magnify toggle with spacebar */
- snowstack_update(currentCellIndex, !magnifyMode);
- }
- else if (e.keyCode == 13)
- {
- /* Toggle video playback */
- snowstack_togglemedia(currentCellIndex);
- }
- else
- {
- keys[keymap[e.keyCode]] = true;
- }
-
- keycheck();
- });
+ clearTimeout(keytimer);
+ keytimer = null;
+ }
+ }
- window.addEventListener('keyup', function (e)
- {
- // So the key will now move sliders
- e.preventDefault();
-
- keys[keymap[e.keyCode]] = false;
- keycheck();
- });
-
- var startX = 0;
- var lastX = 0;
+ /* Limited keyboard support for now */
+ window.addEventListener('keydown', function (e)
+ {
+ // So the key will now move sliders
+ e.preventDefault();
- var target = document.getElementById("camera");
-
- target.addEventListener('touchstart', function (e)
- {
- startX = event.touches[0].pageX;
- lastX = startX;
- e.preventDefault();
- return false;
- }, false);
-
- target.addEventListener('touchmove', function (e)
- {
- lastX = event.touches[0].pageX;
- var dx = lastX - startX;
- keys.left = (dx > 20);
- keys.right = (dx < 20);
- updatekeys();
- startX = lastX;
- e.preventDefault();
- return false;
- }, true);
-
- target.addEventListener('touchend', function (e)
- {
- keys.left = false;
- keys.right = false;
- e.preventDefault();
- return false;
- }, true);
-
+ if (e.keyCode == 32)
+ {
+ /* Magnify toggle with spacebar */
+ snowstack_update(currentCellIndex, !magnifyMode);
+ }
+ else if (e.keyCode == 13)
+ {
+ /* Toggle video playback */
+ snowstack_togglemedia(currentCellIndex);
+ }
+ else
+ {
+ keys[keymap[e.keyCode]] = true;
+ }
+
+ keycheck();
+ });
+
+ window.addEventListener('keyup', function (e)
+ {
+ // So the key will now move sliders
+ e.preventDefault();
+
+ keys[keymap[e.keyCode]] = false;
+ keycheck();
+ });
+
+ var startX = 0;
+ var lastX = 0;
+
+ var target = document.getElementById("camera");
+
+ target.addEventListener('touchstart', function (e)
+ {
+ startX = event.touches[0].pageX;
+ lastX = startX;
+ e.preventDefault();
+ return false;
+ }, false);
+
+ target.addEventListener('touchmove', function (e)
+ {
+ lastX = event.touches[0].pageX;
+ var dx = lastX - startX;
+ keys.left = (dx > 20);
+ keys.right = (dx < 20);
+ updatekeys();
+ startX = lastX;
+ e.preventDefault();
+ return false;
+ }, true);
+
+ target.addEventListener('touchend', function (e)
+ {
+ keys.left = false;
+ keys.right = false;
+ e.preventDefault();
+ return false;
+ }, true);
+
};
-//})(); // end module pattern
+
diff --git a/shinken/webui/plugins/wall/views/wall.tpl b/shinken/webui/plugins/wall/views/wall.tpl
index 58fa6de..0fa3dc0 100644
--- a/shinken/webui/plugins/wall/views/wall.tpl
+++ b/shinken/webui/plugins/wall/views/wall.tpl
@@ -24,23 +24,6 @@ body
padding: 0;
}
-#caption
-{
- position: absolute;
- bottom: 0; right: 0; left: 0;
- font-size: 15pt;
- text-overflow: ellipsis; overflow: hidden; white-space: nowrap;
- padding: 10pt 10pt 10pt 20pt;
- -webkit-transform: translate3d(0, 0, 2000px);
- background-color: rgba(0, 0, 0, 0.5);
- -webkit-transition-property: opacity;
- -webkit-transition-duration: 550ms;
-}
-
-#caption.hide
-{
- opacity: 0;
-}
</style>
@@ -54,9 +37,9 @@ body
</div>
</div>
-<div id="caption" class="caption">
- snow stack / webkit css visual effects demo — arrow keys to move, space toggles magnify
-</div>
+%#<div id="caption" class="caption">
+%# snow stack / webkit css visual effects demo — arrow keys to move, space toggles magnify
+%#</div>
%#<script type="text/javascript" src="/static/wall/js/snowstack.js"></script>
%#<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
diff --git a/shinken/webui/plugins/wall/wall.py b/shinken/webui/plugins/wall/wall.py
index 865a6e6..c81cfcf 100644
--- a/shinken/webui/plugins/wall/wall.py
+++ b/shinken/webui/plugins/wall/wall.py
@@ -28,10 +28,11 @@ def get_div(elt):
s = """
%s
<img style="width: 64px;height: 64px;" src="%s">
- <span class="state_%s">%s : %s</span>
- <div style="float:right;">
+ <div class="item-button">
<a href="%s">%s</a>
- """ % (stars, icon, elt.state.lower(), elt.state, elt.get_full_name(), lnk, button)
+ </div>
+ <span class="state_%s item-text">%s : %s</span>
+ """ % (stars, icon, lnk, button, elt.state.lower(), elt.state, elt.get_full_name())
s = s.encode('utf8', 'ignore')
return s
--
UNNAMED PROJECT
More information about the Pkg-nagios-changes
mailing list