Commit 32e2577d authored by Raph El's avatar Raph El
Browse files

Hotfix

parent 38d0c686
......@@ -2537,13 +2537,13 @@ var directory = {
//mylog.log("-----------idParentRoom", idParentRoom);
var name = (typeof params.title != "undefined" && params.title != "undefined") ? params.title : params.name;
var description = "";
if(typeof params.description != "undefined" ){
description = params.description.length > 200 ? params.description.substr(0, 200) + "..." : params.description;
description = description.replace(/\n/g,"<br>");
//add Markdown
description = dataHelper.markdownToHtml(description);
}
// var description = "";
// if(typeof params.description != "undefined" ){
// description = params.description.length > 200 ? params.description.substr(0, 200) + "..." : params.description;
// description = description.replace(/\n/g,"<br>");
// //add Markdown
// description = dataHelper.markdownToHtml(description);
// }
name = escapeHtml(name);
var thisId = typeof params["_id"] != "undefined" &&
typeof params["_id"]["$id"] != "undefined" ? params["_id"]["$id"] :
......@@ -2578,12 +2578,13 @@ var directory = {
str += "<a href='javascript:;' "+linkParams+" class='margin-bottom-10 all-coop-detail-desc"+ thisId + " openCoopPanelHtml container-img-profil'>" + params.imgMediumProfil +"</a>";
// OPEN PANEL BTN
str += "<button class='btn btn-sm btn-default pull-right openCoopPanelHtml bold letter-turq' "+linkParams+
"><i class='fa fa-chevron-right'></i> <span class='hidden-xs'>"+trad.Open+"</span></button>";
// str += "<button class='btn btn-sm btn-default pull-right openCoopPanelHtml bold letter-turq' "+linkParams+
// "><i class='fa fa-chevron-right'></i> <span class='hidden-xs'>"+trad.Open+"</span></button>";
// NAME
if(name != "")
str += '<h4 class="panel-title letter-turq"><i class="fa '+ params.ico + '"></i> '+ name + '</h4>';
str += '<a href="javascript:;" class="openCoopPanelHtml" style="text-decoration:none;" '+linkParams+'>'+
'<h4 class="panel-title letter-turq"><i class="fa '+ params.ico + '"></i> '+ name + '</h4></a>';
// STATE OF THE PROPOSAL
......@@ -2605,10 +2606,10 @@ var directory = {
else if((params.status == "tovote" || params.status == "amendementAndVote") && params.hasVote !==false)
str += '<small class="margin-left-15"><i class="fa fa-thumbs-up"></i> '+trad["You did vote"]+'</small>';
if(params.chat)
str += '<a href="javascript:" '+linkParams+' data-coop-section="comments" class="openCoopPanelHtml btn btn-xs btn-default tooltips pull-right text-dark" data-toggle="tooltip" data-placement="top" data-original-title="'+tradDynForm.chat+'"><i class="fa fa-comments" ></i></a> ';
if(params.invite)
str += ' <a href="javascript:" data-coop-id="'+ thisId + '" class="btn btn-xs btn-default tooltips pull-right text-azure " data-toggle="tooltip" data-placement="top" data-original-title="'+trad.invitesomeone+'"><i class="fa fa-bullhorn"></i></a>';
// if(params.chat)
// str += '<a href="javascript:" '+linkParams+' data-coop-section="comments" class="openCoopPanelHtml btn btn-xs btn-default tooltips pull-right text-dark" data-toggle="tooltip" data-placement="top" data-original-title="'+tradDynForm.chat+'"><i class="fa fa-comments" ></i></a> ';
// if(params.invite)
// str += ' <a href="javascript:" data-coop-id="'+ thisId + '" class="btn btn-xs btn-default tooltips pull-right text-azure " data-toggle="tooltip" data-placement="top" data-original-title="'+trad.invitesomeone+'"><i class="fa fa-bullhorn"></i></a>';
str += '</h5>';
}
......@@ -2620,8 +2621,12 @@ var directory = {
str += '<div class="all-coop-detail-desc'+ thisId + '">';
// DESCRIPTION
if(description != "") str += '<hr>';
str += '<span class="col-xs-12 no-padding text-dark descMD">'+description+'</span>';
// if(description != "") str += '<hr>';
// str += '<span class="col-xs-12 no-padding text-dark descMD">'+description+'</span>';
if( typeof params.shortDescription != "undefined" && params.shortDescription != ""){
str += '<hr>';
str += '<span class="col-xs-12 no-padding text-dark descMD">'+params.shortDescription+'</span>';
}
//SHOW HIDE VOTE BTNs
var btnSize = (params.status == "amendementAndVote") ? "6" : "12";
......@@ -3034,7 +3039,10 @@ var directory = {
// '<span>'+tradDynForm.createsurvey+'</span>'+
// '</a>';
// }
if(!notNull(custom) || typeof custom.directory == "undefined" || typeof custom.directory.viewMode == "undefined"){
if( typeof custom == "undefined" || custom == null ||
typeof custom.directory == "undefined" ||
typeof custom.directory.viewMode == "undefined" ) {
headerStr+='<button class="btn switchDirectoryView ';
if(directory.viewMode=="list") headerStr+='active ';
headerStr+= 'margin-right-5" data-value="list"><i class="fa fa-bars"></i></button>'+
......@@ -3045,8 +3053,13 @@ var directory = {
if(userId!="" && searchObject.initType=="classifieds"){
headerStr+='<button class="btn btn-default letter-blue addToAlert margin-left-5 tooltips" data-toggle="tooltip" data-placement="bottom" title="'+trad.bealertofnewitems+'" data-value="list" onclick="directory.addToAlert();"><i class="fa fa-bell"></i> <span class="hidden-xs">'+trad.alert+'</span></button>';
}
if(typeof themeParams != "undefined" && themeParams.appRendering !="undefined" && themeParams.appRendering=="vertical" &&
!notNull(custom) || typeof custom.directory == "undefined" || typeof custom.directory.map == "undefined" || custom.directory.map){
if( typeof themeParams != "undefined" &&
themeParams.appRendering !="undefined" &&
themeParams.appRendering=="vertical" &&
( typeof custom == "undefined" || custom == null ||
typeof custom.directory == "undefined" ||
typeof custom.directory.map == "undefined" ||
custom.directory.map ) ) {
headerStr+= '<button class="btn-show-map hidden-xs" style="" title="'+trad.showthemap+'" alt="'+trad.Showthemap+'">'+
'<i class="fa fa-map-marker"></i> Carte'+
'</button>';
......
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