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

Wed Nov 16 10:03:18 UTC 2011

The following commit has been merged in the master branch:
commit 2eae55c6788b8b75f9e89fba656e40b831d09989
Author: Naparuba <naparuba at gmail.com>
Date:   Mon Nov 14 16:18:37 2011 +0100

    Clean : wall code and style. Now w can work on 'last changes'

diff --git a/shinken/webui/plugins/wall/htdocs/css/snowstack.css b/shinken/webui/plugins/wall/htdocs/css/snowstack.css
index ca2c964..8b23bac 100644
--- a/shinken/webui/plugins/wall/htdocs/css/snowstack.css
+++ b/shinken/webui/plugins/wall/htdocs/css/snowstack.css
@@ -15,17 +15,17 @@
 div.page
 {
     -webkit-perspective: 600;
-	width: 100%;
+    width: 100%;
     height: 100%;
-	margin: 0 auto;
-	text-align: center;
+/*    margin: 0 auto;*/
+    text-align: center;
 
 }
 
 div.origin
 {
-	left: 50%;
-	top: 50%;
+	left: 25%;
+	top: 40%;
 }
 
 div.camera
diff --git a/shinken/webui/plugins/wall/views/wall.tpl b/shinken/webui/plugins/wall/views/wall.tpl
index 0fa3dc0..4aaef4e 100644
--- a/shinken/webui/plugins/wall/views/wall.tpl
+++ b/shinken/webui/plugins/wall/views/wall.tpl
@@ -1,35 +1,7 @@
-%#<!DOCTYPE html>
-%#<html>
-%#<head>
 
-<!--
-    Copyright (C) 2009 Charles Ying. All Rights Reserved.
-    This source code is available under Apache License 2.0.
--->
 %rebase layout css=['wall/css/snowstack.css', 'wall/css/wall.css'], title='Wall view', js=['wall/js/snowstack.js', 'wall/js/wall.js'], refresh=True, user=user, print_menu=False, print_header=True
 
 
-%#<title>Snow Stack - WebKit 3D CSS Visual Effects</title>
-%#<meta name="Description" content="Snow Stack is a demo of WebKit CSS 3D visual effects with latest WebKit nightly on Mac OS X Snow Leopard" />
-
-%#<link rel="stylesheet" type="text/css" href="/static/wall/css/snowstack.css">
-%#<link rel="stylesheet" type="text/css" href="/static/wall/css/wall.css">
-
-<style type="text/css">
-
-body
-{
-	font-family: 'Helvetica Neue Light', 'HelveticaNeue-Light', sans-serif;
-	margin: 0;
-	padding: 0;
-}
-
-
-</style>
-
-%#</head>
-
-%#<body>
 
 <div class="page view">
     <div class="origin view">
@@ -37,72 +9,9 @@ body
     </div>
 </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>
-%#<script type="text/javascript" src="/static/js/mootools.js"></script>
-%#<script type="text/javascript" src="/static/js/mootools-more.js"></script>
 
 <script type="text/javascript">
 
-var page = 1;
-
-function flickr(callback)
-{
-    var url = "http://api.flickr.com/services/rest/?method=flickr.interestingness.getList&api_key=60746a125b4a901f2dbb6fc902d9a716&per_page=21&extras=url_o,url_m,url_s,owner_name&page=" + page + "&format=json&jsoncallback=?";
-    
-	jQuery.getJSON(url, function(data) 
-	{
-        var images = jQuery.map(data.photos.photo, function (item)
-        {
-            /* return item.url_s; */
-            return {
-                title: item.ownername + " / " + item.title,
-            	thumb: item.url_s,
-            	zoom: 'http://farm' + item.farm + '.static.flickr.com/' + item.server + '/' + item.id + '_' + item.secret + '.jpg',
-            	link: 'http://www.flickr.com/photos/' + item.owner + '/' + item.id
-            };
-        });
-
-        callback(images);
-        page = page + 1;
-    });
-}
-
-function init_pageimages(options)
-{
-	var imgs = document.querySelectorAll("a>img");
-	var images = [];
-
-	for (var i = 0; i < imgs.length; i++)
-	{
-		var img = imgs[i];
-		var title = img.alt || img.title || img.parentNode.title;
-		var thumb = img.src;
-		var link = img.parentNode.href;
-		var zoom = img.src;
-		
-		images.push({ title: title, thumb: thumb, link: link, zoom: zoom });
-	}
-
-	snowstack_init(images, options);
-}
-
-
-/*var images = [
-   { "title": "My Image 1", "thumb": "/static/images/state_down.png", "zoom": "/static/images/state_down.png", "link": "http://www.satine.org/"},
-	{ "title": "My Image 2", "thumb": "/static/images/state_up.png", "zoom": "/static/images/state_up.png", "link": "http://www.satine.org/" },
-   { "title": "My Image 3", "thumb": "/static/images/state_flapping.png", "zoom": "/static/images/state_flapping.png"}
-];*/
-
 var images = {{!impacts}};
 
 </script>
-
-
-%#</body>
-
-%#</html>

-- 
UNNAMED PROJECT

