Commit 36c0e1d4 authored by Raph El's avatar Raph El

Merge branch 'development' of https://gitlab.adullact.net/pixelhumain/co2 into development

parents 82d73aeb 14ff9331
......@@ -3363,13 +3363,20 @@ var directory = {
params.imgProfil = "<i class='fa fa-image fa-2x'></i>";
params.imgMediumProfil = "<i class='fa fa-image fa-2x'></i>";
}
// <<<<<<< HEAD
// mylog.log("DIrectory ", directory.custom);
// if( directory.custom != null &&
// typeof directory.custom != "undefined" &&
// typeof directory.custom.results != "undefined" &&
// typeof directory.custom.results[params.type] != "undefined" &&
// typeof directory.custom.results[params.type].defaultImg != "undefined")
// =======
if("undefined" != typeof directory.custom && notNull(directory.custom)
&& typeof directory.custom.results != "undefined"
&& typeof directory.custom.results[params.type] != "undefined"
&& typeof directory.custom.results[params.type].defaultImg != "undefined")
mylog.log("DIrectory ", directory.custom);
if( directory.custom != null &&
typeof directory.custom != "undefined" &&
typeof directory.custom.results != "undefined" &&
typeof directory.custom.results[params.type] != "undefined" &&
typeof directory.custom.results[params.type].defaultImg != "undefined")
params.imgMediumProfil= "<img class='img-responsive' onload='directory.checkImage(this);' src='"+parentModuleUrl+directory.custom.results[params.type].defaultImg+"'/>";
if("undefined" != typeof params.profilMediumImageUrl && params.profilMediumImageUrl != "")
......
......@@ -77,6 +77,7 @@ class CommunecterController extends Controller
"index" => array("href" => "/ph/co2/admin"),
"accueil" => array("href" => "/ph/co2/accueil"),
"directory" => array("href" => "/ph/co2/admin/directory"),
"reference" => array("href" => "/ph/co2/admin/reference"),
"switchto" => array("href" => "/ph/co2/admin/switchto"),
"delete" => array("href" => "/ph/co2/admin/delete"),
"activateuser" => array("href" => "/ph/co2/admin/activateuser"),
......
......@@ -452,6 +452,77 @@
}
}
},
"adminPanel": {
"directory" :{
"label":"Directory",
"super":true,
"class":"text-yellow",
"id":"btn-directory",
"href":"javascript:;",
"icon":"user"
},
"reference":{
"label":"Reference",
"sourceKey":true,
"init":["organizations", "events", "projects"],
"class":"text-azure",
"id":"btn-reference",
"href":"javascript:;",
"icon":"creative-commons"
},
"converter":{
"label":"Converter",
"class":"text-green",
"id": "btn-importdata",
"href":"javascript:;",
"icon":"upload"
},
"import":{
"label":"IMPORT DATA",
"class":"letter-blue",
"id": "btn-adddata",
"href":"javascript:;",
"icon":"plus"
},
"mails":{
"label":"Mails simulator",
"super":true,
"class": "text-purple",
"id":"btn-mailslist",
"href":"javascript:;",
"icon":"at"
},
"log":{
"label":"LOG",
"super":true,
"class":"text-dark",
"id": "btn-log",
"href":"javascript:;",
"icon":"list"
},
"moderation":{
"label":"MODERATION",
"class":"text-red",
"id":"btn-moderate",
"href":"javascript:;",
"icon":"check"
},
"statistic":{
"label":"Statitics",
"class":"text-orange",
"id":"btn-statistic",
"href":"javascript:;",
"icon":"bar-chart"
},
"mailerror" :{
"label":"Mail error",
"super":true,
"class":"text-yellow",
"id":"btn-mailerror",
"href":"javascript:;",
"icon":"envelope"
}
},
"element":{
"initView": "",
"menuLeft":{
......
......@@ -17,6 +17,7 @@ class AdminController extends CommunecterController {
public function actions(){
return array(
'directory' => 'citizenToolKit.controllers.admin.DirectoryAction',
'reference' => 'citizenToolKit.controllers.admin.ReferenceAction',
'circuits' => 'citizenToolKit.controllers.admin.CircuitsAction',
'mailerrordashboard' => 'citizenToolKit.controllers.admin.MailErrorDashboardAction',
'switchto' => 'citizenToolKit.controllers.admin.SwitchtoAction',
......
......@@ -92,7 +92,7 @@ class CO2 {
if(!empty($v)){
$newObj[$key]=(@$filter[$key]) ? $filter[$key] : $v;
$checkArray=true;
$arrayInCustom=["label","subdomainName","placeholderMainSearch", "icon","height","imgPath","useFilter","slug","formCreate"];
$arrayInCustom=["label","subdomainName","placeholderMainSearch", "icon","height","imgPath","useFilter","slug","formCreate", "initType"];
foreach($arrayInCustom as $entry){
if(@$v[$entry]){
$newObj[$key][$entry]=$v[$entry];
......@@ -131,6 +131,8 @@ class CO2 {
$params["header"]["menuTop"]["navRight"]=self::checkCOstumList($constructParams["header"]["menuTop"]["navRight"],$params["header"]["menuTop"]["navRight"]);
}
}
if(@$constructParams["adminPanel"])
$params["adminPanel"]=self::checkCOstumList($constructParams["adminPanel"],$params["adminPanel"]);
if(@$constructParams["element"]){
if(@$constructParams["element"]["initView"])
$params["element"]["initView"]=@$constructParams["element"]["initView"];
......@@ -163,8 +165,8 @@ class CO2 {
$params["appRendering"]=$constructParams["appRendering"];
if(@$constructParams["directory"])
$params["directory"]=$constructParams["directory"];
if(@$constructParams["adminPanel"])
$params["adminPanel"]=$constructParams["adminPanel"];
// if(@$constructParams["adminPanel"])
// $params["adminPanel"]=$constructParams["adminPanel"];
if(@$constructParams["redirect"])
$params["pages"]["#app.index"]["redirect"]=$constructParams["redirect"];
if(@$constructParams["footer"])
......
<?php
$cs = Yii::app()->getClientScript();
$layoutPath = 'webroot.themes.'.Yii::app()->theme->name.'.views.layouts.';
//$cs = Yii::app()->getClientScript();
//$layoutPath = 'webroot.themes.'.Yii::app()->theme->name.'.views.layouts.';
//header + menu
$this->renderPartial($layoutPath.'header',
array( "layoutPath"=>$layoutPath ,
"page" => "admin") );
// $this->renderPartial($layoutPath.'header',
// array( "layoutPath"=>$layoutPath ,
// "page" => "admin") );
?>
<!-- start: PAGE CONTENT -->
......@@ -15,7 +15,144 @@
$this->renderPartial($layoutPath.'header',
array( "layoutPath"=>$layoutPath ,
"page" => "admin",
"useFilter"=>false) );
"useFilter"=>false, "useHeader"=>true) );
//BUTTON ADD +> TODO BOUBOULE GET GENERIC VIEW OF ADD ELEMENT DASHBOARD
if(isset(Yii::app()->session["custom"])
&& isset(Yii::app()->session["custom"]["htmlConstruct"])
&& isset(Yii::app()->session["custom"]["htmlConstruct"]["adminPanel"])
&& isset(Yii::app()->session["custom"]["htmlConstruct"]["adminPanel"]["add"])){
$addElement=array(
Person::COLLECTION => array(
"label"=>Yii::t("common","Invite someone"),"icon"=>Person::ICON,"addClass"=> "bg-yellow lbhp", "color"=>"yellow", "href"=>"#element.invite"
),
Organization::COLLECTION => array(
"label"=>Yii::t("common","Organizations"),"icon"=>Organization::ICON,"formType"=>"organization","addClass"=> "bg-green", "color"=>"green","href"=>"javascript:;"
),
Project::COLLECTION => array(
"label"=>Yii::t("common","Project"),"icon"=>Project::ICON,"formType"=>"project","addClass"=> "addBtnFoot_orga addBtnFoot_project bg-purple","href"=>"javascript:;"
),
Event::COLLECTION => array(
"label"=>Yii::t("common","Event"),
"icon"=>Event::ICON,
"formType"=>"event",
"addClass"=> "addBtnAll bg-orange",
"href"=>"javascript:;"
),
Classified::COLLECTION => array(
"label"=>Yii::t("common","Classified"),
"icon"=>Classified::ICON,
"formType"=>"classifieds",
"addClass"=> "addBtnFoot_orga addBtnFoot_project bg-azure",
"href"=>"javascript:;"
),
Classified::TYPE_RESSOURCES => array(
"label"=>Yii::t("common","Ressource"),
"icon"=>Classified::ICON_RESSOURCES,
"formType"=>"ressources",
"addClass"=> "addBtnAll bg-vine",
"href"=>"javascript:;"
),
Classified::TYPE_JOBS => array(
"label"=>Yii::t("common","Jobs"),
"icon"=>Classified::ICON_JOBS,
"formType"=>"jobs",
"addClass"=> "hideBtnFoot_person addBtnFoot_orga addBtnFoot_project bg-yellow-k",
"href"=>"javascript:;"
),
Poi::COLLECTION => array(
"label"=>Yii::t("common","Point of interest"),
"icon"=>Poi::ICON,
"formType"=>"poi",
"addClass"=> "addBtnAll bg-green-k",
"href"=>"javascript:;"
),
Proposal::COLLECTION => array(
"label"=>Yii::t("common","Survey"),
"icon"=>Proposal::ICON,
"formType"=>"proposal",
"addClass"=> "addBtnAll bg-turq",
"color"=>"purple",
"href"=>"javascript:;"
)
);
if(isset(Yii::app()->session["custom"]["add"])){
foreach($addElement as $key=>$v)
if(!@Yii::app()->session["custom"]["add"][$key] && (!@$v["type"] || !@Yii::app()->session["custom"]["add"][$v["type"]])) unset($addElement[$key]);
}
}
//STRUCTURE MENU ADMIN
// [ ] TODO BOUBOULE :: MOVE IT IN PARAMS JSON AND CUSTOM IT IN CO2.PHP AND FINALLY IN COSTUM MODULE
$menuAdmin=array(
"directory" => array(
"label"=>Yii::t("admin","Directory"),
"super"=>true,
"class"=> "text-yellow",
"id"=> "btn-directory",
"href"=>"javascript:;",
"icon"=>"user"
),
"reference" => array(
"label"=>Yii::t("admin","Reference"),
"sourceKey"=>true,
"init"=>["organizations", "events", "projects"],
"class"=> "text-azure",
"id"=> "btn-reference",
"href"=>"javascript:;",
"icon"=>"creative-commons"
),
"converter" => array(
"label"=>Yii::t("common","Converter"),
"class"=> "text-green",
"id"=> "btn-importdata",
"href"=>"javascript:;",
"icon"=>"upload"
),
"import" => array(
"label"=>Yii::t("common","IMPORT DATA"),
"class"=> "letter-blue",
"id"=> "btn-adddata",
"href"=>"javascript:;",
"icon"=>"plus"
),
"mails" => array(
"label"=>Yii::t("admin","Mails simulator"),
"super"=>true,
"class"=> "text-purple",
"id"=> "btn-mailslist",
"href"=>"javascript:;",
"icon"=>"at"
),
"log" => array(
"label"=>Yii::t("admin","LOG"),
"super"=>true,
"class"=> "text-dark",
"id"=> "btn-log",
"href"=>"javascript:;",
"icon"=>"list"
),
"moderation" => array(
"label"=>Yii::t("admin","MODERATION"),
"class"=> "text-red",
"id"=> "btn-moderate",
"href"=>"javascript:;",
"icon"=>"check"
),
"statistic" => array(
"label"=>Yii::t("admin","Statitics"),
"class"=> "text-orange",
"id"=> "btn-statistic",
"href"=>"javascript:;",
"icon"=>"bar-chart"
),
"mailerror" => array(
"label"=>Yii::t("admin","Mail error "),
"super"=>true,
"class"=> "text-yellow",
"id"=> "btn-mailerror",
"href"=>"javascript:;",
"icon"=>"envelope"
)
);
?>
<!-- start: PAGE CONTENT -->
<style type="text/css">
......@@ -33,7 +170,12 @@
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding" id="content-social">
<?php if(@Yii::app()->session["userIsAdmin"] || Yii::app()->session["userIsAdminPublic"]){
<?php if(@Yii::app()->session["userIsAdmin"] || Yii::app()->session["userIsAdminPublic"]
|| (@Yii::app()->session["userId"]
&& @Yii::app()->session["custom"]
&& @Yii::app()->session["custom"]["admins"]
&& @Yii::app()->session["custom"]["admins"][Yii::app()->session["userId"]])){
$authorizedAdmin=true;
$title=(@Yii::app()->session["userIsAdmin"]) ? Yii::t("common","Administration portal") : Yii::t("common","Public administration portal");
$logo = (@Yii::app()->session['custom']["logo"]) ? Yii::app()->session['custom']["logo"] : Yii::app()->theme->baseUrl."/assets/img/LOGOS/CO2/logo-min.png";
?>
......@@ -44,76 +186,9 @@
<h3><?php echo $title ?></h3>
</div>
<?php
if(@Yii::app()->session["custom"] && @@Yii::app()->session["custom"]["admin"] && @Yii::app()->session["custom"]["admin"]["add"]){
$addElement=array(
Person::COLLECTION => array(
"label"=>Yii::t("common","Invite someone"),
"icon"=>Person::ICON,
"addClass"=> "bg-yellow lbhp",
"href"=>"#element.invite"
),
Organization::COLLECTION => array(
"label"=>Yii::t("common","Organizations"),
"icon"=>Organization::ICON,
"formType"=>"organization",
"addClass"=> "bg-green",
"href"=>"javascript:;"
),
Project::COLLECTION => array(
"label"=>Yii::t("common","Project"),
"icon"=>Project::ICON,
"formType"=>"project",
"addClass"=> "addBtnFoot_orga addBtnFoot_project bg-purple",
"href"=>"javascript:;"
),
Event::COLLECTION => array(
"label"=>Yii::t("common","Event"),
"icon"=>Event::ICON,
"formType"=>"event",
"addClass"=> "addBtnAll bg-orange",
"href"=>"javascript:;"
),
Classified::COLLECTION => array(
"label"=>Yii::t("common","Classified"),
"icon"=>Classified::ICON,
"formType"=>"classifieds",
"addClass"=> "addBtnFoot_orga addBtnFoot_project bg-azure",
"href"=>"javascript:;"
),
Classified::TYPE_RESSOURCES => array(
"label"=>Yii::t("common","Ressource"),
"icon"=>Classified::ICON_RESSOURCES,
"formType"=>"ressources",
"addClass"=> "addBtnAll bg-vine",
"href"=>"javascript:;"
),
Classified::TYPE_JOBS => array(
"label"=>Yii::t("common","Jobs"),
"icon"=>Classified::ICON_JOBS,
"formType"=>"jobs",
"addClass"=> "hideBtnFoot_person addBtnFoot_orga addBtnFoot_project bg-yellow-k",
"href"=>"javascript:;"
),
Poi::COLLECTION => array(
"label"=>Yii::t("common","Point of interest"),
"icon"=>Poi::ICON,
"formType"=>"poi",
"addClass"=> "addBtnAll bg-green-k",
"href"=>"javascript:;"
),Proposal::COLLECTION => array(
"label"=>Yii::t("common","Survey"),
"icon"=>Proposal::ICON,
"formType"=>"proposal",
"addClass"=> "addBtnAll bg-turq",
"href"=>"javascript:;"
)
);
//Filtering button add element if custom
if(@Yii::app()->session["custom"]["app"]){
foreach($addElement as $key=>$v)
if(!@Yii::app()->session["custom"]["app"][$key] && (!@$v["type"] || !@Yii::app()->session["custom"]["app"][$v["type"]])) unset($addElement[$key]);
} ?>
<div class="col-xs-12 col-md-9 col-sm-9 col-lg-9 padding-50 margin-top-50 links-main-menu"
if(isset($addElement) && !empty($addElement)){ ?>
<div class="col-xs-12 col-sm-offset-1 col-md-offset-2 col-md-8 col-sm-10 padding-50 margin-top-50 links-main-menu"
id="div-select-create">
<div class="col-md-12 col-sm-12 col-xs-12 padding-15 shadow2 bg-white ">
......@@ -122,7 +197,7 @@
<i class="fa fa-times-circle fa-2x"></i>
</a>
<br>
<i class="fa fa-plus-circle"></i> <?php echo Yii::t("form","Create content link to this page") ?>
<i class="fa fa-plus-circle"></i> <?php echo Yii::t("form","Add content as source admin") ?>
<br>
<small><?php echo Yii::t("form","What kind of content will you create ?") ?></small>
</h4>
......@@ -130,13 +205,13 @@
<div class="col-md-12 col-sm-12 col-xs-12"><hr></div>
<?php foreach($addElement as $key => $v){
if(!@$v["typeAllow"] || in_array($type, $v["typeAllow"])){ ?>
<button data-form-type="<?php echo $v["formType"] ?>"
<button data-form-type="<?php echo @$v["formType"] ?>"
<?php if(@$v["formSubType"]){ ?>
data-form-subtype="<?php echo $v["formSubType"] ?>"
<?php } ?>
data-dismiss="modal"
class="btn btn-link btn-open-form col-xs-6 col-sm-6 col-md-4 col-lg-4 text-<?php echo $v["color"] ?>">
<h6><i class="fa <?php echo @$v["icon"] ?> fa-2x bg-<?php echo @$v["color"] ?>"></i><br> <?php echo $v["label"] ?></h6>
class="btn btn-link btn-open-form col-xs-6 col-sm-6 col-md-4 col-lg-4 text-<?php echo @$v["color"] ?>">
<h6><i class="fa <?php echo @$v["icon"] ?> fa-2x"></i><br> <?php echo $v["label"] ?></h6>
<small><?php echo @$v["description"] ?></small>
</button>
<?php }
......@@ -146,7 +221,19 @@
</div>
<?php } ?>
<ul class="list-group text-left no-margin">
<?php if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )) { ?>
<?php foreach(Yii::app()->session["paramsConfig"]["adminPanel"] as $key => $v){
if((!isset($v["super"]) || empty($v["super"]) || Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]))) && $key!="add"){
if(!isset($v["sourceKey"]) || (isset(Yii::app()->session["custom"]) && isset(Yii::app()->session["custom"]["sourceKey"]))){?>
<li class="list-group-item col-md-4 col-sm-6 ">
<a href="javascript:;" class="<?php echo $v["class"] ?>" id="<?php echo $v["id"] ?>" style="cursor:pointer;">
<i class="fa fa-<?php echo $v["icon"] ?> fa-2x"></i>
<?php echo Yii::t("admin", $v["label"]); ?>
</a>
</li>
<?php }
}
} ?>
<?php /*if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )) { ?>
<li class="list-group-item col-md-4 col-sm-6 ">
<a href="javascript:;" class=" text-yellow" id="btn-directory" style="cursor:pointer;">
......@@ -216,7 +303,7 @@
</a>
</li>
<?php } ?>
<?php } */ ?>
</ul>
</div>
<div class="col-md-12 col-sm-12 col-xs-12 no-padding" id="goBackToHome">
......@@ -237,13 +324,15 @@
// initKInterface();
var superAdmin="<?php echo @Yii::app()->session["userIsAdmin"] ?>";
var sourceAdmin="<?php echo @Yii::app()->session["userIsAdminPublic"] ?>";
var authorizedAdmin=<?php echo json_encode(@$authorizedAdmin) ?>;
var edit=true;
var hashUrlPage = "#admin";
var subView="<?php echo @$_GET['view']; ?>";
var dir="<?php echo @$_GET['dir']; ?>";
var paramsAdmin= <?php echo json_encode(Yii::app()->session["paramsConfig"]["adminPanel"]) ?>;
jQuery(document).ready(function() {
//loadDetail(true);
if(superAdmin == "" && sourceAdmin == ""){
if(superAdmin == "" && sourceAdmin == "" && !authorizedAdmin){
urlCtrl.loadByHash("");
bootbox.dialog({message:'<div class="alert-danger text-center"><strong><?php echo Yii::t("common","You are not authorized to acces adminastrator panel ! <br/>Connect you or contact us in order to become admin system") ?></strong></div>'});
}
......@@ -259,6 +348,8 @@
if(sub!=""){
if(sub=="directory")
loadDirectory();
if(sub=="reference")
loadReference();
else if(sub=="log")
loadLog();
else if(sub=="importdata")
......@@ -295,6 +386,11 @@
location.hash=hashUrlPage+".view.directory";
loadDirectory();
});
$("#btn-reference").click(function(){
location.hash=hashUrlPage+".view.reference";
loadReference();
});
$("#btn-log").click(function(){
location.hash=hashUrlPage+".view.log";
loadLog();
......@@ -344,6 +440,17 @@
//showLoader('.content-view-dashboard');
ajaxPost('#content-view-admin', baseUrl+'/'+moduleId+'/'+url, data, function(){},"html");
}
function loadReference(){
initDashboard();
initType=(typeof paramsAdmin != "undefined"
&& typeof paramsAdmin["reference"] != "undefined"
&& typeof paramsAdmin["reference"]["initType"] != "undefined") ? paramsAdmin["reference"]["initType"]: ["organizations", "events", "projects"];
data={initType:initType};
var url = "admin/reference";
$("#goBackToHome").show(700);
//showLoader('.content-view-dashboard');
ajaxPost('#content-view-admin', baseUrl+'/'+moduleId+'/'+url, data, function(){},"html");
}
function loadLog(){
initDashboard();
var url = "log/monitoring";
......@@ -397,7 +504,7 @@
function loadStatistic(){
initDashboard();
var url = "stat/chartglobal";
var url = "app/info/p/stats";
//showLoader('.content-view-dashboard');
$("#goBackToHome").show(700);
ajaxPost('#content-view-admin', baseUrl+'/'+moduleId+'/'+url, null, function(){},"html");
......
This diff is collapsed.
......@@ -8,7 +8,7 @@
); HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesTheme, Yii::app()->request->baseUrl);
$cssAnsScriptFilesModule = array(
'/js/default/profilSocial.js',
//'/js/default/profilSocial.js',
);
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->assetsUrl);
......
......@@ -61,7 +61,7 @@
}
.text-explain{
color: #555;
font-size: 15px;
font-size: 18px;
}
.blue-bg {
background-color: white;
......@@ -79,6 +79,14 @@
max-height: 50px;
z-index: 2;
}
.circle.active{
background: #ea4335;
border: inset 3px #ea4335;
max-height: 70px;
height: 70px;
font-size: 25px;
width: 70px;
}
.support-section{
background-color: white;
}
......@@ -182,7 +190,8 @@
color: #444;
}
.how-it-works.row .col-6 h5{
font-size: 15px;
font-size: 17px;
text-transform: inherit;
}
.col-2 {
-ms-flex: 0 0 16.666667%;
......@@ -276,10 +285,10 @@ encourager la transition écologique, sociale et citoyenne de votre commune<br>
</h3>
<div class="col-md-10 col-md-offset-1 col-xs-12">
<span class="text-explain">Nous sommes de plus en plus nombreux à vouloir agir face au dérèglement climatique, à la croissance des inégalités, à la crise de la démocratie.<br/><span class="bullet-point"></span><br/>
Pour relever ces défis majeurs, changer nos pratiques quotidiennes de consommation ne suffit plus.<br/><span class="bullet-point"></span><br/>
Pour relever ces défis majeurs, changer nos pratiques quotidiennes de consommation ne suffit plus.
Il nous faut également œuvrer à la transformation de nos politiques publiques.<br/><span class="bullet-point"></span><br/>
Si la transition doit avoir lieu à toutes les échelles, les communes peuvent être le fer de lance de ce
mouvement.<br/><span class="bullet-point"></span><br/>
mouvement.<br/>
En mars 2020, des candidat.e.s se présenteront aux élections municipales. Nous voulons les aider à
identifier et mettre en œuvre, une fois élu.e.s, des mesures concrètes pour encourager la transition
écologique, sociale et démocratique de leur commune.<br/><span class="bullet-point"></span><br/>
......@@ -306,8 +315,8 @@ encourager la transition écologique, sociale et citoyenne de votre commune<br>
<div class="circle">1</div>
</div>
<div class="col-6">
<h5>Du 25 janvier au 28 février 2019</h5>
<p>Consultation citoyenne</p>
<h5>Octobre à Décembre 2018</h5>
<p>Consultation des organisations engagées dans la transition écologique et citoyenne</p>
</div>
</div>
<!--path between 1-2-->
......@@ -325,11 +334,11 @@ encourager la transition écologique, sociale et citoyenne de votre commune<br>
<!--second section-->
<div class="row align-items-center justify-content-end how-it-works">
<div class="col-6 text-right">
<h5>En mars 2019</h5>
<p>Analyse et synthèse de la consultation</p>
<h5>Du 25 janvier au 28 février 2019</h5>
<p>Consultation citoyenne</p>
</div>