Commit 67769575 authored by Tibor Katelbach's avatar Tibor Katelbach

Merge remote-tracking branch 'origin/master'

parents 4ca8330f c0a6258b
...@@ -2583,10 +2583,59 @@ var directory = { ...@@ -2583,10 +2583,59 @@ var directory = {
// "><i class='fa fa-chevron-right'></i> <span class='hidden-xs'>"+trad.Open+"</span></button>"; // "><i class='fa fa-chevron-right'></i> <span class='hidden-xs'>"+trad.Open+"</span></button>";
// NAME // NAME
if(name != "") if(name != ""){
str += '<a href="javascript:;" class="openCoopPanelHtml" style="text-decoration:none;" '+linkParams+'>'+ 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>'; '<h4 class="panel-title tooltips letter-turq" data-toggle="tooltip" data-placement="top" data-original-title="'+name+'">'+
'<i class="fa '+ params.ico + '"></i> '+
( (name.length > 140) ? name.substring(0,30)+"..." : name ) + '</h4></a>';
}
// if( typeof params.producer != "undefined" &&
// params.producer != null &&
// Object.keys(params.producer).length > 0 ) {
// var count = Object.keys(params.producer).length ;
// str += trad.proposedBy + " ";
// $.each(params.producer, function(kProd,valProd){
// var heightImg = ( count > 1 ) ? 35 : 25;
// var imgPath = assetPath+'/images/thumb/default_'+valProd.type+'.png';
// if(typeof valProd.profilThumbImageUrl != "undefined" && valProd.profilThumbImageUrl != null){
// imgPath = "/ph"+valProd.profilThumbImageUrl ;
// }
// str += '<img src="'+imgPath+'" class="img-circle" width="'+heightImg+'" height="'+heightImg+'" />';
// str += " "+valProd.name + " " ;
// });
// }
if( typeof params.producer != "undefined" &&
params.producer != null &&
Object.keys(params.producer).length > 0 ) {
count=Object.keys(params.producer).length;
htmlAbout="";
$.each(params.producer, function(e, v){
heightImg=(count>1) ? 35 : 25;
imgIcon = (typeof v.profilThumbImageUrl != "undefined" && v.profilThumbImageUrl!="" ) ? baseUrl+"/"+v.profilThumbImageUrl: assetPath + "/images/thumb/default_"+v.type+".png";
// htmlAbout+='<a href="#page.type.'+v.type+'.id.'+e+'" class="lbh tooltips" target="_blank" ';
// if(count>1) htmlAbout+= 'data-toggle="tooltip" data-placement="left" title="'+v.name+'"';
// htmlAbout+=">"+
htmlAbout+='<span ';
if(count>1) htmlAbout+= 'data-toggle="tooltip" data-placement="left" title="'+v.name+'"';
htmlAbout+=">"+
'<img src="'+imgIcon+'" class="img-circle margin-right-10" width='+heightImg+' height='+heightImg+' />';
if(count==1) htmlAbout+=v.name;
//htmlAbout+="</a>";
htmlAbout+="</span>";
});
htmlHeader = ((params.type == typeObj.event.col) ? trad["Planned on"] : tradCategory.carriedby ) ;
htmlHeader += " : "+htmlAbout;
str += htmlHeader;
}
// STATE OF THE PROPOSAL // STATE OF THE PROPOSAL
console.log("hasVote ? ", params.hasVote ); console.log("hasVote ? ", params.hasVote );
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
"#dda": { "#dda": {
"inMenu" : true, "inMenu" : true,
"useHeader" : true, "useHeader" : true,
"useFilter" : true, "useFilter" : {"scope":true, "filters":false},
"open" : true, "open" : true,
"subdomain" : "dda", "subdomain" : "dda",
"subdomainName" : "Agora Citoyenne", "subdomainName" : "Agora Citoyenne",
......
...@@ -156,17 +156,20 @@ function initMenuReference(){ ...@@ -156,17 +156,20 @@ function initMenuReference(){
$(".sourceFilter").off().on("click", function(){ $(".sourceFilter").off().on("click", function(){
searchAdmin.mode="source"; searchAdmin.mode="source";
searchAdmin.page=0; searchAdmin.page=0;
searchAdmin.text=null;
startAdminSearch(true); startAdminSearch(true);
}); });
$(".referenceFilter").off().on("click", function(){ $(".referenceFilter").off().on("click", function(){
searchAdmin.mode="reference"; searchAdmin.mode="reference";
searchAdmin.page=0; searchAdmin.page=0;
searchAdmin.text=null;
startAdminSearch(true); startAdminSearch(true);
}); });
$(".searchOpenFilter").off().on("click", function(){ $(".searchOpenFilter").off().on("click", function(){
searchAdmin.mode="open"; searchAdmin.mode="open";
searchAdmin.page=0; searchAdmin.page=0;
searchAdmin.text=null;
startAdminSearch(true); startAdminSearch(true);
}); });
} }
...@@ -178,14 +181,11 @@ function initPageTable(number){ ...@@ -178,14 +181,11 @@ function initPageTable(number){
currentPage: 1, currentPage: 1,
hrefTextPrefix:"?page=", hrefTextPrefix:"?page=",
cssStyle: 'light-theme', cssStyle: 'light-theme',
//prevText: '<span aria-hidden="true">&laquo;</span>',
//nextText: '<span aria-hidden="true">&raquo;</span>',
onInit: function () { onInit: function () {
// fire first page loading // fire first page loading
}, },
onPageClick: function (page, evt) { onPageClick: function (page, evt) {
// some code // some code
//alert(page);
searchAdmin.page=(page-1); searchAdmin.page=(page-1);
startAdminSearch(); startAdminSearch();
} }
......
...@@ -584,6 +584,7 @@ var trad = { ...@@ -584,6 +584,7 @@ var trad = {
"generaltermsofuse": "<?php echo Yii::t("common","general terms of use") ?>", "generaltermsofuse": "<?php echo Yii::t("common","general terms of use") ?>",
"yourcommentisempty": "<?php echo Yii::t("comment","Your comment is empty") ?>", "yourcommentisempty": "<?php echo Yii::t("comment","Your comment is empty") ?>",
"manageby": "<?php echo Yii::t("common","Manage by") ?>", "manageby": "<?php echo Yii::t("common","Manage by") ?>",
"proposedBy" : "<?php echo Yii::t("common","Proposed by") ?>",
}; };
var tradDynForm = { var tradDynForm = {
......
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