Commit fe5e1782 authored by Raph El's avatar Raph El

Merge branch 'master' into qa

parents 0e855d68 bac03c2a
......@@ -201,7 +201,7 @@ jQuery(document).ready(function() {
inputType : "select",
options : {
"blockevent" : "Les blocs d'évènements",
"eventCarousel" : "Les évènements en carousel",
"eventsCarousel" : "Les évènements en carousel",
"blockwithimg" : "Un bloc avec un texte et une image",
"communityblock" : "Les blocs communautés",
"communityCaroussel" : "Communauté en carousel",
......
......@@ -76,7 +76,7 @@ if( isset($this->costum["tpls"][$keyTpl]) ) {
if( count(Poi::getPoiByStruct($poiList,"step".$v,$structField))!=0 )
{
$p = Poi::getPoiByStruct($poiList,"step".$v,$structField)[0];
echo '<h1 style="color:'.$color1.'">'.@$p["name"].'</h1>';
echo '<h1 style="color:'.@$color1.'">'.@$p["name"].'</h1>';
echo "<div class='markdown'>".@$p["description"]."</div>";
if( isset($p["documents"]) ){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment