Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
4328e7b7c8
|
@ -376,7 +376,8 @@ EOL
|
|||
return new Response(json_encode($output), 400);
|
||||
}
|
||||
|
||||
$weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
|
||||
# fixe #31884 "https://" => "//"
|
||||
$weburl="//".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
|
||||
$serializer = new Serializer(array(new DateTimeNormalizer()));
|
||||
|
||||
if ($action == null) {
|
||||
|
@ -407,7 +408,6 @@ EOL
|
|||
}
|
||||
$categorielabel="";
|
||||
if ($compteur==0) {
|
||||
if ($alert->getAlertcategory()->getLabel()!="sans categorie")
|
||||
if ($flag=="") {
|
||||
$categorielabel="<div style='float:left;width: 102.5%;padding: 4px;padding-left: 4px;color:white;background-color: #$bgcolor;position:relative;top: -16px;left: -11px;'><img src='$iconeurl' width='24em'> ".$alert->getAlertcategory()->getLabel()."</div></br>";
|
||||
$tmp["message"] = "$categorielabel<h4>".$alert->getTitle()."</h4>".$alert->getContent();
|
||||
|
@ -415,7 +415,6 @@ EOL
|
|||
}
|
||||
else
|
||||
{
|
||||
if ($alert->getAlertcategory()->getLabel()!="sans categorie")
|
||||
if ($flag=="") {
|
||||
$categorielabel="<img src='$iconeurl' width='16em' ><span style='font-weight: bold'> ".$alert->getAlertcategory()->getLabel()."</span> : ";
|
||||
$tmp["message"] = $categorielabel.$alert->getTitle()."".$alert->getContent();
|
||||
|
|
Loading…
Reference in New Issue