aa-intel-tool 1.1.3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.js

@@ -5,7 +5,7 @@
 /**
  * Fetch data from an ajax URL
  *
- * @param url
+ * @param {string} url
  * @returns {Promise<any>}
  */
 const fetchAjaxData = async (url) => { // eslint-disable-line no-unused-vars
@@ -27,52 +27,63 @@ const fetchAjaxData = async (url) => { // eslint-disable-line no-unused-vars
 };
 
 
+/**
+ * Get the image HTML string for an Eve portrait or logo
+ *
+ * @param {int} eveId
+ * @param {string} eveName
+ * @param {string} imageSource
+ * @param {int} imageSize
+ * @returns {`<img class="eve-image rounded" data-eveid="${int}" src="${string}" alt="${string}" title="${string}" loading="lazy" width="${int}" height="${int}">`}
+ */
+const eveImageHtml = (eveId, eveName, imageSource, imageSize = 32) => {
+    return `<img class="eve-image rounded" data-eveid="${eveId}" src="${imageSource}" alt="${eveName}" title="${eveName}" loading="lazy" width="${imageSize}" height="${imageSize}">`;
+};
+
+
+/**
+ * Get the link HTML to EveWho for a pilot
+ *
+ * @param {string} href
+ * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
+ */
+const eveWhoLinkHtml = (href) => {
+    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
+};
+
+
+/**
+ * Get the link HTML to zKillboard
+ *
+ * @param {string} href
+ * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
+ */
+const zkillboardLinkHtml = (href) => {
+    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
+};
+
+
+/**
+ * Get the link HTML to dotlan
+ *
+ * @param {string} href
+ * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
+ */
+const dotlanLinkHtml = (href) => {
+    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
+};
+
+
 /**
  * Pilot info element in datatable
  *
- * @param pilotData
- * @returns {string}
+ * @param {Object} pilotData
+ * @returns {string} HTML construct for the pilot info
  */
 const pilotInfoPanel = (pilotData) => { // eslint-disable-line no-unused-vars
-    let html_logo = '' +
-        '<span class="aa-intel-pilot-avatar-wrapper">\n' +
-        '    <img ' +
-        '        class="eve-image" ' +
-        '        data-eveid="' + pilotData['id'] + '" ' +
-        '        src="' + pilotData['portrait'] + '" ' +
-        '        alt="' + pilotData['name'] + '" ' +
-        '        title="' + pilotData['name'] + '" ' +
-        '        width="32" ' +
-        '        height="32">\n' +
-        '</span>';
-
-    let html_info = '' +
-        '<span class="aa-intel-pilot-information-wrapper">\n' +
-        '    <span class="aa-intel-pilot-name-wrapper">\n' +
-        '        ' + pilotData['name'] + '\n' +
-        '    </span>\n';
-
-    html_info += '' +
-        '    <span class="aa-intel-pilot-links-wrapper">\n' +
-        '        <small>\n' +
-        '            <a ' +
-        '                class="aa-intel-information-link" ' +
-        '                href="' + pilotData['evewho'] + '" ' +
-        '                target="_blank" ' +
-        '                rel="noopener noreferer"' +
-        '            >' +
-        '               evewho <i class="fas fa-external-link-alt" aria-hidden="true"></i>' +
-        '            </a> |\n' +
-
-        '            <a ' +
-        '                class="aa-intel-information-link" ' +
-        '                href="' + pilotData['zkillboard'] + '" ' +
-        '                target="_blank" rel="noopener noreferer"' +
-        '            >' +
-        '                zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>' +
-        '            </a>\n' +
-        '        </small>\n' +
-        '    </span>\n';
+    const html_logo = `<span class="aa-intel-pilot-avatar-wrapper">${eveImageHtml(pilotData.id, pilotData.name, pilotData.portrait)}</span>`;
+    let html_info = `<span class="aa-intel-pilot-information-wrapper"><span class="aa-intel-pilot-name-wrapper">${pilotData.name}</span>`;
+    html_info += `<span class="aa-intel-pilot-links-wrapper"><small>${eveWhoLinkHtml(pilotData.evewho)} | ${zkillboardLinkHtml(pilotData.zkillboard)}</small></span>`;
 
     return html_logo + html_info;
 };
@@ -81,60 +92,22 @@ const pilotInfoPanel = (pilotData) => { // eslint-disable-line no-unused-vars
 /**
  * Corporation info element in datatable
  *
- * @param corporationData
- * @param logoOnly {boolean} Returns only the corporation logo
- * @returns {string}
+ * @param {Object} corporationData
+ * @param {boolean} logoOnly Returns only the corporation logo
+ * @returns {string} HTML construct for the corporation info
  */
 const corporationInfoPanel = (corporationData, logoOnly = false) => { // eslint-disable-line no-unused-vars
-    let html_logo = '' +
-        '<span class="aa-intel-corporation-logo-wrapper">\n' +
-        '    <img ' +
-        '        class="eve-image" ' +
-        '        data-eveid="' + corporationData['id'] + '" ' +
-        '        src="' + corporationData['logo'] + '" ' +
-        '        alt="' + corporationData['name'] + '" ' +
-        '        title="' + corporationData['name'] + '" ' +
-        '        width="32" ' +
-        '        height="32">\n' +
-        '</span>';
-
-    let html_info = '' +
-        '<span class="aa-intel-corporation-information-wrapper">\n' +
-        '    <span class="aa-intel-corporation-name-wrapper">\n' +
-        '        ' + corporationData['name'] + '\n' +
-        '    </span>\n';
-
-    html_info += '' +
-        '    <span class="aa-intel-corporation-links-wrapper">\n' +
-        '        <small>\n';
-
-    if ((1000000 <= corporationData['id']) && corporationData['id'] <= 2000000) {
-        html_info += '' +
-            '            (' + aaIntelToolJsL10n.scanData.npcCorp + ')';
+    const html_logo = `<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(corporationData.id, corporationData.name, corporationData.logo)}</span>`;
+    let html_info = `<span class="aa-intel-corporation-information-wrapper"><span class="aa-intel-corporation-name-wrapper">${corporationData.name}</span>`;
+    html_info += `<span class="aa-intel-corporation-links-wrapper"><small>`;
+
+    if ((1000000 <= corporationData.id) && corporationData.id <= 2000000) {
+        html_info += `(${aaIntelToolJsL10n.scanData.npcCorp})`;
     } else {
-        html_info += '' +
-            '            <a ' +
-            '                class="aa-intel-information-link" ' +
-            '                href="' + corporationData['dotlan'] + '" ' +
-            '                target="_blank" ' +
-            '                rel="noopener noreferer"' +
-            '            >' +
-            '               dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>' +
-            '            </a> |\n' +
-
-            '            <a ' +
-            '                class="aa-intel-information-link" ' +
-            '                href="' + corporationData['zkillboard'] + '" ' +
-            '                target="_blank" rel="noopener noreferer"' +
-            '            >' +
-            '                zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>' +
-            '            </a>\n' +
-            '        </small>\n' +
-            '    </span>\n';
+        html_info += `${dotlanLinkHtml(corporationData.dotlan)} | ${zkillboardLinkHtml(corporationData.zkillboard)}</small></span>`;
     }
 
-    html_info += '' +
-        '</span>';
+    html_info += `</span>`;
 
     if (logoOnly) {
         return html_logo;
@@ -147,59 +120,23 @@ const corporationInfoPanel = (corporationData, logoOnly = false) => { // eslint-
 /**
  * Alliance info element in datatable
  *
- * @param allianceData
- * @param logoOnly {boolean} Returns only the alliance logo
- * @returns {string}
+ * @param {Object} allianceData {object}
+ * @param {boolean} logoOnly Returns only the alliance logo
+ * @returns {string} HTML construct for the alliance info
  */
 const allianceInfoPanel = (allianceData, logoOnly = false) => { // eslint-disable-line no-unused-vars
-    if (allianceData['name'] === '') {
-        allianceData['name'] = aaIntelToolJsL10n.scanData.empty;
+    if (allianceData.name === '') {
+        allianceData.name = aaIntelToolJsL10n.scanData.empty;
     }
 
-    let html_logo = '' +
-        '<span class="aa-intel-alliance-logo-wrapper alliance-id-' + allianceData['id'] + '">\n' +
-        '    <img ' +
-        '        class="eve-image" ' +
-        '        data-eveid="' + allianceData['id'] + '" ' +
-        '        src="' + allianceData['logo'] + '" ' +
-        '        alt="' + allianceData['name'] + '" ' +
-        '        title="' + allianceData['name'] + '" ' +
-        '        width="32" ' +
-        '        height="32">\n' +
-        '</span>';
-
-    let html_info = '' +
-        '<span class="aa-intel-alliance-information-wrapper">\n' +
-        '    <span class="aa-intel-alliance-name-wrapper">\n' +
-        '        ' + allianceData['name'] + '\n' +
-        '    </span>\n';
-
-    if (allianceData['id'] > 1) {
-        html_info += '' +
-            '    <span class="aa-intel-alliance-links-wrapper">\n' +
-            '        <small>\n' +
-            '            <a ' +
-            '                class="aa-intel-information-link" ' +
-            '                href="' + allianceData['dotlan'] + '" ' +
-            '                target="_blank" ' +
-            '                rel="noopener noreferer"' +
-            '            >' +
-            '               dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>' +
-            '            </a> |\n' +
-
-            '            <a ' +
-            '                class="aa-intel-information-link" ' +
-            '                href="' + allianceData['zkillboard'] + '" ' +
-            '                target="_blank" rel="noopener noreferer"' +
-            '            >' +
-            '                zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>' +
-            '            </a>\n' +
-            '        </small>\n' +
-            '    </span>\n';
+    const html_logo = `<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(allianceData.id, allianceData.name, allianceData.logo)}</span>`;
+    let html_info = `<span class="aa-intel-alliance-information-wrapper"><span class="aa-intel-alliance-name-wrapper">${allianceData.name}</span>`;
+
+    if (allianceData.id > 1) {
+        html_info += `<span class="aa-intel-alliance-links-wrapper"><small>${dotlanLinkHtml(allianceData.dotlan)} | ${zkillboardLinkHtml(allianceData.zkillboard)}</small></span>`;
     }
 
-    html_info += '' +
-        '</span>';
+    html_info += `</span>`;
 
     if (logoOnly) {
         if (allianceData.id === 1) {
@@ -216,34 +153,18 @@ const allianceInfoPanel = (allianceData, logoOnly = false) => { // eslint-disabl
 /**
  * Ship/Item info element in datatable
  *
- * @param shipData
- * @returns {string}
+ * @param {Object} shipData
+ * @returns {string} HTML construct for the ship info
  */
 const shipInfoPanel = (shipData) => { // eslint-disable-line no-unused-vars
-    let html_logo = '' +
-        '<span class="aa-intel-ship-image-wrapper">\n' +
-        '    <img ' +
-        '        class="eve-image" ' +
-        '        data-eveid="' + shipData['id'] + '" ' +
-        '        src="' + shipData['image'] + '" ' +
-        '        alt="' + shipData['name'] + '" ' +
-        '        title="' + shipData['name'] + '" ' +
-        '        width="32" ' +
-        '        height="32">\n' +
-        '</span>';
-
-    let html_info = '' +
-        '<span class="aa-intel-ship-information-wrapper">\n' +
-        '    <span class="aa-intel-ship-name-wrapper">\n' +
-        '        ' + shipData['name'] + '\n' +
-        '    </span>\n' +
-        '</span>\n';
+    const html_logo = `<span class="aa-intel-ship-image-wrapper">${eveImageHtml(shipData.id, shipData.name, shipData.image)}</span>`;
+    const html_info = `<span class="aa-intel-ship-information-wrapper"><span class="aa-intel-ship-name-wrapper">${shipData.name}</span></span>`;
 
     return html_logo + html_info;
 };
 
 
-jQuery(document).ready(($) => {
+$(() => {
     const elementCopyToClipboard = $('button#btn-copy-permalink-to-clipboard');
 
 
@@ -262,10 +183,8 @@ jQuery(document).ready(($) => {
      * @param {int} closeAfter Close Message after given time in seconds (Default: 10)
      */
     const closeMessageElement = (element, closeAfter = 10) => {
-        $(element).fadeTo(closeAfter * 1000, 500).slideUp(500, (elm) => {
-            $(elm).slideUp(500, (el) => {
-                $(el).remove();
-            });
+        $(element).fadeTo(closeAfter * 1000, 500).slideUp(500, () => {
+            $(element).remove();
         });
     };
 
@@ -278,9 +197,7 @@ jQuery(document).ready(($) => {
      */
     const showSuccess = (message, element) => {
         $(element).html(
-            '<div class="alert alert-success alert-dismissable alert-message-success">' +
-            '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' + message +
-            '</div>'
+            `<div class="alert alert-success alert-dismissible alert-message-success d-flex align-items-center fade show">${message}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`
         );
 
         closeMessageElement('.alert-message-success');
@@ -295,9 +212,7 @@ jQuery(document).ready(($) => {
      */
     const showError = (message, element) => {
         $(element).html(
-            '<div class="alert alert-danger alert-dismissable alert-message-error">' +
-            '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' + message +
-            '</div>'
+            `<div class="alert alert-danger alert-dismissible alert-message-error d-flex align-items-center fade show">${message}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`
         );
 
         closeMessageElement('.alert-message-error', 9999);
@@ -307,7 +222,7 @@ jQuery(document).ready(($) => {
     /**
      * Copy the scan link to clipboard
      *
-     * @param elementId {string}
+     * @param {string} elementId The HTML-element ID
      */
     const copyScanLink = (elementId) => {
         /**

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js

@@ -1,2 +1,2 @@
-"use strict";const fetchAjaxData=async a=>fetch(a).then(a=>a.ok?Promise.resolve(a):Promise.reject(new Error("Failed to load"))).then(a=>a.json()).then(a=>a).catch(function(a){console.log("Error: "+a.message)}),pilotInfoPanel=a=>{var e='<span class="aa-intel-pilot-avatar-wrapper">\n    <img         class="eve-image"         data-eveid="'+a.id+'"         src="'+a.portrait+'"         alt="'+a.name+'"         title="'+a.name+'"         width="32"         height="32">\n</span>',n='<span class="aa-intel-pilot-information-wrapper">\n    <span class="aa-intel-pilot-name-wrapper">\n        '+a.name+"\n    </span>\n";return e+(n+='    <span class="aa-intel-pilot-links-wrapper">\n        <small>\n            <a                 class="aa-intel-information-link"                 href="'+a.evewho+'"                 target="_blank"                 rel="noopener noreferer"            >               evewho <i class="fas fa-external-link-alt" aria-hidden="true"></i>            </a> |\n            <a                 class="aa-intel-information-link"                 href="'+a.zkillboard+'"                 target="_blank" rel="noopener noreferer"            >                zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>            </a>\n        </small>\n    </span>\n')},corporationInfoPanel=(a,e=!1)=>{var n='<span class="aa-intel-corporation-logo-wrapper">\n    <img         class="eve-image"         data-eveid="'+a.id+'"         src="'+a.logo+'"         alt="'+a.name+'"         title="'+a.name+'"         width="32"         height="32">\n</span>';let l='<span class="aa-intel-corporation-information-wrapper">\n    <span class="aa-intel-corporation-name-wrapper">\n        '+a.name+"\n    </span>\n";return l+='    <span class="aa-intel-corporation-links-wrapper">\n        <small>\n',1e6<=a.id&&a.id<=2e6?l+="            ("+aaIntelToolJsL10n.scanData.npcCorp+")":l+='            <a                 class="aa-intel-information-link"                 href="'+a.dotlan+'"                 target="_blank"                 rel="noopener noreferer"            >               dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>            </a> |\n            <a                 class="aa-intel-information-link"                 href="'+a.zkillboard+'"                 target="_blank" rel="noopener noreferer"            >                zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>            </a>\n        </small>\n    </span>\n',l+="</span>",e?n:n+l},allianceInfoPanel=(a,e=!1)=>{""===a.name&&(a.name=aaIntelToolJsL10n.scanData.empty);var n='<span class="aa-intel-alliance-logo-wrapper alliance-id-'+a.id+'">\n    <img         class="eve-image"         data-eveid="'+a.id+'"         src="'+a.logo+'"         alt="'+a.name+'"         title="'+a.name+'"         width="32"         height="32">\n</span>';let l='<span class="aa-intel-alliance-information-wrapper">\n    <span class="aa-intel-alliance-name-wrapper">\n        '+a.name+"\n    </span>\n";return 1<a.id&&(l+='    <span class="aa-intel-alliance-links-wrapper">\n        <small>\n            <a                 class="aa-intel-information-link"                 href="'+a.dotlan+'"                 target="_blank"                 rel="noopener noreferer"            >               dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>            </a> |\n            <a                 class="aa-intel-information-link"                 href="'+a.zkillboard+'"                 target="_blank" rel="noopener noreferer"            >                zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>            </a>\n        </small>\n    </span>\n'),l+="</span>",e?1===a.id?"":n:n+l},shipInfoPanel=a=>{return'<span class="aa-intel-ship-image-wrapper">\n    <img         class="eve-image"         data-eveid="'+a.id+'"         src="'+a.image+'"         alt="'+a.name+'"         title="'+a.name+'"         width="32"         height="32">\n</span>'+('<span class="aa-intel-ship-information-wrapper">\n    <span class="aa-intel-ship-name-wrapper">\n        '+a.name+"\n    </span>\n</span>\n")};jQuery(document).ready(l=>{const a=l("button#btn-copy-permalink-to-clipboard"),r=(ClipboardJS.isSupported()||a.remove(),(a,e=10)=>{l(a).fadeTo(1e3*e,500).slideUp(500,a=>{l(a).slideUp(500,a=>{l(a).remove()})})}),e=a=>{const n=new ClipboardJS(a);n.on("success",a=>{var e;e=aaIntelToolJsL10n.copyToClipboard.permalink.text.success,l(".aa-intel-copy-result").html('<div class="alert alert-success alert-dismissable alert-message-success"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>'+e+"</div>"),r(".alert-message-success"),a.clearSelection(),n.destroy()}),n.on("error",()=>{var a;a=aaIntelToolJsL10n.copyToClipboard.permalink.text.error,l(".aa-intel-copy-result").html('<div class="alert alert-danger alert-dismissable alert-message-error"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>'+a+"</div>"),r(".alert-message-error",9999),n.destroy()})};a.click(()=>{e("#"+a.attr("id"))})});
+"use strict";const fetchAjaxData=async a=>fetch(a).then(a=>a.ok?Promise.resolve(a):Promise.reject(new Error("Failed to load"))).then(a=>a.json()).then(a=>a).catch(function(a){console.log("Error: "+a.message)}),eveImageHtml=(a,e,l,n=32)=>`<img class="eve-image rounded" data-eveid="${a}" src="${l}" alt="${e}" title="${e}" loading="lazy" width="${n}" height="${n}">`,eveWhoLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,zkillboardLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,dotlanLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,pilotInfoPanel=a=>{const e=`<span class="aa-intel-pilot-avatar-wrapper">${eveImageHtml(a.id,a.name,a.portrait)}</span>`;let l=`<span class="aa-intel-pilot-information-wrapper"><span class="aa-intel-pilot-name-wrapper">${a.name}</span>`;return l+=`<span class="aa-intel-pilot-links-wrapper"><small>${eveWhoLinkHtml(a.evewho)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`,e+l},corporationInfoPanel=(a,e=!1)=>{const l=`<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(a.id,a.name,a.logo)}</span>`;let n=`<span class="aa-intel-corporation-information-wrapper"><span class="aa-intel-corporation-name-wrapper">${a.name}</span>`;return n+='<span class="aa-intel-corporation-links-wrapper"><small>',1e6<=a.id&&a.id<=2e6?n+=`(${aaIntelToolJsL10n.scanData.npcCorp})`:n+=`${dotlanLinkHtml(a.dotlan)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`,n+="</span>",e?l:l+n},allianceInfoPanel=(a,e=!1)=>{""===a.name&&(a.name=aaIntelToolJsL10n.scanData.empty);const l=`<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(a.id,a.name,a.logo)}</span>`;let n=`<span class="aa-intel-alliance-information-wrapper"><span class="aa-intel-alliance-name-wrapper">${a.name}</span>`;return 1<a.id&&(n+=`<span class="aa-intel-alliance-links-wrapper"><small>${dotlanLinkHtml(a.dotlan)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`),n+="</span>",e?1===a.id?"":l:l+n},shipInfoPanel=a=>{const e=`<span class="aa-intel-ship-image-wrapper">${eveImageHtml(a.id,a.name,a.image)}</span>`,l=`<span class="aa-intel-ship-information-wrapper"><span class="aa-intel-ship-name-wrapper">${a.name}</span></span>`;return e+l};$(()=>{const a=$("button#btn-copy-permalink-to-clipboard"),l=(ClipboardJS.isSupported()||a.remove(),(a,e=10)=>{$(a).fadeTo(1e3*e,500).slideUp(500,()=>{$(a).remove()})}),n=(a,e)=>{$(e).html(`<div class="alert alert-success alert-dismissible alert-message-success d-flex align-items-center fade show">${a}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`),l(".alert-message-success")},s=(a,e)=>{$(e).html(`<div class="alert alert-danger alert-dismissible alert-message-error d-flex align-items-center fade show">${a}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`),l(".alert-message-error",9999)},e=a=>{const e=new ClipboardJS(a);e.on("success",a=>{n(aaIntelToolJsL10n.copyToClipboard.permalink.text.success,".aa-intel-copy-result"),a.clearSelection(),e.destroy()}),e.on("error",()=>{s(aaIntelToolJsL10n.copyToClipboard.permalink.text.error,".aa-intel-copy-result"),e.destroy()})};a.click(()=>{e("#"+a.attr("id"))})});
 //# sourceMappingURL=aa-intel-tool-scan-result-common.min.js.map

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["aa-intel-tool-scan-result-common.js"],"names":["fetchAjaxData","async","url","fetch","then","response","ok","Promise","resolve","reject","Error","json","tableData","catch","error","console","log","message","pilotInfoPanel","let","html_logo","pilotData","html_info","corporationInfoPanel","corporationData","logoOnly","aaIntelToolJsL10n","scanData","npcCorp","allianceInfoPanel","allianceData","empty","id","shipInfoPanel","shipData","jQuery","document","ready","elementCopyToClipboard","$","closeMessageElement","ClipboardJS","isSupported","remove","element","closeAfter","fadeTo","slideUp","elm","el","copyScanLink","clipboardScanLink","elementId","on","copyToClipboard","permalink","text","success","html","e","clearSelection","destroy","click","attr"],"mappings":"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"}
+{"version":3,"sources":["aa-intel-tool-scan-result-common.js"],"names":["fetchAjaxData","async","url","fetch","then","response","ok","Promise","resolve","reject","Error","json","tableData","catch","error","console","log","message","eveImageHtml","eveId","eveName","imageSource","imageSize","eveWhoLinkHtml","href","zkillboardLinkHtml","dotlanLinkHtml","pilotInfoPanel","html_logo","pilotData","id","name","portrait","let","html_info","evewho","zkillboard","corporationInfoPanel","corporationData","logoOnly","logo","aaIntelToolJsL10n","scanData","npcCorp","dotlan","allianceInfoPanel","allianceData","empty","shipInfoPanel","shipData","image","$","elementCopyToClipboard","closeMessageElement","ClipboardJS","isSupported","remove","element","closeAfter","fadeTo","slideUp","showSuccess","html","showError","copyScanLink","clipboardScanLink","elementId","on","copyToClipboard","permalink","text","success","e","clearSelection","destroy","click","attr"],"mappings":"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"}

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.js

@@ -1,4 +1,4 @@
-jQuery(document).ready(($) => { // eslint-disable-line no-unused-vars
+$(() => {
     'use strict';
 
     /**

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.min.js

@@ -1,2 +1,2 @@
-jQuery(document).ready(t=>{"use strict";document.querySelectorAll("form").forEach(s=>{s.addEventListener("submit",t=>{s.classList.contains("is-submitting")&&t.preventDefault(),s.classList.add("is-submitting")})})});
+$(()=>{"use strict";document.querySelectorAll("form").forEach(s=>{s.addEventListener("submit",t=>{s.classList.contains("is-submitting")&&t.preventDefault(),s.classList.add("is-submitting")})})});
 //# sourceMappingURL=aa-intel-tool.min.js.map

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["aa-intel-tool.js"],"names":["jQuery","document","ready","querySelectorAll","forEach","form","addEventListener","classList","contains","e","preventDefault","add"],"mappings":"AAAAA,OAAOC,QAAQ,EAAEC,MAAM,IACnB,aAKAD,SAASE,iBAAiB,MAAM,EAAEC,QAAQ,IACtCC,EAAKC,iBAAiB,SAAU,IAExBD,EAAKE,UAAUC,SAAS,eAAe,GACvCC,EAAEC,eAAe,EAIrBL,EAAKE,UAAUI,IAAI,eAAe,CACtC,CAAC,CACL,CAAC,CACL,CAAC"}
+{"version":3,"sources":["aa-intel-tool.js"],"names":["$","document","querySelectorAll","forEach","form","addEventListener","classList","contains","e","preventDefault","add"],"mappings":"AAAAA,EAAE,KACE,aAKAC,SAASC,iBAAiB,MAAM,EAAEC,QAAQ,IACtCC,EAAKC,iBAAiB,SAAU,IAExBD,EAAKE,UAAUC,SAAS,eAAe,GACvCC,EAAEC,eAAe,EAIrBL,EAAKE,UAAUI,IAAI,eAAe,CACtC,CAAC,CACL,CAAC,CACL,CAAC"}

aa_intel_tool/templates/aa_intel_tool/base.html

@@ -1,9 +1,14 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 
 {% load i18n %}
-{% load static %}
 
-{% block page_title %}{% translate "Intel Parser" %}{% endblock %}
+{% block page_title %}
+    {% translate "Intel Parser" %}
+{% endblock %}
+
+{% block header_nav_brand %}
+    {% translate "Intel Parser" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
     <div class="aa-intel-tool">
@@ -15,7 +20,7 @@
             {% block aa_intel_tool_body %}{% endblock %}
         </div>
 
-        <div class="aa-intel-tool-footer">
+        <div class="aa-intel-tool-footer mt-3 pt-3 border-top border-light">
             {% include "aa_intel_tool/partials/footer/app-translation-footer.html" %}
         </div>
     </div>

aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-chatscan-js.html

@@ -1,4 +1,4 @@
-{% load inteltool_versioned_static %}
+{% load aa_intel_tool %}
 
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js' %}"></script>
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js' %}"></script>

aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-css.html

@@ -1,4 +1,3 @@
-{% load inteltool_versioned_static %}
+{% load aa_intel_tool %}
 
-<link rel="stylesheet" href="{% aa_intel_tool_static 'aa_intel_tool/css/aa-bootstrap-fix.min.css' %}">
 <link rel="stylesheet" href="{% aa_intel_tool_static 'aa_intel_tool/css/aa-intel-tool.min.css' %}">

aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-dscan-js.html

@@ -1,4 +1,4 @@
-{% load inteltool_versioned_static %}
+{% load aa_intel_tool %}
 
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js' %}"></script>
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.min.js' %}"></script>

aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-fleetcomp-js.html

@@ -1,4 +1,4 @@
-{% load inteltool_versioned_static %}
+{% load aa_intel_tool %}
 
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js' %}"></script>
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool-fleetcomposition-highlight.min.js' %}"></script>

aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js.html

@@ -1,3 +1,3 @@
-{% load inteltool_versioned_static %}
+{% load aa_intel_tool %}
 
 <script src="{% aa_intel_tool_static 'aa_intel_tool/javascript/aa-intel-tool.min.js' %}"></script>

aa_intel_tool/templates/aa_intel_tool/partials/body/scan-retention-note.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 {% if app_settings.INTELTOOL_SCAN_RETENTION_TIME > 0 %}
-    <p class="text-muted text-right">
+    <p class="text-muted text-end small">
         {% blocktranslate count scan_retention_time=app_settings.INTELTOOL_SCAN_RETENTION_TIME %}Scans will be deleted after {{ scan_retention_time }} day.{% plural %}Scans will be deleted after {{ scan_retention_time }} days.{% endblocktranslate %}
     </p>
 {% endif %}

aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div class="app-translation-footer text-muted">
-    <p>
+    <p class="small">
         {% translate "Do you want to help translate this app into your language or improve the existing translation?" %}
         -
         <a href="https://weblate.ppfeufer.de/engage/alliance-auth-apps/" target="_blank" rel="noopener noreferer">

aa_intel_tool/templates/aa_intel_tool/partials/index/form.html

@@ -1,16 +1,16 @@
+{% load django_bootstrap5 %}
 {% load i18n %}
-{% load bootstrap %}
 
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card card-default mb-3">
+    <div class="card-body">
         <div class="row">
             <div class="col-lg-4">
-                <div class="paste-explanation">
+                <div class="paste-explanation mb-4">
                     <header class="entry-header">
-                        <h2 class="entry-title">{% translate "What can I paste?" %}</h2>
+                        <p class="h3 entry-title">{% translate "What can I paste?" %}</p>
                     </header>
 
-                    <ul>
+                    <ul class="p-0">
                         {% if app_settings.INTELTOOL_ENABLE_MODULE_CHATSCAN %}
                             <li>
                                 {% translate "Chat member list" as item_title %}
@@ -35,6 +35,10 @@
                             </li>
                         {% endif %}
                     </ul>
+
+                    <p>
+                        {% translate "Please keep in mind, parsing large amounts of data can take some time. Be patient, CCP's API is not the fastest to answer …" %}
+                    </p>
                 </div>
             </div>
 
@@ -42,24 +46,19 @@
                 <form id="new_intel" name="new_intel" method="post" action="/intel/">
                     {% csrf_token %}
 
-                    {{ form|bootstrap }}
+                    {% bootstrap_form form %}
 
-                    <div class="row form-submit-area">
-                        <div class="col-sm-2">
-                            <button type="submit" class="btn btn-primary" name="submit-form">
-                                {% translate "Submit" %}
-                            </button>
-                        </div>
+                    {% translate "Submit" as button_text %}
+                    {% bootstrap_button button_type="submit" content=button_text %}
 
-                        <div class="col-sm-12 aa-intel-form-submitted-info">
-                            <div class="bs-callout bs-callout-info">
-                                <p>{% translate "Working on it, please be patient …" %}</p>
-                                <ul>
-                                    <li>{% translate "Detecting the intel type" %}</li>
-                                    <li>{% translate "Fetching potentially missing information from ESI (this might take a moment)" %}</li>
-                                    <li>{% translate "Parsing data" %}</li>
-                                </ul>
-                            </div>
+                    <div class="col-sm-12 aa-intel-form-submitted-info mt-3">
+                        <div class="aa-callout aa-callout-info">
+                            <p>{% translate "Working on it, please be patient …" %}</p>
+                            <ul>
+                                <li>{% translate "Detecting the intel type" %}</li>
+                                <li>{% translate "Fetching potentially missing information from ESI (this might take a moment)" %}</li>
+                                <li>{% translate "Parsing data" %}</li>
+                            </ul>
                         </div>
                     </div>
                 </form>

aa_intel_tool/templates/aa_intel_tool/partials/scan/buttons.html

@@ -1,20 +1,21 @@
 {% load i18n %}
 
-<div class="aa-intel-scan-page-buttons">
+<div class="aa-intel-scan-page-buttons my-4">
     <ul class="nav nav-pills clearfix">
-        <li role="presentation">
+        <li class="me-2 mb-2">
             <a href="{% url "aa_intel_tool:intel_tool_index" %}">
-                <button class="btn btn-default btn-sm">
+                <button class="btn btn-primary btn-sm">
                     {% translate "New scan" %}
                 </button>
             </a>
         </li>
 
-        <li role="presentation">
-            <button id="btn-copy-permalink-to-clipboard" class="btn btn-default btn-sm" data-clipboard-action="copy" data-clipboard-text="{{ SITE_URL }}{% url 'aa_intel_tool:intel_tool_scan' scan_hash %}">
+        <li class="me-2 mb-2">
+            <button id="btn-copy-permalink-to-clipboard" class="btn btn-secondary btn-sm" data-clipboard-action="copy" data-clipboard-text="{{ SITE_URL }}{% url 'aa_intel_tool:intel_tool_scan' scan_hash %}">
                 {% translate "Copy permalink" %}
             </button>
         </li>
     </ul>
 </div>
+
 <div class="aa-intel-copy-result"></div>