Commit 54745541 authored by Clément Damiens's avatar Clément Damiens
Browse files

Merge remote-tracking branch 'origin/master'

parents f991f5bb f885e4fd
costum.laRaffinerie3 = {
directoryEvent : function(keyE, valE){
mylog.log("costum.laRaffinerie3.directoryEvent", keyE, valE);
var now = moment().format("YYYY-MM-DD");
......@@ -66,4 +67,22 @@ costum.initHtmlPosition = function(){
$(".footerRaffinerie").removeClass("affix");
}
});
} ;
\ No newline at end of file
} ;
costum.calendar = {
buildCalObj : function(eventObj, taskCal){
var backgroundColor = "#d6d6d6 !important";
$.each(costum.paramsData.poles, function(kT, vT){
//mylog.log("directoryEvent poles", kT, vT);
if(typeof eventObj.tags != "undefined" &&
eventObj.tags != null &&
eventObj.tags.length > 0 &&
$.inArray(kT, eventObj.tags) > -1)
backgroundColor = vT.color+ " !important" ;
});
taskCal.backgroundColor = backgroundColor;
return taskCal;
}
}
\ No newline at end of file
......@@ -135,6 +135,7 @@
<button class="btn btn-default tagCC bg-dark text-white" data-tag="Amap">Amap</button>
<button class="btn btn-default tagCC bg-dark text-white" data-tag="Jardin partagé">Jardin partagé</button>
<button class="btn btn-default tagCC bg-dark text-white" data-tag="Producteur">Producteur</button>
<button class="btn btn-default tagCC bg-dark text-white" data-tag="Tierslieux">Tiers lieux</button>
</div>
<div class="col-xs-12 mapBackground no-padding" id="mapCircuit"></div>
</div>
......
Supports Markdown
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