From af458a25e698669df7912200a1322c4380988aa3 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 24 Mar 2024 00:28:18 +0300 Subject: [PATCH] feat(login): tooltip on login button --- javascripts/yeswiki-base.js | 1146 +++++++++-------- tools/login/lang/login_fr.inc.php | 5 +- tools/login/templates/modal.twig | 4 +- tools/templates/actions/buttondropdown.php | 28 +- .../templates/moteurrecherche_button.tpl.html | 10 +- 5 files changed, 625 insertions(+), 568 deletions(-) diff --git a/javascripts/yeswiki-base.js b/javascripts/yeswiki-base.js index 3b59f004e..4bc2a212e 100755 --- a/javascripts/yeswiki-base.js +++ b/javascripts/yeswiki-base.js @@ -2,110 +2,106 @@ const DATATABLE_OPTIONS = { // responsive: true, paging: false, language: { - sProcessing: _t('DATATABLES_PROCESSING'), - sSearch: _t('DATATABLES_SEARCH'), - sLengthMenu: _t('DATATABLES_LENGTHMENU'), - sInfo: _t('DATATABLES_INFO'), - sInfoEmpty: _t('DATATABLES_INFOEMPTY'), - sInfoFiltered: _t('DATATABLES_INFOFILTERED'), - sInfoPostFix: '', - sLoadingRecords: _t('DATATABLES_LOADINGRECORDS'), - sZeroRecords: _t('DATATABLES_ZERORECORD'), - sEmptyTable: _t('DATATABLES_EMPTYTABLE'), + sProcessing: _t("DATATABLES_PROCESSING"), + sSearch: _t("DATATABLES_SEARCH"), + sLengthMenu: _t("DATATABLES_LENGTHMENU"), + sInfo: _t("DATATABLES_INFO"), + sInfoEmpty: _t("DATATABLES_INFOEMPTY"), + sInfoFiltered: _t("DATATABLES_INFOFILTERED"), + sInfoPostFix: "", + sLoadingRecords: _t("DATATABLES_LOADINGRECORDS"), + sZeroRecords: _t("DATATABLES_ZERORECORD"), + sEmptyTable: _t("DATATABLES_EMPTYTABLE"), oPaginate: { - sFirst: _t('FIRST'), - sPrevious: _t('PREVIOUS'), - sNext: _t('NEXT'), - sLast: _t('LAST') + sFirst: _t("FIRST"), + sPrevious: _t("PREVIOUS"), + sNext: _t("NEXT"), + sLast: _t("LAST"), }, oAria: { - sSortAscending: _t('DATATABLES_SORTASCENDING'), - sSortDescending: _t('DATATABLES_SORTDESCENDING') - } + sSortAscending: _t("DATATABLES_SORTASCENDING"), + sSortDescending: _t("DATATABLES_SORTDESCENDING"), + }, }, fixedHeader: { header: true, - footer: false + footer: false, }, dom: - "<'row'<'col-sm-6'l><'col-sm-6'f>>" - + "<'row'<'col-sm-12'tr>>" - + "<'row'<'col-sm-6'i><'col-sm-6'<'pull-right'B>>>", + "<'row'<'col-sm-6'l><'col-sm-6'f>>" + + "<'row'<'col-sm-12'tr>>" + + "<'row'<'col-sm-6'i><'col-sm-6'<'pull-right'B>>>", buttons: [ { - extend: 'copy', - className: 'btn btn-default', - text: ` ${_t('COPY')}` + extend: "copy", + className: "btn btn-default", + text: ` ${_t("COPY")}`, }, { - extend: 'csv', - className: 'btn btn-default', - text: ' CSV' + extend: "csv", + className: "btn btn-default", + text: ' CSV', }, { - extend: 'print', - className: 'btn btn-default', - text: ` ${_t('PRINT')}` - } + extend: "print", + className: "btn btn-default", + text: ` ${_t("PRINT")}`, + }, // { // extend: 'colvis', // text: _t('DATATABLES_COLS_TO_DISPLAY') // }, - ] -} + ], +}; function toastMessage( message, duration = 3000, - toastClass = 'alert alert-secondary-1' + toastClass = "alert alert-secondary-1", ) { const $toast = $( - `
${ - message - }
` - ) - $('body').after($toast) - $toast.css('top', `${$('#yw-topnav').outerHeight(true) + 20}px`) - $toast.css('opacity', 1) + `
${message}
`, + ); + $("body").after($toast); + $toast.css("top", `${$("#yw-topnav").outerHeight(true) + 20}px`); + $toast.css("opacity", 1); setTimeout(() => { - $toast.css('opacity', 0) - }, duration) + $toast.css("opacity", 0); + }, duration); setTimeout(() => { - $toast.remove() - }, duration + 300) - $toast.addClass('visible') + $toast.remove(); + }, duration + 300); + $toast.addClass("visible"); } // polyfill placeholder -(function($) { +(function ($) { // gestion des classes actives pour les menus - $('a.active-link') + $("a.active-link") .parent() - .addClass('active-list') - .parents('ul') - .prev('a') - .addClass('active-parent-link') + .addClass("active-list") + .parents("ul") + .prev("a") + .addClass("active-parent-link") .parent() - .addClass('active-list') + .addClass("active-list"); // fenetres modales function openModal(e) { - e.stopPropagation() - e.preventDefault() - const $this = $(this) - let text = $this.attr('title') || '' - const size = ` ${$this.data('size')}` - const iframe = $this.data('iframe') + e.stopPropagation(); + e.preventDefault(); + const $this = $(this); + let text = $this.attr("title") || ""; + const size = ` ${$this.data("size")}`; + const iframe = $this.data("iframe"); if (text.length > 0) { - text = `

${$.trim(text)}

` + text = `

${$.trim(text)}

`; } else { - text = '

' + text = "

"; } - let $modal = $('#YesWikiModal') + let $modal = $("#YesWikiModal"); const yesWikiModalHtml = ` -
+
@@ -114,748 +110,806 @@ function toastMessage(
-
` +
`; - if ($modal.length == 0) { - $('body').append(``) - $modal = $('#YesWikiModal') + if ($modal.length === 0) { + $("body").append( + ``, + ); + $modal = $("#YesWikiModal"); } else { - $modal.html(yesWikiModalHtml) + $modal.html(yesWikiModalHtml); } - let link = $this.attr('href') + let link = $this.attr("href"); if (/\.(gif|jpg|jpeg|tiff|png)$/i.test(link)) { $modal - .find('.modal-body') + .find(".modal-body") .html( - `image` - ) + `image`, + ); } else if (iframe === 1) { - const modalTitle = $modal.find('.modal-header h3') + const modalTitle = $modal.find(".modal-header h3"); if (modalTitle.length > 0) { - if (modalTitle[0].innerText == 0) { - modalTitle[0].innerHTML = `${link.substr(0, 128)}` + if (modalTitle[0].innerText === 0) { + modalTitle[0].innerHTML = `${link.substr(0, 128)}`; } else { - modalTitle[0].innerHTML = `${modalTitle[0].innerText}` + modalTitle[0].innerHTML = `${modalTitle[0].innerText}`; } } $modal - .find('.modal-body') + .find(".modal-body") .html( - '' - + `` - ) - $('#yw-modal-iframe').on('load', () => { - $('#yw-modal-loading').hide() - }) + '' + + ``, + ); + $("#yw-modal-iframe").on("load", () => { + $("#yw-modal-loading").hide(); + }); } else { // incomingurl can be usefull (per example for deletepage handler) try { - const url = document.createElement('a') - url.href = link - const queryString = url.search - if (!queryString || queryString.length == 0) { - var separator = '?' + const url = document.createElement("a"); + url.href = link; + const queryString = url.search; + let separator; + if (!queryString || queryString.length === 0) { + separator = "?"; } else { - var separator = '&' + separator = "&"; } - link - += `${separator - }incomingurl=${ - encodeURIComponent(window.location.toString())}` - } catch (e) {} + link += `${separator}incomingurl=${encodeURIComponent( + window.location.toString(), + )}`; + } catch (er) { + console.error(er); + } // AJAX Request for javascripts - const xhttp = new XMLHttpRequest() - xhttp.onreadystatechange = function() { - if (this.readyState == 4 && this.status == 200) { - const xmlString = this.responseText - const doc = new DOMParser().parseFromString(xmlString, 'text/html') + const xhttp = new XMLHttpRequest(); + xhttp.onreadystatechange = function () { + if (this.readyState === 4 && this.status === 200) { + const xmlString = this.responseText; + const doc = new DOMParser().parseFromString(xmlString, "text/html"); // find scripts - const res = doc.scripts - var l = res.length - var i + const res = doc.scripts; + let l = res.length; + let i; for (i = 0; i < l; i++) { - const src = res[i].getAttribute('src') + const src = res[i].getAttribute("src"); if (src) { - var selection = document.querySelectorAll( - `script[src="${src}"]` - ) + var selection = document.querySelectorAll(`script[src="${src}"]`); if (!selection || selection.length == 0) { // append script and load it only if not present - document.body.appendChild(document.importNode(res[i])) - $.getScript(src) + document.body.appendChild(document.importNode(res[i])); + $.getScript(src); } } else { - const script = res[i].innerHTML + const script = res[i].innerHTML; // select all script of current page without src - var selection = document.scripts - const selLenght = selection.length - var j + var selection = document.scripts; + const selLenght = selection.length; + var j; for (j = 0; j < selLenght; j++) { if ( - !selection[j].hasAttribute('src') - && script != selection[j].innerHTML + !selection[j].hasAttribute("src") && + script != selection[j].innerHTML ) { - const newScript = document.importNode(res[i]) - document.body.appendChild(newScript) + const newScript = document.importNode(res[i]); + document.body.appendChild(newScript); } } } } // find css - const importedCSS = doc.querySelectorAll('link[rel="stylesheet"]') - var l = importedCSS.length - var i - for (i = 0; i < l; i++) { - const href = importedCSS[i].getAttribute('href') + const importedCSS = doc.querySelectorAll('link[rel="stylesheet"]'); + const le = importedCSS.length; + for (i = 0; i < le; i++) { + const href = importedCSS[i].getAttribute("href"); if (href) { - var selection = document.querySelector( - `link[href="${href}"]` - ) - if (!selection || selection.length == 0) { + var selection = document.querySelector(`link[href="${href}"]`); + if (!selection || selection.length === 0) { // append link - document.body.appendChild(document.importNode(importedCSS[i])) + document.body.appendChild(document.importNode(importedCSS[i])); } } } // AJAX Request for content - $modal - .find('.modal-body') - .load(`${link} .page`, (response, status, xhr) => { - $(document).trigger('yw-modal-open') - return false - }) + $modal.find(".modal-body").load(`${link} .page`, () => { + $(document).trigger("yw-modal-open"); + return false; + }); } - } - xhttp.open('GET', link, true) - xhttp.send() + }; + xhttp.open("GET", link, true); + xhttp.send(); } $modal .modal({ keyboard: false }) - .modal('show') - .on('hidden hidden.bs.modal', () => { - $modal.remove() - }) + .modal("show") + .on("hidden hidden.bs.modal", () => { + $modal.remove(); + }); - return false + return false; } - $(document).on('click', 'a.modalbox, a.modal, .modalbox a', openModal) + $(document).on("click", "a.modalbox, a.modal, .modalbox a", openModal); - $(document).on('click', 'a.newtab', function(e) { - e.preventDefault() - window.open($(this).attr('href'), '_blank') - }) + $(document).on("click", "a.newtab", function (e) { + e.preventDefault(); + window.open($(this).attr("href"), "_blank"); + }); // on change l'icone de l'accordeon - $('.accordion-trigger').on('click', function() { - if ($(this).next().find('.collapse').hasClass('in')) { - $(this).find('.arrow').html('►') + $(".accordion-trigger").on("click", function () { + if ($(this).next().find(".collapse").hasClass("in")) { + $(this).find(".arrow").html("►"); } else { - $(this).find('.arrow').html('▼') + $(this).find(".arrow").html("▼"); } - }) + }); // on enleve la fonction doubleclic dans des cas ou cela pourrait etre indesirable - $('.no-dblclick, form, .page a, button, .dropdown-menu').on( - 'dblclick', - (e) => false - ) + $(".no-dblclick, form, .page a, button, .dropdown-menu").on( + "dblclick", + (e) => false, + ); // deplacer les fenetres modales en bas de body pour eviter que des styles s'appliquent - $('.modal').appendTo(document.body) + $(".modal").appendTo(document.body); // Remove hidden div by ACL - $('.remove-this-div-on-page-load').remove() - + $(".remove-this-div-on-page-load").remove(); /* tooltips */ - $("[data-toggle='tooltip']").tooltip() + $("[data-toggle='tooltip']").tooltip(); + $("[data-tooltip='tooltip']").tooltip(); // moteur de recherche utilisé dans un template - $('a[href="#search"]').on('click', function(e) { - e.preventDefault() - $(this).siblings('#search').addClass('open') - $(this).siblings('#search').find('.search-query').focus() - }) + $('a[href="#search"]').on("click", function (e) { + e.preventDefault(); + $(this).siblings("#search").addClass("open"); + $(this).siblings("#search").find(".search-query").focus(); + }); - $('#search, #search button.close-search').on('click keyup', function(e) { + $("#search, #search button.close-search").on("click keyup", function (e) { if ( - e.target == this - || $(e.target).hasClass('close-search') - || e.keyCode == 27 + e.target == this || + $(e.target).hasClass("close-search") || + e.keyCode == 27 ) { - $(this).removeClass('open') + $(this).removeClass("open"); } - }) + }); // se souvenir des tabs navigués - $.fn.historyTabs = function() { - const that = this - window.addEventListener('popstate', (event) => { + $.fn.historyTabs = function () { + const that = this; + window.addEventListener("popstate", (event) => { if (event.state) { - $(that) - .filter(`[href="${event.state.url}"]`) - .tab('show') + $(that).filter(`[href="${event.state.url}"]`).tab("show"); } - }) - return this.each(function(index, element) { - $(element).on('show.bs.tab', function() { - const stateObject = { url: $(this).attr('href') } + }); + return this.each(function (index, element) { + $(element).on("show.bs.tab", function () { + const stateObject = { url: $(this).attr("href") }; if (window.location.hash && stateObject.url !== window.location.hash) { window.history.pushState( stateObject, document.title, - window.location.pathname - + window.location.search - + $(this).attr('href') - ) + window.location.pathname + + window.location.search + + $(this).attr("href"), + ); } else { window.history.replaceState( stateObject, document.title, - window.location.pathname - + window.location.search - + $(this).attr('href') - ) + window.location.pathname + + window.location.search + + $(this).attr("href"), + ); } - }) - if (!window.location.hash && $(element).is('.active')) { + }); + if (!window.location.hash && $(element).is(".active")) { // Shows the first element if there are no query parameters. - $(element).tab('show') - } else if ($(this).attr('href') === window.location.hash) { - $(element).tab('show') + $(element).tab("show"); + } else if ($(this).attr("href") === window.location.hash) { + $(element).tab("show"); } - }) - } - $('a[data-toggle="tab"]').historyTabs() + }); + }; + $('a[data-toggle="tab"]').historyTabs(); // double clic - $('.navbar').on('dblclick', function(e) { - e.stopPropagation() - $('body').append( - '' - ) - - const $editmodal = $('#YesWikiModal') + $(".navbar").on("dblclick", function (e) { + e.stopPropagation(); + $("body").append( + '", + ); + + const $editmodal = $("#YesWikiModal"); $(this) - .find('.include') - .each(function() { + .find(".include") + .each(function () { const href = $(this) - .attr('ondblclick') - .replace("document.location='", '') - .replace("';", '') + .attr("ondblclick") + .replace("document.location='", "") + .replace("';", ""); const pagewiki = href - .replace('/edit', '') - .replace('http://yeswiki.dev/wakka.php?wiki=', '') + .replace("/edit", "") + .replace("http://yeswiki.dev/wakka.php?wiki=", ""); $editmodal - .find('.modal-body') + .find(".modal-body") .append( - `` - + ` ${ - _t('YESWIKIMODAL_EDIT_MSG') - } ${ - pagewiki - }` - ) - }) + `` + + ` ${_t( + "YESWIKIMODAL_EDIT_MSG", + )} ${pagewiki}`, + ); + }); $editmodal - .find('.modal-body') + .find(".modal-body") .append( - `${ - +_t('EDIT_OUPS_MSG') - }` - ) + `${+_t( + "EDIT_OUPS_MSG", + )}`, + ); $editmodal .modal({ keyboard: true }) - .modal('show') - .on('hidden hidden.bs.modal', () => { - $editmodal.remove() - }) + .modal("show") + .on("hidden hidden.bs.modal", () => { + $editmodal.remove(); + }); - return false - }) + return false; + }); // AUTO RESIZE IFRAME - const iframes = $('iframe.auto-resize') + const iframes = $("iframe.auto-resize"); if (iframes.length > 0) { - $.getScript('javascripts/vendor/iframe-resizer/iframeResizer.min.js') + $.getScript("javascripts/vendor/iframe-resizer/iframeResizer.min.js") .done((script, textStatus) => { - iframes.iFrameResize() + iframes.iFrameResize(); }) .fail((jqxhr, settings, exception) => { console.log( - 'Error getting script javascripts/vendor/iframe-resizer/iframeResizer.min.js', - exception - ) - }) + "Error getting script javascripts/vendor/iframe-resizer/iframeResizer.min.js", + exception, + ); + }); } // get the html from a yeswiki page function getText(url, link) { - let html + let html; $.get(url, (data) => { - html = data + html = data; }).done(() => { - link.attr('data-content', html) - }) + link.attr("data-content", html); + }); } - $('.modalbox-hover').each(function(index) { - getText(`${$(this).attr('href')}/html`, $(this)) - }) - $('.modalbox-hover').popover({ - trigger: 'hover', + $(".modalbox-hover").each(function (index) { + getText(`${$(this).attr("href")}/html`, $(this)); + }); + $(".modalbox-hover").popover({ + trigger: "hover", html: true, // permet d'utiliser du html - placement: 'right' // position de la popover (top ou bottom ou left ou right) - }) + placement: "right", // position de la popover (top ou bottom ou left ou right) + }); // ouvrir les liens dans une nouvelle fenetre - $('.new-window').attr('target', '_blank') - $(document).on('yw-modal-open', () => { - $('.new-window:not([target])').attr('target', '_blank') - }) + $(".new-window").attr("target", "_blank"); + $(document).on("yw-modal-open", () => { + $(".new-window:not([target])").attr("target", "_blank"); + }); // acl switch - $('#acl-switch-mode') - .change(function() { - if ($(this).prop('checked')) { + $("#acl-switch-mode") + .change(function () { + if ($(this).prop("checked")) { // show advanced - $('.acl-simple').hide().val(null) - $('.acl-advanced').slideDown() + $(".acl-simple").hide().val(null); + $(".acl-advanced").slideDown(); } else { - $('.acl-single-container label').each(function() { - $(this).after($(`select[name=${$(this).data('input')}]`)) - }) - $('.acl-simple').show() - $('.acl-advanced').hide().val(null) + $(".acl-single-container label").each(function () { + $(this).after($(`select[name=${$(this).data("input")}]`)); + }); + $(".acl-simple").show(); + $(".acl-advanced").hide().val(null); } }) - .trigger('change') + .trigger("change"); // tables - if (typeof $('.table').DataTable === 'function') { - $('.table:not(.prevent-auto-init)').DataTable(DATATABLE_OPTIONS) + if (typeof $(".table").DataTable === "function") { + $(".table:not(.prevent-auto-init)").DataTable(DATATABLE_OPTIONS); } /** comments */ - const $comments = $('.yeswiki-page-comments, #post-comment') + const $comments = $(".yeswiki-page-comments, #post-comment"); // ajax post comment - $comments.on('click', '.btn-post-comment', function(e) { - e.preventDefault() - const form = $(this).parent('form') - const urlpost = form.attr('action') + $comments.on("click", ".btn-post-comment", function (e) { + e.preventDefault(); + const form = $(this).parent("form"); + const urlpost = form.attr("action"); $.ajax({ - type: 'POST', + type: "POST", url: urlpost, data: form.serialize(), - dataType: 'json', + dataType: "json", success(e) { - form.trigger('reset') - toastMessage(e.success, 3000, 'alert alert-success') - form.parents('.yw-comment').find('.comment-links').removeClass('hide') + form.trigger("reset"); + toastMessage(e.success, 3000, "alert alert-success"); + form.parents(".yw-comment").find(".comment-links").removeClass("hide"); // we place the new comment in different places if its an answer, a modification or a new comment - if (form.hasClass('comment-modify')) { - form.closest('.yw-comment').html($('
').html(e.html).find('.yw-comment').html()) - form.remove() - $('#post-comment').removeClass('hide') - } else if (form.parent().hasClass('comment-reponses')) { - form.parent().append(e.html) - form.remove() - $('#post-comment').removeClass('hide') + if (form.hasClass("comment-modify")) { + form + .closest(".yw-comment") + .html($("
").html(e.html).find(".yw-comment").html()); + form.remove(); + $("#post-comment").removeClass("hide"); + } else if (form.parent().hasClass("comment-reponses")) { + form.parent().append(e.html); + form.remove(); + $("#post-comment").removeClass("hide"); } else { - $('.yeswiki-page-comments').append(e.html) + $(".yeswiki-page-comments").append(e.html); } }, error(e) { - toastMessage(e.responseJSON.error, 3000, 'alert alert-danger') - } - }) - return false - }) + toastMessage(e.responseJSON.error, 3000, "alert alert-danger"); + }, + }); + return false; + }); // ajax answer comment - $comments.on('click', '.btn-answer-comment', function(e) { - e.preventDefault() + $comments.on("click", ".btn-answer-comment", function (e) { + e.preventDefault(); - const com = $(this).parent().parent() + const com = $(this).parent().parent(); // delete temporary forms that may be open - $('.temporary-form').remove() + $(".temporary-form").remove(); // clone comment form and change some options - const formAnswer = com.find('.comment-reponses:first') - $('#post-comment').clone().appendTo(formAnswer) - formAnswer.find('form') - .attr('id', `form-comment-${com.data('tag')}`) - .removeClass('hide') - .addClass('temporary-form') - formAnswer.find('label').remove() - formAnswer.find('[name="pagetag"]').val(com.data('tag')) - formAnswer.find('form').append(``) - com.parents('.yw-comment').find('.comment-links').addClass('hide') + const formAnswer = com.find(".comment-reponses:first"); + $("#post-comment").clone().appendTo(formAnswer); + formAnswer + .find("form") + .attr("id", `form-comment-${com.data("tag")}`) + .removeClass("hide") + .addClass("temporary-form"); + formAnswer.find("label").remove(); + formAnswer.find('[name="pagetag"]').val(com.data("tag")); + formAnswer + .find("form") + .append( + ``, + ); + com.parents(".yw-comment").find(".comment-links").addClass("hide"); // hide comment form while another comment form is open - $('#post-comment').addClass('hide') + $("#post-comment").addClass("hide"); - return false - }) + return false; + }); // ajax edit comment - $comments.on('click', '.btn-edit-comment', function(e) { - e.preventDefault() - const com = $(this).parent().parent() + $comments.on("click", ".btn-edit-comment", function (e) { + e.preventDefault(); + const com = $(this).parent().parent(); // hide comment while editor is open - com.find('.comment-html:first').addClass('hide') + com.find(".comment-html:first").addClass("hide"); // delete temporary forms that may be open - $('.temporary-form').remove() + $(".temporary-form").remove(); // clone comment form and change some options - const formcom = com.find('.form-comment:first') - $('#post-comment').clone().appendTo(formcom) - formcom.find('form') - .attr('id', `form-comment-${com.data('tag')}`) - .attr('action', `${formcom.find('form').attr('action')}/${com.data('tag')}`) - .removeClass('hide') - .addClass('temporary-form') - .addClass('comment-modify') - formcom.find('label').remove() - formcom.find('textarea').val(com.find('.comment-body').val()) - formcom.find('[name="pagetag"]').val(com.data('commenton')) - formcom.find('.btn-post-comment').text(_t('MODIFY')) - formcom.find('form').append(``) - com.parents('.yw-comment').find('.comment-links').addClass('hide') + const formcom = com.find(".form-comment:first"); + $("#post-comment").clone().appendTo(formcom); + formcom + .find("form") + .attr("id", `form-comment-${com.data("tag")}`) + .attr( + "action", + `${formcom.find("form").attr("action")}/${com.data("tag")}`, + ) + .removeClass("hide") + .addClass("temporary-form") + .addClass("comment-modify"); + formcom.find("label").remove(); + formcom.find("textarea").val(com.find(".comment-body").val()); + formcom.find('[name="pagetag"]').val(com.data("commenton")); + formcom.find(".btn-post-comment").text(_t("MODIFY")); + formcom + .find("form") + .append( + ``, + ); + com.parents(".yw-comment").find(".comment-links").addClass("hide"); // hide comment form while another comment form is open - $('#post-comment').addClass('hide') + $("#post-comment").addClass("hide"); - return false - }) + return false; + }); // cancel comment edit - $comments.on('click', '.btn-cancel-comment', function(e) { - e.preventDefault() + $comments.on("click", ".btn-cancel-comment", function (e) { + e.preventDefault(); - const com = $(this).parent().parent().parent() + const com = $(this).parent().parent().parent(); // restore html comment and links - com.find('.comment-html:first').removeClass('hide') - com.parents('.yw-comment').find('.comment-links').removeClass('hide') + com.find(".comment-html:first").removeClass("hide"); + com.parents(".yw-comment").find(".comment-links").removeClass("hide"); // remove modify comment form - $(`#form-comment-${com.data('tag')}`).remove() + $(`#form-comment-${com.data("tag")}`).remove(); // restore comment form - $('#post-comment').removeClass('hide') + $("#post-comment").removeClass("hide"); - return false - }) + return false; + }); // ajax delete comment - $comments.on('click', '.btn-delete-comment', function(e) { - if (confirm(_t('DELETE_COMMENT_AND_ANSWERS'))) { - e.preventDefault() - const link = $(this) + $comments.on("click", ".btn-delete-comment", function (e) { + if (confirm(_t("DELETE_COMMENT_AND_ANSWERS"))) { + e.preventDefault(); + const link = $(this); $.ajax({ - type: 'POST', - url: link.attr('href'), - dataType: 'json', + type: "POST", + url: link.attr("href"), + dataType: "json", success(e) { - link.closest('.yw-comment').slideUp(250, function() { - $(this).remove() - }) - toastMessage(e.success, 3000, 'alert alert-success') + link.closest(".yw-comment").slideUp(250, function () { + $(this).remove(); + }); + toastMessage(e.success, 3000, "alert alert-success"); }, error(e) { - toastMessage(e.responseJSON.error, 3000, 'alert alert-danger') - } - }) + toastMessage(e.responseJSON.error, 3000, "alert alert-danger"); + }, + }); } - return false - }) + return false; + }); // reaction // init user reaction count - $('.reactions-container').each((i, val) => { - const userReaction = $(val).find('.user-reaction').length - const nbReactionLeft = $(val).find('.max-reaction').text() + $(".reactions-container").each((i, val) => { + const userReaction = $(val).find(".user-reaction").length; + const nbReactionLeft = $(val).find(".max-reaction").text(); $(val) - .find('.max-reaction') - .text(nbReactionLeft - userReaction) - }) + .find(".max-reaction") + .text(nbReactionLeft - userReaction); + }); // Reaction Management Helper const reactionManagementHelper = { renderAjaxError(translation, jqXHR, textStatus, errorThrown) { - const message = _t(translation, { error: `${textStatus} / ${errorThrown}${(jqXHR.responseJSON.error != undefined) ? `:${jqXHR.responseJSON.error}` : ''}` }) - if (typeof toastMessage == 'function') { - toastMessage( - message, - 3000, - 'alert alert-danger' - ) + const message = _t(translation, { + error: `${textStatus} / ${errorThrown}${jqXHR.responseJSON.error != undefined ? `:${jqXHR.responseJSON.error}` : ""}`, + }); + if (typeof toastMessage == "function") { + toastMessage(message, 3000, "alert alert-danger"); } else { - alert(message) + alert(message); } if (jqXHR.responseJSON.exceptionMessage != undefined) { - console.warn(jqXHR.responseJSON.exceptionMessage) + console.warn(jqXHR.responseJSON.exceptionMessage); } }, deleteATag(elem) { - const url = $(elem).attr('href') + const url = $(elem).attr("href"); $.ajax({ - method: 'GET', + method: "GET", url, success() { - const table = $(elem).closest('table') + const table = $(elem).closest("table"); if (table.length != 0) { - console.log(table.DataTable()) - table.DataTable().row($(elem).closest('tr')).remove().draw() + console.log(table.DataTable()); + table.DataTable().row($(elem).closest("tr")).remove().draw(); } }, error(jqXHR, textStatus, errorThrown) { - reactionManagementHelper.renderAjaxError('REACTION_NOT_POSSIBLE_TO_DELETE_REACTION', jqXHR, textStatus, errorThrown) - } - }) + reactionManagementHelper.renderAjaxError( + "REACTION_NOT_POSSIBLE_TO_DELETE_REACTION", + jqXHR, + textStatus, + errorThrown, + ); + }, + }); }, deleteTags(headElem) { - const table = $(headElem).closest('table') + const table = $(headElem).closest("table"); if (table.length != 0) { - $(table).find('.btn-delete-reaction:not(.btn-delete-all)').each(function() { - reactionManagementHelper.deleteATag($(this)) - }) + $(table) + .find(".btn-delete-reaction:not(.btn-delete-all)") + .each(function () { + reactionManagementHelper.deleteATag($(this)); + }); } - } - } + }, + }; // handler reaction click - $('.link-reaction').click(function(event) { + $(".link-reaction").click(function (event) { event.preventDefault(); event.stopPropagation(); const extractData = (item) => { - const nb = $(item).find('.reaction-numbers') + const nb = $(item).find(".reaction-numbers"); return { - url : $(item).attr('href'), - data : $(item).data(), - nb : nb, - nbInit : parseInt(nb.text()) - } - } - const {url,data,nb,nbInit} = extractData(this) - const deleteUserReaction = async (url,data,nb,nbInit,link) =>{ - const p = new Promise((resolve,reject)=>{ - let currentReactionId = data.reactionid - if ('oldId' in data && (data.oldId === true || data.oldId === "true")){ - currentReactionId = 'reactionField' - } - $.ajax({ - method: 'GET', - url: `${url}/${currentReactionId}/${data.id}/${data.pagetag}/${data.username}/delete`, - success() { - nb.text(nbInit - 1) - $(link).removeClass('user-reaction') - const nbReactionLeft = parseFloat( - $(link).parents('.reactions-container').find('.max-reaction').text() - ) - $(link) - .parents('.reactions-container') - .find('.max-reaction') - .text(nbReactionLeft + 1) - resolve() - }, - error(jqXHR, textStatus, errorThrown) { - reactionManagementHelper.renderAjaxError('REACTION_NOT_POSSIBLE_TO_DELETE_REACTION', jqXHR, textStatus, errorThrown) - reject() - } - }) - }) - return await p.then((...args)=>Promise.resolve(...args)) - } - if (url !== '#') { - if ($(this).hasClass('user-reaction')) { + url: $(item).attr("href"), + data: $(item).data(), + nb, + nbInit: parseInt(nb.text()), + }; + }; + const { url, data, nb, nbInit } = extractData(this); + const deleteUserReaction = async (url, data, nb, nbInit, link) => { + const p = new Promise((resolve, reject) => { + let currentReactionId = data.reactionid; + if ("oldId" in data && (data.oldId === true || data.oldId === "true")) { + currentReactionId = "reactionField"; + } + $.ajax({ + method: "GET", + url: `${url}/${currentReactionId}/${data.id}/${data.pagetag}/${data.username}/delete`, + success() { + nb.text(nbInit - 1); + $(link).removeClass("user-reaction"); + const nbReactionLeft = parseFloat( + $(link) + .parents(".reactions-container") + .find(".max-reaction") + .text(), + ); + $(link) + .parents(".reactions-container") + .find(".max-reaction") + .text(nbReactionLeft + 1); + resolve(); + }, + error(jqXHR, textStatus, errorThrown) { + reactionManagementHelper.renderAjaxError( + "REACTION_NOT_POSSIBLE_TO_DELETE_REACTION", + jqXHR, + textStatus, + errorThrown, + ); + reject(); + }, + }); + }); + return await p.then((...args) => Promise.resolve(...args)); + }; + if (url !== "#") { + if ($(this).hasClass("user-reaction")) { // on supprime la reaction - if (typeof blockReactionRemove !== 'undefined' && blockReactionRemove) { + if (typeof blockReactionRemove !== "undefined" && blockReactionRemove) { if (blockReactionRemoveMessage) { - if (typeof toastMessage == 'function') { + if (typeof toastMessage == "function") { toastMessage( blockReactionRemoveMessage, 3000, - 'alert alert-warning' - ) + "alert alert-warning", + ); } else { - alert(blockReactionRemoveMessage) + alert(blockReactionRemoveMessage); } } - return false + return false; } - const link = $(this) - deleteUserReaction(url,data,nb,nbInit,link).catch((e)=>{/*do nothing*/}) - return false + const link = $(this); + deleteUserReaction(url, data, nb, nbInit, link).catch((e) => { + /* do nothing */ + }); + return false; } // on ajoute la reaction si le max n'est pas dépassé - const nbReactionLeft = parseFloat($(this).parents('.reactions-container').find('.max-reaction').text()) - if (url !== '#' && nbReactionLeft == 0 && typeof blockReactionRemove !== 'undefined' && blockReactionRemove === true){ - var previous = $(this).closest(".reactions-flex").find(".user-reaction").first() - if (typeof previous === 'object' && 'length' in previous && previous.length > 0){ - const {url:previousUrl,data:previousData,nb:previousNb,nbInit:previousNbInit} = extractData(previous) - if (previousUrl !== '#'){ - deleteUserReaction(previousUrl,previousData,previousNb,previousNbInit,$(previous)) - .then(()=>{ - $(this).click() - }) - .catch((e)=>{ - /* do nothing */ - }) - return false - } + const nbReactionLeft = parseFloat( + $(this).parents(".reactions-container").find(".max-reaction").text(), + ); + if ( + url !== "#" && + nbReactionLeft == 0 && + typeof blockReactionRemove !== "undefined" && + blockReactionRemove === true + ) { + const previous = $(this) + .closest(".reactions-flex") + .find(".user-reaction") + .first(); + if ( + typeof previous === "object" && + "length" in previous && + previous.length > 0 + ) { + const { + url: previousUrl, + data: previousData, + nb: previousNb, + nbInit: previousNbInit, + } = extractData(previous); + if (previousUrl !== "#") { + deleteUserReaction( + previousUrl, + previousData, + previousNb, + previousNbInit, + $(previous), + ) + .then(() => { + $(this).click(); + }) + .catch((e) => { + /* do nothing */ + }); + return false; } + } } if (nbReactionLeft > 0) { - const link = $(this) + const link = $(this); $.ajax({ - method: 'POST', + method: "POST", url, data, success() { $(link) - .find('.reaction-numbers') - .text(nbReactionLeft - 1) + .find(".reaction-numbers") + .text(nbReactionLeft - 1); - nb.text(nbInit + 1) - $(link).addClass('user-reaction') + nb.text(nbInit + 1); + $(link).addClass("user-reaction"); $(link) - .parents('.reactions-container') - .find('.max-reaction') - .text(nbReactionLeft - 1) + .parents(".reactions-container") + .find(".max-reaction") + .text(nbReactionLeft - 1); }, error(jqXHR, textStatus, errorThrown) { - reactionManagementHelper.renderAjaxError('REACTION_NOT_POSSIBLE_TO_ADD_REACTION', jqXHR, textStatus, errorThrown) - } - }) + reactionManagementHelper.renderAjaxError( + "REACTION_NOT_POSSIBLE_TO_ADD_REACTION", + jqXHR, + textStatus, + errorThrown, + ); + }, + }); } else { - const message = 'Vous n\'avez plus de choix possibles, vous pouvez retirer un choix existant pour changer' - if (typeof toastMessage == 'function') { - toastMessage( - message, - 3000, - 'alert alert-warning' - ) + const message = + "Vous n'avez plus de choix possibles, vous pouvez retirer un choix existant pour changer"; + if (typeof toastMessage == "function") { + toastMessage(message, 3000, "alert alert-warning"); } else { - alert(message) + alert(message); } } - return false + return false; } - }) + }); - $('.btn-delete-reaction').on('click', function(e) { - e.preventDefault() - if (!$(this).hasClass('btn-delete-all')) { - if (confirm(_t('REACTION_CONFIRM_DELETE'))) { - reactionManagementHelper.deleteATag($(this)) + $(".btn-delete-reaction").on("click", function (e) { + e.preventDefault(); + if (!$(this).hasClass("btn-delete-all")) { + if (confirm(_t("REACTION_CONFIRM_DELETE"))) { + reactionManagementHelper.deleteATag($(this)); } - } else if (confirm(_t('REACTION_CONFIRM_DELETE_ALL'))) { - reactionManagementHelper.deleteTags($(this)) + } else if (confirm(_t("REACTION_CONFIRM_DELETE_ALL"))) { + reactionManagementHelper.deleteTags($(this)); } - }) -}(jQuery)) + }); +})(jQuery); // fot comments table -$('#commentsTableDeleteModal.modal').on('shown.bs.modal',function(event){ +$("#commentsTableDeleteModal.modal").on("shown.bs.modal", function (event) { multiDeleteService.initProgressBar($(this)); - $(this).find('.modal-body .multi-delete-results').html(''); - let deleteButton = $(this).find('button.start-btn-delete-comment') - $(deleteButton).removeAttr('disabled'); - let button = $(event.relatedTarget) // Button that triggered the modal - let name = $(button).data('name'); - let csrfToken = $(button).closest('tr').find(`td > label > input[data-itemId="${name}"][data-csrfToken]`).first().data('csrftoken'); - $(this).find('#commentToDelete').text(name); - $(deleteButton).data('name',name); - $(deleteButton).data('targetNode',button); - $(deleteButton).data('modal',this); - if (!$(deleteButton).hasClass('eventSet')){ - $(deleteButton).addClass('eventSet'); - $(deleteButton).on('click',function(){ - $(this).attr('disabled','disabled'); - $(this).tooltip('hide'); - let name = $(this).data('name'); - let targetNode = $(this).data('targetNode'); - let modal = $(this).data('modal'); + $(this).find(".modal-body .multi-delete-results").html(""); + const deleteButton = $(this).find("button.start-btn-delete-comment"); + $(deleteButton).removeAttr("disabled"); + const button = $(event.relatedTarget); // Button that triggered the modal + const name = $(button).data("name"); + const csrfToken = $(button) + .closest("tr") + .find(`td > label > input[data-itemId="${name}"][data-csrfToken]`) + .first() + .data("csrftoken"); + $(this).find("#commentToDelete").text(name); + $(deleteButton).data("name", name); + $(deleteButton).data("targetNode", button); + $(deleteButton).data("modal", this); + if (!$(deleteButton).hasClass("eventSet")) { + $(deleteButton).addClass("eventSet"); + $(deleteButton).on("click", function () { + $(this).attr("disabled", "disabled"); + $(this).tooltip("hide"); + const name = $(this).data("name"); + const targetNode = $(this).data("targetNode"); + const modal = $(this).data("modal"); $.ajax({ - method: 'post', + method: "post", url: wiki.url(`api/comments/${name}/delete`), timeout: 30000, // 30 seconds - error: function (e) { - multiDeleteService.addErrorMessage($(modal), - _t('COMMENT_NOT_DELETED',{comment:name})+ ' : ' - +(e.responseJSON && e.responseJSON.error ? e.responseJSON.error : '')); + error(e) { + multiDeleteService.addErrorMessage( + $(modal), + `${_t("COMMENT_NOT_DELETED", { comment: name })} : ${ + e.responseJSON && e.responseJSON.error ? e.responseJSON.error : "" + }`, + ); }, - success: function(){ - multiDeleteService.removeLine($(targetNode).closest('.dataTables_wrapper').prop('id'),name); - $(modal).find('.modal-body .multi-delete-results').first().append( - $('
').text(_t('COMMENT_DELETED')) + success() { + multiDeleteService.removeLine( + $(targetNode).closest(".dataTables_wrapper").prop("id"), + name, ); + $(modal) + .find(".modal-body .multi-delete-results") + .first() + .append($("
").text(_t("COMMENT_DELETED"))); + }, + complete() { + multiDeleteService.updateProgressBar($(modal), ["test"], 0); }, - complete: function (){ - multiDeleteService.updateProgressBar($(modal),['test'],0); - } }); }); } }); // function to check all checkbox in page. -function checkAll(state) -{ - var checkboxes = document.querySelectorAll('input.selectpage'); - var newState = [true,'true',1,'1'].includes(state) - checkboxes.forEach((checkbox)=>{ - if (checkbox.type == 'checkbox'){ - checkbox.checked = newState +function checkAll(state) { + const checkboxes = document.querySelectorAll("input.selectpage"); + const newState = [true, "true", 1, "1"].includes(state); + checkboxes.forEach((checkbox) => { + if (checkbox.type == "checkbox") { + checkbox.checked = newState; } - }) + }); } // tabs // hack for next and previous buttons -$('.tab-content [data-toggle="tab"]').on('click',function() { - const base = $(this).closest('.tab-content').prev() - $(base).find('.active').removeClass('active') - $(base).find(`[href="${$(this).attr('href')}"]`).parent().addClass('active') - $(base).find(`a[href="${$(this).attr('href')}"]`).tab('show') +$('.tab-content [data-toggle="tab"]').on("click", function () { + const base = $(this).closest(".tab-content").prev(); + $(base).find(".active").removeClass("active"); + $(base) + .find(`[href="${$(this).attr("href")}"]`) + .parent() + .addClass("active"); + $(base) + .find(`a[href="${$(this).attr("href")}"]`) + .tab("show"); // manage iframe case if (window.location != parent.parent.location) { - $('html, body').animate({ scrollTop: $(base).offset().top }, 500) + $("html, body").animate({ scrollTop: $(base).offset().top }, 500); try { - $(base).get(0).scrollIntoView() - window.parent.scrollBy(0,-80) + $(base).get(0).scrollIntoView(); + window.parent.scrollBy(0, -80); } catch (error) { + console.error(error); } } else { - $('html, body').animate({ scrollTop: $(base).offset().top - 80 }, 500) + $("html, body").animate({ scrollTop: $(base).offset().top - 80 }, 500); } -}) +}); diff --git a/tools/login/lang/login_fr.inc.php b/tools/login/lang/login_fr.inc.php index b25ad7ddb..ad0f8fecc 100755 --- a/tools/login/lang/login_fr.inc.php +++ b/tools/login/lang/login_fr.inc.php @@ -40,6 +40,7 @@ 'LOGIN_THE_TEAM' => 'L\'équipe de', 'LOGIN_PASSWORD_LOST_FOR' => 'Mot de passe perdu pour', 'LOGIN_NO_SIGNUP_IN_THIS_PERIOD' => 'Il n\'y a pas d\'inscription pour cette période.', + 'LOGIN_MY_OPTIONS' => "Mes options", // actions/login.php 'LOGIN_COOKIES_ERROR' => 'Vous devez accepter les cookies pour pouvoir vous connecter.', @@ -52,7 +53,7 @@ 'USERSETTINGS_SIGNUP_MISSING_INPUT' => 'Les paramètres \'{parameters}\' ne peuvent être vides !', 'USERSETTINGS_NAME_ALREADY_USED' => 'L\'identifiant "{currentName}" existe déjà !', 'USERSETTINGS_EMAIL_ALREADY_USED' => 'L\'email "{email}" est déjà utilisé par un autre compte !', - 'USERSETTINGS_CHANGE_PWD_IN_IFRAME' => "Vous vous apprêtez à changer votre mot de passe dans une fenêtre de type iframe.\n". - "Pour éviter les attaques par enregistrement de vos touches, assurez-vous que l'url du site commence bien par {baseUrl}.\n". + 'USERSETTINGS_CHANGE_PWD_IN_IFRAME' => "Vous vous apprêtez à changer votre mot de passe dans une fenêtre de type iframe.\n" . + "Pour éviter les attaques par enregistrement de vos touches, assurez-vous que l'url du site commence bien par {baseUrl}.\n" . "Au moindre doute, ouvrez ce formulaire dans une page dédiée en cliquant sur ce lien {link}.", ]; diff --git a/tools/login/templates/modal.twig b/tools/login/templates/modal.twig index 2323470b7..36416e88b 100644 --- a/tools/login/templates/modal.twig +++ b/tools/login/templates/modal.twig @@ -3,7 +3,7 @@ {% block logoutLinkClass %}btn btn-default{% endblock %} {% block connected %} - + {{ user }}