Changeset View
Changeset View
Standalone View
Standalone View
OAq
- This file was added.
␛[33mdiff --git a/swh/web/assets/src/bundles/save/index.js b/swh/web/assets/src/bundles/save/index.js␛[m | |||||
␛[33mindex ea3c22cc..d8bc6e08 100644␛[m | |||||
␛[33m--- a/swh/web/assets/src/bundles/save/index.js␛[m | |||||
␛[33m+++ b/swh/web/assets/src/bundles/save/index.js␛[m | |||||
␛[1;35m@@ -113,8 +113,9 @@␛[m ␛[mexport function initOriginSave() {␛[m | |||||
name: 'info',␛[m | |||||
render: (data, type, row) => {␛[m | |||||
if (row.save_task_status === 'succeed' || row.save_task_status === 'failed') {␛[m | |||||
␛[1;31m- return '<i class="mdi mdi-information-outline swh-save-request-info" aria-hidden="true" style="cursor: pointer"' +␛[m | |||||
␛[1;31m- `onclick="swh.save.displaySaveRequestInfo(event, ${row.id})"></i>`;␛[m | |||||
␛[1;32m+␛[m␛[1;32m return `<i id="swh-save-request-info-${row.id}" class="mdi mdi-information-outline swh-save-request-info" ` +␛[m | |||||
␛[1;32m+␛[m␛[1;32m 'aria-hidden="true" style="cursor: pointer"' +␛[m | |||||
␛[1;32m+␛[m␛[1;32m `onclick="swh.save.displaySaveRequestInfo(event, ${row.id})"></i>`;␛[m | |||||
} else {␛[m | |||||
return '';␛[m | |||||
}␛[m | |||||
␛[1;35m@@ -138,8 +139,9 @@␛[m ␛[mexport function initOriginSave() {␛[m | |||||
window.location.hash = '#requests';␛[m | |||||
});␛[m | |||||
␛[m | |||||
␛[1;31m- $('#swh-origin-save-request-create-tab').on('shown.bs.tab', () => {␛[m | |||||
␛[1;32m+␛[m␛[1;32m $('#swh-origin-save-request-help-tab').on('shown.bs.tab', () => {␛[m | |||||
removeUrlFragment();␛[m | |||||
␛[1;32m+␛[m␛[1;32m $('.swh-save-request-info').popover('dispose');␛[m | |||||
});␛[m | |||||
␛[m | |||||
let saveRequestAcceptedAlert = htmlAlert(␛[m | |||||
␛[1;35m@@ -320,7 +322,9 @@␛[m ␛[mexport function displaySaveRequestInfo(event, saveRequestId) {␛[m | |||||
}␛[m | |||||
$('.swh-save-request-info').popover('dispose');␛[m | |||||
$(event.target).popover({␛[m | |||||
␛[1;31m- 'title': 'Save request task information',␛[m | |||||
␛[1;32m+␛[m␛[1;32m 'title': 'Save request task information ' +␛[m | |||||
␛[1;32m+␛[m␛[1;32m '<i style="cursor: pointer; position: absolute; right: 1rem;" ' +␛[m | |||||
␛[1;32m+␛[m␛[1;32m `class="mdi mdi-close"></i>'`,␛[m | |||||
'content': `<div class="swh-popover swh-save-request-info-popover">␛[m | |||||
<div class="text-center">␛[m | |||||
<img src=${swhSpinnerSrc}></img>␛[m | |||||
␛[1;35m@@ -331,6 +335,15 @@␛[m ␛[mexport function displaySaveRequestInfo(event, saveRequestId) {␛[m | |||||
'placement': 'left',␛[m | |||||
'sanitizeFn': swh.webapp.filterXSS␛[m | |||||
});␛[m | |||||
␛[1;32m+␛[m | |||||
␛[1;32m+␛[m␛[1;32m $(event.target).on('shown.bs.popover', function() {␛[m | |||||
␛[1;32m+␛[m␛[1;32m console.log($(this));␛[m | |||||
␛[1;32m+␛[m␛[1;32m const popoverId = $(this).attr('aria-describedby');␛[m | |||||
␛[1;32m+␛[m␛[1;32m $(`#${popoverId} .mdi-close`).click(() => {␛[m | |||||
␛[1;32m+␛[m␛[1;32m $(this).popover('dispose');␛[m | |||||
␛[1;32m+␛[m␛[1;32m });␛[m | |||||
␛[1;32m+␛[m␛[1;32m });␛[m | |||||
␛[1;32m+␛[m | |||||
$(event.target).popover('show');␛[m | |||||
fetch(saveRequestTaskInfoUrl)␛[m | |||||
.then(response => response.json())␛[m | |||||
␛[33mdiff --git a/swh/web/templates/misc/origin-save.html b/swh/web/templates/misc/origin-save.html␛[m | |||||
␛[33mindex 3ad03305..ead6ced3 100644␛[m | |||||
␛[33m--- a/swh/web/templates/misc/origin-save.html␛[m | |||||
␛[33m+++ b/swh/web/templates/misc/origin-save.html␛[m | |||||
␛[1;35m@@ -59,7 +59,7 @@␛[m ␛[mSee top-level LICENSE file for more information␛[m | |||||
</div>␛[m | |||||
␛[m | |||||
<ul class="nav nav-tabs" style="padding-left: 5px;">␛[m | |||||
␛[1;31m- <li class="nav-item"><a class="nav-link active" data-toggle="tab" id="swh-origin-save-request-create-tab" href="#swh-origin-save-requests-create">Help</a></li>␛[m | |||||
␛[1;32m+␛[m␛[1;32m <li class="nav-item"><a class="nav-link active" data-toggle="tab" id="swh-origin-save-request-help-tab" href="#swh-origin-save-requests-create">Help</a></li>␛[m | |||||
<li class="nav-item"><a class="nav-link" data-toggle="tab" id="swh-origin-save-requests-list-tab" href="#swh-origin-save-requests-list">Browse save requests</a></li>␛[m | |||||
</ul>␛[m | |||||
␛[m |