Commit 1c0f8f3c authored by FloBen's avatar FloBen
Browse files

Merge remote-tracking branch 'origin/master' into FlorentBen

parents 2d0756aa 164104e2
......@@ -119,13 +119,22 @@
.menu-xs-container a > i{
padding-right:10px;
}
.menu-xs-container a > img{
margin-left: -4px;
width: 25px;
height: 25px;
float: left;
margin-right: 7px;
}
.menu-xs-container a:hover{
border: 4px solid;
}
.menu-xs-container{
background: #22252a;
}
.iconCtenatImage{
padding: 10px;
}
#mainNav #menuTopRight .dropdown-menu-top div.dropdown-menu {
top: 50px;
}
......@@ -176,4 +185,13 @@
}
#menu-top-btn-group .element-xs-menu {
z-index: 100;
}
#descriptionAbout .container {
display: none !important;
}
#descriptionAbout .morecontent {
display: block !important;
}
.contentInformation .morelink{
display: none !important;
}
\ No newline at end of file
......@@ -704,9 +704,10 @@
},
"#infos-events" :{
"hash" : "#app.view",
"icon" : "users",
"img" : "/images/ctenat/icon-menu-info-event.png",
"urlExtra" : "/page/infos-events/url/costum.views.tpls.staticPage",
"inMenu" : true,
"class":"iconCtenatImage",
"dropdownResult":true,
"subdomainName" : "Nos derniers évènementiels et documents",
"useMapBtn":false
......
......@@ -194,6 +194,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->
}
jQuery(document).ready(function() {
inintDescs();
var eltPreview=<?php echo json_encode($element); ?>;
var str = getDateFormated(eltPreview);
......@@ -209,14 +210,12 @@ HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->
$(".container-preview .social-share-button").html(directory.socialBarHtml({"socialBarConfig":{"btnList" : [{"type":"facebook"}, {"type":"twitter"} ], "btnSize": 40 }, "type": typePreview, "id" : idPreview }));
resizeContainer();
});3
});
function inintDescs() {
mylog.log("inintDescs");
if($("#descriptionAbout").length > 0){
descHtmlToMarkdown();
mylog.log("after");
mylog.log("inintDescs", $("#descriptionAbout").html());
descHtmlToMarkdown();
var descHtml = "<i>"+trad.notSpecified+"</i>";
if($("#descriptionAbout").html().length > 0){
descHtml = dataHelper.markdownToHtml($("#descriptionAbout").html()) ;
......
<?php
$keyTpl ="eventEnPod";
$vData = [
$paramsData = [
];
if (isset($blockCms)) {
foreach ($vData as $e => $v) {
foreach ($paramsData as $e => $v) {
if ( !empty($blockCms[$e]) && isset($blockCms[$e]) ) {
$vData[$e] = $blockCms[$e];
$paramsData[$e] = $blockCms[$e];
}
}
}
......@@ -39,70 +39,13 @@
function(data){
mylog.log(" events",data);
$.each(data,function(k,v){
mylog.log(" rrrrrevents",v);
var tags =[];
tags+=v.tags;
if (tags.includes('infos-events')) {
str += '<div class=\'col-lg-4 col-md-4 col-sm-6 col-xs-12 searchEntityContainer smartgrid-slide-element events contain_'+v.collection+'_'+v.id+' \'>';
str += '<div class=\'searchEntity card-event\' id=\'entity'+v.id+'\'>';
str += '<div class=\'col-lg-4 col-md-4 col-sm-6 col-xs-12 searchEntityContainer smartgrid-slide-element events contain_'+v.collection+'_'+v._id.$id+' \'>';
str += '<div class=\'searchEntity card-event\' id=\'entity'+v._id.$id+'\'>';
var dateFormated = directory.getDateFormated(v);
v.attendees = '';
var cntP = 0;
var cntIv = 0;
if(typeof v.links != 'undefined')
if(typeof v.links.attendees != 'undefined'){
$.each(v.links.attendees, function(key, val){
if(typeof val.isInviting != 'undefined' && val.isInviting == true)
cntIv++;
else
cntP++;
});
}
v.attendees = '<hr class="margin-top-10 margin-bottom-10">';
var isFollowed=false;
if(typeof v.isFollowed != 'undefined' ) isFollowed=true;
if(userId != null && userId != '' && v.id != userId){
var isShared = false;
v.attendees += '<button id=\'btn-share-event\' class=\'btn btn-share-event btn-xs btn-share\''+
' data-ownerlink=\'share\' data-id=\''+v.id+'\' data-type=\''+v.collection+'\' '+//data-name='"+v.name+"'"+
' data-isShared=\''+isShared+'\'>'+
'<i class=\'fa fa-share\'></i> '+trad['share']+'</button>';
}
if(userId != null && userId != '' && v.id != userId ){
var tip = trad['interested'];
var actionConnect='follow';
var icon='chain';
var textBtn= '<i class=\'fa fa-chain\'></i> '+trad['participate'];
var classBtn='text-white';
if(isFollowed){
actionConnect='unfollow';
icon='unlink';
classBtn='text-white';
textBtn= '<i class=\'fa fa-unlink\'></i> '+trad['alreadyAttendee'];
}
v.attendees += '<a href="javascript:;" class="btn btn-xs btn-event-participate tooltips followBtn '+classBtn+'"' +
'data-toggle="tooltip" data-placement="left" data-original-title="'+tip+'"'+
' data-ownerlink=\''+actionConnect+'\' data-id=\''+v.id+'\' data-type=\''+v.collection+'\' data-name=\''+v.name+'\''+
' data-isFollowed=\''+isFollowed+'\'>'+
textBtn+
'</a>';
}
v.attendees += '<small class="light margin-left-10 tooltips pull-left" '+
'data-toggle="tooltip" data-placement="top" data-original-title="'+trad['guest-s']+'">' +
cntIv + ' <i class="fa fa-envelope"></i>'+
'</small>';
v.attendees += '<small class="light margin-left-10 tooltips pull-left" '+
'data-toggle="tooltip" data-placement="top" data-original-title="'+trad['attendee-s']+'">' +
cntP + ' <i class="fa fa-street-view"></i>'+
'</small>';
var countSubEvents = ( v.links && v.links.subEvents ) ? '<br/><i class=\'fa fa-calendar\'></i> '+Object.keys(v.links.subEvents).length+' '+trad['subevent-s'] : '' ;
var defaultImgDirectory = '<div class="div-img"><i class="fa fa-picture-o fa-5x"></i></div>';
if('undefined' != typeof directory.costum && notNull(directory.costum)
......@@ -121,33 +64,37 @@
typeEvent;
str += '</h5>';
}
str += v.localityHtml != '' ? '<div class="col-xs-12"><span class="h4 event-locality margin-left-5">'+v.localityHtml+'</span></div>' : '';
if('undefined' != typeof v.organizer && v.organizer != null){
var countOrganizer=Object.keys(v.organizer).length;
str += '<div class="col-xs-12 orgenizedby no-padding">';
str+='<span class="bold">'+tradDynForm.organizedby+' : </span>';
mylog.log("organizer",v.organizer);
$.each(v.organizer, function(e,v){
var imgIcon = (typeof v.profilThumbImageUrl != 'undefined' && v.profilThumbImageUrl!='' ) ? baseUrl+'/'+v.profilThumbImageUrl: assetPath + '/images/thumb/default_'+v.type+'.png';
str+='<a href="#page.type.'+v.type+'.id.'+e+'" class="lbh-preview-element tooltips" ';
if(countOrganizer>1) {
str+= 'data-toggle="tooltip" data-placement="top" title="'+v.name+'">';
str+='<img src="'+imgIcon+'" class="img-circle img-organizer margin-left-5" width="35" height="35"/>';
if (v.address.addressLocality != "Adresse non renseignée") {
str += '<div class="col-xs-12"><span class="h4 event-locality margin-left-5"><i class="fa fa-map-marker text-bold"></i> '+v.address.streetAddress+' '+v.address.postalCode+' '+v.address.addressLocality+'</span></div>';
}
var thisTags = '';
var countTagsInClass=0;
var countFourTags0nly = 1;
if(typeof v.tags != 'undefined' && v.tags != null){
$.each(v.tags, function(key, value){
if(typeof value != 'undefined' && value != '' && value != 'undefined'){
var tagTrad = typeof tradCategory[value] != 'undefined' ? tradCategory[value] : value;
//thisTags += '<li class="tag" data-tag-value="'+slugify(value, true)+'" data-tag-label="'+tagTrad+'">#' + tagTrad + '</li> ';
if(countFourTags0nly < 5 ){
thisTags += '<span class="badge bg-transparent btn-tag tag" data-tag-value="'+slugify(value, true)+'" data-tag-label="'+tagTrad+'">#' + tagTrad + '</span> ';
countFourTags0nly++;
}
if(countTagsInClass < 6){
v.containerClass += slugify(value, true)+' ';
countTagsInClass++;
}
}
});
if(countFourTags0nly >4 && (v.tags.length-4)!=0)
thisTags += '<span class="badge bg-transparent btn-tag tag">+ '+(v.tags.length-4)+'</span> ';
v.tagsHtml = thisTags;
}
if(notNull(v.shortDescription))
str += '<p class="event-short-description text-white col-xs-12 margin-top-10 margin-bottom-10">'+v.shortDescription+'</p>';
if(typeof v.tagsHtml != "undefined")
str += '<ul class="tag-list">'+v.tagsHtml+'</ul>';
if(countOrganizer==1) str+='><img src="'+imgIcon+'" class="img-circle img-organizer margin-left-5" width="35" height="35"/> '+v.name;
str+='</a>';
});
str+='</div>';
}
if(notNull(v.descriptionStr))
str += '<p class="event-short-description description col-xs-12 margin-top-10 margin-bottom-10">'+v.descriptionStr+'</p>';
if(typeof v.tagsHtml != "undefined")
str += '<ul class="tag-list">'+v.tagsHtml+'</ul>';
str += '<div class="margin-bottom-10 col-xs-12 no-padding event-bottom">' +
v.attendees +
'</div>';
str += '</div>';
str += '</div>';
......@@ -203,7 +150,6 @@
dyFObj.commonAfterSave(data, function(){
mylog.log("dataaaa", data);
urlCtrl.loadByHash(location.hash);
});
}
dyFObj.openForm('event',null, null,null,dyfEvent);
......
<?php
$keyTpl = "bloctextwithtitle";
$kunik = $keyTpl.(string)$blockCms["_id"];
$blockKey = $blockCms["_id"];
$paramsData = [
"title" => "Cet accompagnement vous permettra de :",
"titleAlign" => "left",
......
<?php
$blockKey = $blockCms["_id"];
$keyTpl ="textWithTitle";
$kunik = $keyTpl.(string)$blockCms["_id"];
$paramsData = [
"title" => "Lorem ipsum",
"subTitle" =>" Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ",
......
<?php
$keyTpl = "blockwithimg";
$kunik = $keyTpl.(string)$blockCms["_id"];
$blockKey = $blockCms["_id"];
$paramsData = [
"title" => "block avec une image",
"color" => "#000000",
......
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