Merge branch '2.6.x' of https://github.com/centreon/centreon into 2.6.x

centreon · Oct 27, 2015 · 04d6db4 · 04d6db4
2 parents 8864b1c + 62ffde2
commit 04d6db4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 33 deletions.
diff --git a/www/include/reporting/dashboard/template/viewHostGroupLog.ihtml b/www/include/reporting/dashboard/template/viewHostGroupLog.ihtml
@@ -176,11 +176,11 @@
             data: {
                 // iris data from R
                 columns: [
-                    ['Up', {/literal}{$hostgroup_up}{literal}],
-                    ['Down', {/literal}{$hostgroup_down}{literal}],
-                    ['Unreachable', {/literal}{$hostgroup_unreachable}{literal}],
-                    ['Downtime', {/literal}{$hostgroup_maintenance}{literal}],
-                    ['Undetermined', {/literal}{$hostgroup_undetermined}{literal}],
+                    ['Up', {/literal}{$hostgroup_up|number_format:2:".":""}{literal}],
+                    ['Down', {/literal}{$hostgroup_down|number_format:2:".":""}{literal}],
+                    ['Unreachable', {/literal}{$hostgroup_unreachable|number_format:2:".":""}{literal}],
+                    ['Downtime', {/literal}{$hostgroup_maintenance|number_format:2:".":""}{literal}],
+                    ['Undetermined', {/literal}{$hostgroup_undetermined|number_format:2:".":""}{literal}],
                 ],
                 type : 'pie',
                 colors : {

diff --git a/www/include/reporting/dashboard/template/viewHostLog.ihtml b/www/include/reporting/dashboard/template/viewHostLog.ihtml
@@ -201,11 +201,11 @@
             data: {
                 // iris data from R
                 columns: [
-                    ['Up', {/literal}{$host_up}{literal}],
-                    ['Down', {/literal}{$host_down}{literal}],
-                    ['Unreachable', {/literal}{$host_unreachable}{literal}],
-                    ['Downtime', {/literal}{$host_maintenance}{literal}],
-                    ['Undetermined', {/literal}{$host_undetermined}{literal}],
+                    ['Up', {/literal}{$host_up|number_format:2:".":""}{literal}],
+                    ['Down', {/literal}{$host_down|number_format:2:".":""}{literal}],
+                    ['Unreachable', {/literal}{$host_unreachable|number_format:2:".":""}{literal}],
+                    ['Downtime', {/literal}{$host_maintenance|number_format:2:".":""}{literal}],
+                    ['Undetermined', {/literal}{$host_undetermined|number_format:2:".":""}{literal}],
                 ],
                 type : 'pie',
                 colors : {

diff --git a/www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml b/www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml
@@ -189,12 +189,12 @@
             data: {
                 // iris data from R
                 columns: [
-                    ['Ok', {/literal}{$servicegroup_ok}{literal}],
-                    ['Warning', {/literal}{$servicegroup_warning}{literal}],
-                    ['Critical', {/literal}{$servicegroup_critical}{literal}],
-                    ['Unknown', {/literal}{$servicegroup_unknown}{literal}],
-                    ['Downtime', {/literal}{$servicegroup_maintenance}{literal}],
-                    ['Undetermined', {/literal}{$servicegroup_undetermined}{literal}]
+                    ['Ok', {/literal}{$servicegroup_ok|number_format:2:".":""}{literal}],
+                    ['Warning', {/literal}{$servicegroup_warning|number_format:2:".":""}{literal}],
+                    ['Critical', {/literal}{$servicegroup_critical|number_format:2:".":""}{literal}],
+                    ['Unknown', {/literal}{$servicegroup_unknown|number_format:2:".":""}{literal}],
+                    ['Downtime', {/literal}{$servicegroup_maintenance|number_format:2:".":""}{literal}],
+                    ['Undetermined', {/literal}{$servicegroup_undetermined|number_format:2:".":""}{literal}]
                 ],
                 type : 'pie',
                 colors : {

diff --git a/www/include/reporting/dashboard/template/viewServicesLog.ihtml b/www/include/reporting/dashboard/template/viewServicesLog.ihtml
@@ -145,12 +145,12 @@
             data: {
                 // iris data from R
                 columns: [
-                    ['Ok', {/literal}{$service_ok}{literal}],
-                    ['Warning', {/literal}{$service_warning}{literal}],
-                    ['Critical', {/literal}{$service_critical}{literal}],
-                    ['Unknown', {/literal}{$service_unknown}{literal}],
-                    ['Downtime', {/literal}{$service_maintenance}{literal}],
-                    ['Undetermined', {/literal}{$service_undetermined}{literal}]
+                    ['Ok', {/literal}{$service_ok|number_format:2:".":""}{literal}],
+                    ['Warning', {/literal}{$service_warning|number_format:2:".":""}{literal}],
+                    ['Critical', {/literal}{$service_critical|number_format:2:".":""}{literal}],
+                    ['Unknown', {/literal}{$service_unknown|number_format:2:".":""}{literal}],
+                    ['Downtime', {/literal}{$service_maintenance|number_format:2:".":""}{literal}],
+                    ['Undetermined', {/literal}{$service_undetermined|number_format:2:".":""}{literal}]
                 ],
                 type : 'pie',
                 colors : {

diff --git a/www/include/views/graphs/graph.xsl b/www/include/views/graphs/graph.xsl
@@ -286,17 +286,6 @@
 		<form name="formu2">
     	    <table class="ajaxOption">
 				<tr>
-	           		<td>
-						<xsl:element name='input'>
-							<xsl:attribute name="onClick">graph_4_host('<xsl:value-of select="//opid"/>', multi); return false;</xsl:attribute>
-							<xsl:attribute name="name">split</xsl:attribute>
-							<xsl:attribute name="type">checkbox</xsl:attribute>
-							<xsl:if test="//splitvalue = 1">
-								<xsl:attribute name="checked">checked</xsl:attribute>
-							</xsl:if>
-						</xsl:element>
-						<xsl:value-of select="//lang/giv_split_component"/>
-	           		</td>
 	           		<td>
 						<xsl:element name='input'>
 							<xsl:attribute name="onClick">graph_4_host('<xsl:value-of select="//opid"/>', multi); return false;</xsl:attribute>