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

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


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

    Add sidemenu and other stuffz

diff --git a/shinken/webui/htdocs/css/navigation.css b/shinken/webui/htdocs/css/navigation.css
index b0095d7..22960f0 100644
--- a/shinken/webui/htdocs/css/navigation.css
+++ b/shinken/webui/htdocs/css/navigation.css
@@ -1,3 +1,45 @@
+/* ----------------------------------------------------------------
+ *  Side navigation
+ * ----------------------------------------------------------------*/
+
+#nav_left {
+	border-top: 1px solid #E3E3E5;
+}
+#nav_left li{
+	margin-left: 0;
+/*	border-bottom: 1px solid #E3E3E5;*/
+/*	height: 45px;*/
+	text-align: center;
+	background-color:#FFFFFF
+}
+
+#nav_left ul{
+	padding: 0;
+	margin: 0;
+	list-style-type: none;
+/*	background-color:#E3E3E5*/
+}
+
+#nav_left a{
+	display: block;
+	text-decoration: none;
+	color: #787878;
+	font-size: 13px;
+	padding-top:10px;
+	padding-bottom:10px;
+/*	padding-top: 14px;*/
+	
+}
+
+#nav_left li:hover{
+	font-weight: bold;
+}
+
+#nav_left li.left_title{
+	background-color: #F1F1F1;
+}
+
+
 .tac_impacts {
 	background: #FFFFFF;
 	color: #777777;
diff --git a/shinken/webui/plugins/eltdetail/eltdetail.py b/shinken/webui/plugins/eltdetail/eltdetail.py
index fea1644..bb34308 100644
--- a/shinken/webui/plugins/eltdetail/eltdetail.py
+++ b/shinken/webui/plugins/eltdetail/eltdetail.py
@@ -4,6 +4,7 @@
 #    Gerhard Lausser, Gerhard.Lausser at consol.de
 #    Gregory Starck, g.starck at gmail.com
 #    Hartmut Goebel, h.goebel at goebel-consult.de
+#    Andreas Karfusehr, andreas at karfusehr.de
 #
 #This file is part of Shinken.
 #
diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index e0b7be2..35cbad5 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -400,4 +400,21 @@ label.iPhoneCheckLabelOff {
 	/* text-shadow:0px 0px 2px rgba(255,255,255,0.6)*/;
 	text-align:right;
 	right:0; padding: 4px 8px 0 0;
+}
+
+/*
+ * 
+ */
+
+#vertical_slide, #horizontal_slide {
+    background: #D0C8C8;
+    color: #8A7575;
+    padding: 10px;
+    border: 5px solid #F3F1F1;
+    font-weight: bold;
+}
+
+div.marginbottom {
+    /* Since the Fx.Slide element resets margins, we set a margin on the above element */
+    margin-bottom: 10px;
 }
\ No newline at end of file
diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/hide.css b/shinken/webui/plugins/eltdetail/htdocs/css/hide.css
index 17b2836..f2b9d39 100644
--- a/shinken/webui/plugins/eltdetail/htdocs/css/hide.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/hide.css
@@ -1,4 +1,4 @@
-.switches { opacity: 0.5;}
+.switches { opacity: 0.7;}
 
 .host-services { opacity: 0.3; max-height:300px; overflow:auto;}
 
diff --git a/shinken/webui/htdocs/js/tip.js b/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
similarity index 67%
copy from shinken/webui/htdocs/js/tip.js
copy to shinken/webui/plugins/eltdetail/htdocs/js/functions.js
index ca13677..9e32ce4 100644
--- a/shinken/webui/htdocs/js/tip.js
+++ b/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
@@ -21,10 +21,20 @@
  along with Shinken.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* Tips 3 */
-window.addEvent('load', function(){	
-	new FloatingTips('a' , { position: 'right'  });
-	new FloatingTips('td', { position: 'right'  });
-	new FloatingTips('img', { position: 'right'  });
-     
+/* Now a function for managingthe hovering of the problems. Will make
+   appears the actiosn buttons with a smoot way (opacity)*/
+  
+window.addEvent('domready', function() {
+    var status = {
+        'true': 'open',
+        'false': 'close'
+    };
+    // -- vertical
+    var myVerticalSlide = new Fx.Slide('vertical_slide');
+
+    $('v_toggle').addEvent('click', function(event){
+        event.stop();
+        myVerticalSlide.toggle();
     });
+
+});
diff --git a/shinken/webui/plugins/eltdetail/htdocs/js/hide.js b/shinken/webui/plugins/eltdetail/htdocs/js/hide.js
index 9db186d..c480a19 100644
--- a/shinken/webui/plugins/eltdetail/htdocs/js/hide.js
+++ b/shinken/webui/plugins/eltdetail/htdocs/js/hide.js
@@ -37,7 +37,7 @@ window.addEvent('domready', function(){
 
     // And on leaving, hide them with opacity -> 0
     switches.addEvent('mouseleave', function(){
-	    new Fx.Tween(switches, {property: 'opacity'}).start(0.5);
+	    new Fx.Tween(switches, {property: 'opacity'}).start(0.7);
     });
 
     // Now All Services
@@ -55,11 +55,6 @@ window.addEvent('domready', function(){
 
 });
 
-
-
-
-
-
 /* Important_impact_div */
 window.addEvent('domready', function(){
 	
@@ -80,9 +75,6 @@ window.addEvent('domready', function(){
 	}
     });
 
-
-
-
 /* When he user ask for show all impacts ro services, we display them */
 function show_hidden_impacts_or_services() {
 
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index aa67dd1..3c59c08 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -19,13 +19,29 @@ 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/graphs.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/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/functions.js','eltdetail/js/graphs.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/hide.css', 'eltdetail/css/gesture.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
 
 %# " 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 id="left_container" class="grid_2">
+	<div id="nav_left">
+		<ul>
+			<li><a href="#">Overview</a></li>
+			<li><a href="#">Overview</a></li>
+		</ul>
+	</div>
+	
+	<div class="marginbottom">
+	    <a id="v_toggle" href="#">toggle</a> |
+	    <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">
 	%#  "This is the background canvas for all gesture detection things " 
 	%# " Don't ask me why, but the size must be included in the
@@ -46,7 +62,7 @@ Invalid element name
 %#  "Left Container End"
 
 %#  "Content Container Start"
-<div id="content_container" class="grid_13">
+<div id="content_container" class="grid_14">
 	<h1 class="grid_16 state_{{elt.state.lower()}} icon_down"><img class="host_img_25" src="{{helper.get_icon_state(elt)}}" />{{elt.state}}: {{elt.get_full_name()}}</h1>
 	<div id="overview_container" class="grid_16">
 	    <dl class="grid_5">

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list