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

[Frescha]

The following commit has been merged in the debian/master branch:
commit 8c5e46e5ec7b319fefeffa221aef1ac34c7b38ea
Author: Frescha <frescha at unitedseed.de>
Date:   Sat Nov 19 16:38:26 2011 +0100

    Change possition of the gesture container

diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index a8dd964..88bf81c 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -281,6 +281,7 @@ div.content {
     margin: 15px 0 0;
     padding: 5px 8px;
     text-shadow: 0 1px #FFFFFF;
+	width: 81.333%;
 }
 
 #log_container  ol {
@@ -291,6 +292,7 @@ div.content {
     border-style: none solid solid;
     border-width: medium 1px 1px;
     list-style-type: none;
+    width: 81.333%;
 }
 
 #log_container  li {
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index 1bbad83..53930d1 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -19,17 +19,30 @@ Invalid element name
 
 %top_right_banner_state = datamgr.get_overall_state()
 
-%rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(),  js=['eltdetail/js/switchbuttons.js', 'eltdetail/js/graphs.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js'],  css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/gesture.css', 'eltdetail/css/switchbuttons.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
+%rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(),  js=['eltdetail/js/graphs.js', 'eltdetail/js/domtab.js','eltdetail/js/dollar.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js', 'eltdetail/js/hide.js', 'eltdetail/js/switchbuttons.js', 'eltdetail/js/multi.js'],  css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/switchbuttons.css', 'eltdetail/css/hide.css', 'eltdetail/css/gesture.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
+%# %rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(),  js=['eltdetail/js/switchbuttons.js', 'eltdetail/js/graphs.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js'],  css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/gesture.css', 'eltdetail/css/switchbuttons.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
 
-
-%#  "This is the background canvas for all gesture detection things " 
-<canvas id="canvas"></canvas>
 %# " We will save our element name so gesture functions will be able to call for the good elements."
 <script type="text/javascript">var elt_name = '{{elt.get_full_name()}}';</script>
 
 %#  "Left Container Start"
 <div id="left_container" class="grid_3">
+	<div class="opacity_hover">
+	%#  "This is the background canvas for all gesture detection things " 
+	%# " Don't ask me why, but the size must be included in the
+	%# canvas line here or we got problem!"
+	<center><canvas id="canvas" width="200" height="200"  style="border: 1px solid black;"></canvas></center>
 
+		<div class="gesture_button">
+          	<img title="By keeping a left click pressed and drawing a check, you will launch an acknowledgement." src="/static/eltdetail/images/gesture-check.png"/> Acknowledge
+		</div>
+		<div class="gesture_button">
+          	<img title="By keeping a left click pressed and drawing a check, you will launch an recheck." src="/static/eltdetail/images/gesture-circle.png"/> Recheck
+		</div>
+		<div class="gesture_button">
+          	<img title="By keeping a left click pressed and drawing a check, you will launch a try to fix command." src="/static/eltdetail/images/gesture-zigzag.png"/> Fix
+		</div>
+	</div>
 </div>
 %#  "Left Container End"
 
@@ -280,8 +293,8 @@ Invalid element name
 									  	<div class="clear"></div>
 									  
 									  	<div id="log_container">
-											
 											%if len(elt.comments) > 0:
+											<h2></h2>
 											<ol>
 												%for c in elt.comments:
 												<li>

-- 
UNNAMED PROJECT