Commit 1ef4c449 authored by Kgneo's avatar Kgneo
Browse files

share

parent 288954bb
......@@ -3558,6 +3558,8 @@ function initKInterface(params){ console.log("initKInterface");
});
}
$("#filter-thematic-menu").show(400);
// Floating label headings for the contact form
$(function() {
$("body").on("input propertychange", ".floating-label-form-group", function(e) {
......
......@@ -729,8 +729,10 @@ function initPageTable(number){
if($(".timeline-body .newsActivityStream"+id).length > 0)
html = $(".timeline-body .newsActivityStream"+id).html();
if(html == "" && $(".searchEntity#entity"+id).length > 0)
html = "<div class='searchEntity'>"+$(".searchEntity#entity"+id).html()+"</div>";
if(html == "" && $(".searchEntity#entity"+id).length > 0) {
var light = $(".searchEntity#entity"+id).hasClass("entityLight") ? "entityLight" : "";
html = "<div class='searchEntity "+light+"'>"+$(".searchEntity#entity"+id).html()+"</div>";
}
if(html == "" && type !="news" && type!="activityStream" && typeof contextData != "undefined"){
mylog.log("HERE", contextData);
......@@ -1019,7 +1021,7 @@ var directory = {
console.log("lightPanel", params);
str = "";
str += "<div class='col-xs-12 searchEntity entityLight no-padding'>";
str += "<div class='col-xs-12 searchEntity entityLight no-padding' id='entity"+params.id+"'>";
str += "<div class='entityLeft pull-left text-right padding-10 hidden-xs'>";
if(typeof params.hash != "undefined" && typeof params.imgProfil != "undefined")
......@@ -1062,20 +1064,19 @@ var directory = {
str += "<br><a href='"+params.url+"' class='lbh text-light url bold elipsis'>"+params.url+"</a>";
if(typeof params.startDate != "undefined")
str += "<br><small class='letter-light'>"+params.startDate+"</small>";
// if(typeof params.startDate != "undefined")
// str += "<br><small class='letter-light'>"+params.startDate+"</small>";
if(typeof params.startDate != "undefined" && typeof params.endDate != "undefined")
str += " <small class='letter-light'><i class='fa fa-angle-double-right'></i></small> ";
// if(typeof params.startDate != "undefined" && typeof params.endDate != "undefined")
// str += " <small class='letter-light'><i class='fa fa-angle-double-right'></i></small> ";
if(typeof params.endDate != "undefined")
str += "<small class='letter-light'>"+params.endDate+"</small>";
// if(typeof params.endDate != "undefined")
// str += "<small class='letter-light'>"+params.endDate+"</small>";
if(typeof params.updatedLbl != "undefined" && (params.type == "events" || params.type == "classified"))
str += "<br><small class='letter-light bold'><i class='fa fa-clock-o'></i> "+params.updatedLbl+"</small>";
if(typeof params.shortDescription != "undefined" && params.shortDescription != "" && params.shortDescription != null)
str += "<br><span class='description'>"+params.shortDescription+"</span>";
else if(typeof params.description != "undefined" && params.description != "" && params.description != null)
......@@ -1086,13 +1087,45 @@ var directory = {
if(typeof params.counts != "undefined"){
$.each(params.counts, function (key, count){
str += "<small class='lbh letter-light bg-white url elipsis bold countMembers margin-right-10'>"+
str += "<small class='pull-left lbh letter-light bg-transparent url elipsis bold countMembers margin-right-10'>"+
"<i class='fa fa-link'></i> "+ count + " " + trad[key] +
"</small>";
});
}
var addFollowBtn = ( $.inArray(params.type, ["news", "poi", "ressources", "classified"])>=0 ) ? false : true;
if(typeof params.edit != "undefined")
str += this.getAdminToolBar(params);
mylog.log("isFollowed ?", params.isFollowed, params.id, inMyContacts(params.typeSig, params.id),
addFollowBtn, location.hash.indexOf("#page") < 0);
if(userId != null && userId != "" && params.id != userId &&
!inMyContacts(params.typeSig, params.id) && addFollowBtn &&
location.hash.indexOf("#page") < 0){
isFollowed=false;
if(typeof params.isFollowed != "undefined" ) isFollowed=true;
mylog.log("isFollowed", params.isFollowed, isFollowed);
tip = (params.type == "events") ? trad["participate"] : trad['Follow'];
str += "<button class='pull-left text-light btn btn-link no-padding followBtn'" +
' data-toggle="tooltip" data-placement="left" data-original-title="'+tip+'"'+
" data-ownerlink='follow' data-id='"+params.id+"' data-type='"+params.type+"'"+
" data-name='"+params.name+"' data-isFollowed='"+isFollowed+"'>"+
"<small><i class='fa fa-link fa-rotate-270'></i> "+tip+"</small>"+
"</button>";
}
if(typeof params.id != "undefined" && typeof params.type != "undefined" && params.type != "citoyens" &&
userId != null && userId != "")
str += "<button id='btn-share-"+params.type+"' class='pull-left text-light btn btn-link no-padding btn-share'"+
" data-ownerlink='share' data-id='"+params.id+"' data-type='"+params.type+"'>"+
"<small><i class='fa fa-share'></i> "+trad["share"]+"</small></button> ";
str += "</div>";
str += "</div>";
......
......@@ -395,7 +395,11 @@
</div>
<?php } else if ( $typeSelected == "events" ){?>
<style type="text/css">
header{
padding-bottom:15px;
}
</style>
<div class="col-sm-2 col-md-2 col-xs-12 text-right margin-top-5 no-padding" id="col-btn-type-directory">
<!--<button class="btn text-black bg-white btn-directory-type btn-all" data-type-event="" data-type="events">
<i class="fa fa-search"></i>
......
......@@ -28,6 +28,7 @@
#modal-share .modal-content{
top: 150px;
padding-bottom:10px!important;
padding-top:15px;
}
#modal-share{
background-color: rgba(0,0,0,0.6);
......@@ -60,6 +61,11 @@
/*min-height: 250px !important;*/
max-height: 250px !important;
}
#modal-share .modal-content .entityLight .entityCenter{
}
</style>
<div class="modal fade portfolio-modal" id="modal-share"
......
......@@ -11,6 +11,8 @@
"displayShared-actions" => "an action",
"displayShared-resolutions" => "a resolution",
"displayShared-rooms" => "a cooperative space",
"displayShared-ressources" => "a need or a ressource",
"displayShared-places" => "a place",
); ?>
<div id="newsTagsScope<?php echo $key ?>" class="col-md-12 col-sm-12 col-xs-12">
......@@ -156,11 +158,11 @@
<?php if(@$media["type"]=="activityStream") { ?>
<?php $iconColor = @Element::getColorIcon($media["object"]["type"]); ?>
<i class="fa fa-plus-circle"></i> <?php echo Yii::t("news",$shareLabel["verb-".$media["verb"].$pluriel]); ?>
<i class="fa fa-plus-circle"></i> <?php echo Yii::t("news",@$shareLabel["verb-".$media["verb"].$pluriel]); ?>
<span class="text-<?php echo @$iconColor; ?>">
<a href="#page.type.<?php echo @$media["object"]["type"]; ?>.id.<?php echo @$media["object"]["id"]; ?>"
class="lbh">
<?php echo Yii::t("common", $shareLabel["displayShared-".@$media["object"]["type"]]); ?>
<?php echo Yii::t("common", @$shareLabel["displayShared-".@$media["object"]["type"]]); ?>
</a>
</span>
<?php if(@$media["object"]["type"] == "news"){ ?>
......
......@@ -286,6 +286,7 @@ var trad = {
"hasgot":"<?php echo Yii::t("common","has got")?>",
"ismemberof":"<?php echo Yii::t("common","is member of")?>",
"contributeto":"<?php echo Yii::t("common","contributes to")?>",
"contribute":"<?php echo Yii::t("common","contribute")?>",
"of":"<?php echo Yii::t("common","of")?>",
"need":"<?php echo Yii::t("common","need")?>",
"pointinterest" : "<?php echo Yii::t("common","point of interest") ?>",
......
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