diff --git a/assets/js/co.js b/assets/js/co.js index 5e625ebb873fe093eba9717edf2651a2f07cbbc4..7f6bf67ac2c7925e398f496607788f7065232316 100755 --- a/assets/js/co.js +++ b/assets/js/co.js @@ -4573,7 +4573,7 @@ var smallMenu = { if (content) smallMenu.content(content); else - smallMenu.content("<i class='fa fa-spin fa-refresh fa-4x'></i>"); + smallMenu.content("<i class='fa fa-spin fa-refresh fa-4x' style='margin-left: 30vw;margin-top: 12vh;margin-bottom: 10vh;'></i>"); } $(".blockPage").addClass(smallMenu.destination.slice(1)); diff --git a/assets/js/default/directory.js b/assets/js/default/directory.js index 70c3cd11b5b8fa9f701f6d5ff9946ba252f84122..bf5ac1d0bcde7ec54d63009bcaab032ac40ba96d 100755 --- a/assets/js/default/directory.js +++ b/assets/js/default/directory.js @@ -2799,9 +2799,12 @@ var directory = { var childType = "citoyens"; var name = $(this).attr("data-name"); var id = $(this).attr("data-id"); + var type = $(this).attr("data-type"); var isFromActivityPub = $(this).attr("data-isfromactivitypub"); var action = $(this).attr("data-action"); var payload = $(this).attr("data-payload"); + var labelconnect = $(this).attr("data-labelconnect"); + var labeldisconnect = $(this).attr("data-labeldisconnect"); var connectType = (parentType == "events") ? "connect" : "follow"; var actionData = { "childId": childId, @@ -2820,10 +2823,11 @@ var directory = { if ($(this).attr("data-ownerlink") == "follow") { callback = function () { //toastr.success(data.msg); - labelLink = (parentType == "events") ? trad.alreadyAttendee : trad.alreadyFollow; + labelLink = (labeldisconnect)?labeldisconnect:(parentType == "events") ? "<i class='fa fa-unlink'></i> " +trad.alreadyAttendee : "<i class='fa fa-unlink'></i> " +trad.alreadyFollow; + if (thiselement.hasClass("btn-add-to-directory")) labelLink = ""; - thiselement.html("<small><i class='fa fa-unlink'></i> " + labelLink + "</small>"); + thiselement.html("<small>" + labelLink + "</small>"); thiselement.addClass("active"); thiselement.attr("data-ownerlink", "unfollow"); thiselement.attr("data-original-title", labelLink); @@ -2870,10 +2874,10 @@ var directory = { else if ($(this).attr("data-ownerlink") == "unfollow") { connectType = (parentType == "events") ? "attendees" : "followers"; callback = function () { - labelLink = (parentType == "events") ? trad.participate : trad.Follow; + labelLink = (labelconnect)?labelconnect:(parentType == "events") ? "<i class='fa fa-chain'></i> " +trad.participate : "<i class='fa fa-chain'></i> " +trad.Follow; if (thiselement.hasClass("btn-add-to-directory")) labelLink = ""; - $(thiselement).html("<small><i class='fa fa-chain'></i> " + labelLink + "</small>"); + $(thiselement).html("<small>" + labelLink + "</small>"); $(thiselement).attr("data-ownerlink", "follow"); $(thiselement).attr("data-original-title", labelLink); $(thiselement).removeClass("text-white");