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

Frescha frescha at unitedseed.de
Tue Feb 28 22:11:05 UTC 2012


The following commit has been merged in the debian/master branch:
commit 3643bac745ed267cb426ff6e5a0c359dcd2e912f
Author: Frescha <frescha at unitedseed.de>
Date:   Sat Dec 31 14:58:16 2011 +0100

    enh: sidebar @ eltdetail mockup

diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index 35cbad5..2f1d89b 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -406,7 +406,7 @@ label.iPhoneCheckLabelOff {
  * 
  */
 
-#vertical_slide, #horizontal_slide {
+#vertical_slide {
     background: #D0C8C8;
     color: #8A7575;
     padding: 10px;
diff --git a/shinken/webui/plugins/eltdetail/htdocs/js/functions.js b/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
index 9e32ce4..5637702 100644
--- a/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
+++ b/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
@@ -30,7 +30,7 @@ window.addEvent('domready', function() {
         'false': 'close'
     };
     // -- vertical
-    var myVerticalSlide = new Fx.Slide('vertical_slide');
+    var myVerticalSlide = new Fx.Slide('vertical_slide').hide();
 
     $('v_toggle').addEvent('click', function(event){
         event.stop();
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index 3c59c08..6beeaab 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -38,26 +38,22 @@ Invalid element name
 	    <strong>status</strong>: <span id="vertical_status">open</span>
 	</div>
 	
-	<div id="vertical_slide">
-	    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-	</div>
-	
-	<div class="opacity_hover">
+	<div id="vertical_slide" 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>
-
+		<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
+	       	<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
+	       	<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
+	       	<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>	    
+	
 </div>
 %#  "Left Container End"
 

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list