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

doc/en/release_notes/centreon-2.7/centreon-2.7.11.rst

@@ -2,7 +2,8 @@
 Centreon 2.7.11
 ###############
 
-The 2.7.11 release for Centreon Web is now available for `download <https://download.centreon.com>`_. The full release notes for 2.7.10 follow.
+The 2.7.11 release for Centreon Web is now available for `download <https://download.centreon.com>`_.
+The full release notes for 2.7.11 follow.
 
 ******
 Notice
@@ -15,3 +16,7 @@ Bug Fixes
 =========
 
 - Fix ldap authentication
+- Fix CLAPI export using filters
+- Fix CLAPI poller generate (generate, test, move, restart/reload/ applycfg) #5224 #5221
+- Fix Incorrect style for "Scheduled downtime" in dashboard #5240
+- Fix Contact - import LDAP apply new CSS style #5235

doc/fr/release_notes/centreon-2.7/centreon-2.7.11.rst

@@ -2,7 +2,8 @@
 Centreon 2.7.11
 ###############
 
-The 2.7.11 release for Centreon Web is now available for `download <https://download.centreon.com>`_. The full release notes for 2.7.10 follow.
+The 2.7.11 release for Centreon Web is now available for `download <https://download.centreon.com>`_.
+The full release notes for 2.7.11 follow.
 
 ******
 Notice
@@ -15,3 +16,7 @@ Bug Fixes
 =========
 
 - Fix ldap authentication
+- Fix CLAPI export using filters
+- Fix CLAPI poller generate (generate, test, move, restart/reload/ applycfg) #5224 #5221
+- Fix Incorrect style for "Scheduled downtime" in dashboard #5240
+- Fix Contact - import LDAP apply new CSS style #5235

www/include/configuration/configObject/contact/ldapImportContact.ihtml

 <script type="text/javascript" src="./include/common/javascript/tool.js"></script>
 {$javascript}
 {$form.javascript}
- 	<table class="ListTable">
-	 	<tr class="ListHeader"><td class="FormHeader" colspan="2"><img src='./img/icones/16x16/user1_view.gif'>&nbsp;&nbsp;{$form.header.title}</td></tr>
-	 	<tr class="list_lvl_1"><td class="ListColLvl1_name" colspan="2"><img src='./img/icones/16x16/funnel_new.gif'>&nbsp;&nbsp;{$form.header.options}</td></tr>
+ 	<table class="formTable table">
+        <tr class="ListHeader">
+            <td class="FormHeader" colspan="2"><h3>| {$form.header.title}</h3></td>
+        </tr>
+        <tr class="list_lvl_1">
+            <td class="ListColLvl1_name" colspan="2"><h4>{$form.header.options}</h4></td>
+        </tr>
 		<tr class='list_one'>
 			<td class='FormRowField'>{$ldapServers}</td>
 			<td class='FormRowValue'>{$ldapConfList}</td>
@@ -19,8 +23,12 @@
 	</table>
 <form {$form.attributes}>
 	<table class="ListTable">
-		<tr class="list_lvl_1"><td class="ListColLvl1_name" colspan="2"><img src='./img/icons/view.png'>&nbsp;&nbsp;{$form.header.result}</td></tr>
-		<tr class="list_one"><td class="ListColLvl1_name" colspan="2" style="text-align: center;" id='ldap_search_result_output' ></td></tr>
+        <tr class="list_lvl_1">
+		    <td class="ListColLvl1_name" colspan="2"><h4>{$form.header.result}</h4></td>
+        </tr>
+		<tr class="list_one">
+            <td class="ListColLvl1_name" colspan="2" style="text-align: center;" id='ldap_search_result_output' ></td>
+        </tr>
 	</table>
 	<input type='hidden' name='o' value='{$o}'>
 	<div id="validForm">

www/include/configuration/configObject/contact/ldapImportContact.php

@@ -64,7 +64,7 @@
 	$form->addElement('header', 'ldap_search_result_output', _("Result"));
 
 	$link = "LdapSearch()";
-	$form->addElement("button", "ldap_search_button", _("Search"), array("onClick"=>$link));
+	$form->addElement("button", "ldap_search_button", _("Search"), array("class"=>"btc bt_success", "onClick"=>$link));
 
 	$tab = array();
 	$tab[] = HTML_QuickForm::createElement('radio', 'action', null, _("List"), '1');
@@ -105,7 +105,7 @@
 	 * Just watch a contact information
 	 */
 	if ($o == "li")	{
-            $subA = $form->addElement('submit', 'submitA', _("Import"));
+            $subA = $form->addElement('submit', 'submitA', _("Import"), array("class"=>"btc bt_success"));
 	}
 
 	$valid = false;

www/include/reporting/dashboard/template/viewServicesLog.ihtml

@@ -100,7 +100,7 @@
 							<td class='ListColRight'>{$summary.UNKNOWN_A}</td>
 						</tr>
 						<tr class="list_one">
-							<td {$style.MAINTENANCE}>{$MaintenanceTitle}</td>
+							<td {$style_maintenance}>{$MaintenanceTitle}</td>
 							<td class='ListColCenter'>{$summary.MAINTENANCE_TF}</td>
 							<td class='ListColRight'>{$summary.MAINTENANCE_TP}%</td>
 							<td class='ListColRight'></td>