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

[Frescha]

The following commit has been merged in the debian/master branch:
commit 5bd1a022cba45f98d1566fdd43cc1289199830e2
Author: Frescha <frescha at unitedseed.de>
Date:   Wed Dec 21 19:57:35 2011 +0100

    Add switch menu to eltdetail mockup

diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index 3c5a2e2..4bd03b1 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -72,6 +72,7 @@
 #elt_summary table {
 	width: 100%;
 }
+
 #elt_summary table, #elt_summary tr, #elt_summary th, #elt_summary td, #elt_summary tbody{
 	background: none !important;
 	border: none;	
@@ -305,4 +306,12 @@ div.content {
 
 .row_alt {
 	background: #FFFFFF !important;
+}
+
+.switches ul li {
+	display: inline;
+}
+
+.switches ul li div{
+	float: left;
 }
\ No newline at end of file
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index e2e9ebe..a2bbc40 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -101,7 +101,19 @@ Invalid element name
 		</div>				
 	</div>
 	<!-- Switch Start-->
-
+	<div class="switches grid_16">
+		<ul>
+		    %if elt_type=='host':
+		       %title = 'This will also enable/disable this host services'
+		    %else:
+		       %title = ''
+		    %end
+			<li title="{{title}}" onclick="toggle_checks('{{elt.get_full_name()}}' , '{{elt.active_checks_enabled|elt.passive_checks_enabled}}')">Active/passive Checks {{!helper.get_input_bool(elt.active_checks_enabled|elt.passive_checks_enabled)}}
+			<li onclick="toggle_notifications('{{elt.get_full_name()}}' , '{{elt.notifications_enabled}}')">Notifications {{!helper.get_input_bool(elt.notifications_enabled)}} </li>
+			<li onclick="toggle_event_handlers('{{elt.get_full_name()}}' , '{{elt.event_handler_enabled}}')" >Event Handler {{!helper.get_input_bool(elt.event_handler_enabled)}} </li>
+			<li onclick="toggle_flap_detection('{{elt.get_full_name()}}' , '{{elt.flap_detection_enabled}}')" >Flap Detection {{!helper.get_input_bool(elt.flap_detection_enabled)}} </li>	
+		</ul>	
+	</div>
     <!-- Switch End-->
       
 		<div id="elt_container">
@@ -132,7 +144,7 @@ Invalid element name
 						   <div id="elt_summary">
 								<div id="item_information">
 									<h2>Host/Service Information</h2>
-									<dl class="grid_10">
+									<dl>
 										<dt scope="row" class="column1">{{elt_type.capitalize()}} Status</dt>
 										<dd><span class="state_{{elt.state.lower()}}">{{elt.state}}</span> (since {{helper.print_duration(elt.last_state_change, just_duration=True, x_elts=2)}}) </dd>
 
@@ -154,7 +166,7 @@ Invalid element name
 										<dt scope="row" class="column1">Last State Change</dt>
 										<dd>{{time.asctime(time.localtime(elt.last_state_change))}}</dd>
 									</dl>
-									<div class="grid_6">
+									<div>
 										<a href="#" onclick="try_to_fix('{{elt.get_full_name()}}')">{{!helper.get_button('Try to fix it!', img='/static/images/enabled.png')}}</a>
 										<a href="#" onclick="acknowledge('{{elt.get_full_name()}}')">{{!helper.get_button('Acknowledge it', img='/static/images/wrench.png')}}</a>
 										<a href="#" onclick="recheck_now('{{elt.get_full_name()}}')">{{!helper.get_button('Recheck now', img='/static/images/delay.gif')}}</a>
@@ -164,12 +176,10 @@ Invalid element name
 										{{!helper.get_button('Schedule Downtime', img='/static/images/downtime.png')}}
 									</div>
 								</div>
-								<br>
 								<hr />
 								<div id="item_information">
 								<h2>Additonal Informations</h2>
 									<dl>
-
 										<dt scope="row" class="column1">Last Notification</dt>
 										<dd>{{helper.print_date(elt.last_notification)}} (notification {{elt.current_notification_number}})</dd>
 
@@ -187,11 +197,9 @@ Invalid element name
 		
 						    </div>
 						    <div class="content">
-	   
 								%#    Now print the dependencies if we got somes
 								%if len(elt.parent_dependencies) > 0:
 									<a id="togglelink-{{elt.get_dbg_name()}}" href="javascript:toggleBusinessElt('{{elt.get_dbg_name()}}')"> {{!helper.get_button('Show dependency tree', img='/static/images/expand.png')}}</a>
-							      
 							      		{{!helper.print_business_rules(datamgr.get_business_parents(elt))}}
 								%end
 							

-- 
UNNAMED PROJECT