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

www/Themes/Centreon-2/color_css.php

@@ -51,7 +51,6 @@ unset($res);
 
 .ListTable a:link, #ListTable a:link			{color:<?php print $color2; ?>;}
 .ListTable a:visited, #ListTable a:visited		{color:<?php print $color2; ?>;}
-.ListTable a:hover, #ListTable a:hover			{color:<?php print $color3; ?>;}
 
 .list_lvl_1{	background-color:<?php print $color4; ?>;}
 .list_lvl_2{	background-color:<?php print $color5; ?>;}

www/Themes/Centreon-2/style.css

@@ -947,7 +947,8 @@ div.menuLeft {
 }
 
 .formTable .list_lvl_1 .ListColLvl1_name,
-.table .list_lvl_1 .ListColLvl1_name {
+.table .list_lvl_1 .ListColLvl1_name,
+.ListTable .list_lvl_1 .ListColLvl1_name {
     padding: 6px 0;
     background-color: #f4f4f4;
     border-bottom: 1px solid #e7e7e8;
@@ -955,7 +956,8 @@ div.menuLeft {
 }
 
 .formTable .list_lvl_1 h4,
-.table .list_lvl_1 h4 {
+.table .list_lvl_1 h4,
+.ListTable .list_lvl_1 h4{
     font-weight: normal;
     color: #009fdf;
     /*margin-left: 12px;*/

www/class/centreonUtils.class.php

@@ -115,6 +115,7 @@ class CentreonUtils
         if (!isset($centreonGmt)) {
             $centreonGmt = new CentreonGMT($db);
         }
+        $centreonGmt->getMyGMTFromSession(session_id(), $db);
         $datetime = trim($datetime);
         $res = explode(" ", $datetime);
         if (count($res) != 2) {
@@ -128,8 +129,7 @@ class CentreonUtils
         if (count($res2) != 2) {
             throw new Exception($invalidString);
         }
-        $timestamp = mktime($res2[0], $res2[1], "0", $res1[1], $res1[2], $res1[0]);
-        $timestamp = $centreonGmt->getUTCDate($timestamp);
+        $timestamp = $centreonGmt->getUTCDateFromString($datetime);
         return $timestamp;
     }