Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions assets/controllers/takeout_import_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ export default class extends Controller {
// soi-même démarré un upload avait ce message (#482).
if (['scheduled', 'extracting', 'processing'].includes(pendingImport.status)) {
const safeToCloseMessage = document.createElement('p');
safeToCloseMessage.className = 'text-xs';
safeToCloseMessage.style.color = 'var(--hc-text-secondary, var(--hc-text))';
safeToCloseMessage.className = 'text-xs hc-safe-to-close';
safeToCloseMessage.textContent = 'Le serveur travaille : vous pouvez quitter cette page, l\'import continue en arrière-plan.';
li.appendChild(safeToCloseMessage);
}
Expand Down
8 changes: 8 additions & 0 deletions assets/styles/takeout-import.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,11 @@
0%, 100% { opacity: 0.6; }
50% { opacity: 1; }
}

/* Message "le serveur travaille, vous pouvez quitter la page" (#482, #555) —
* en vert pour ressortir clairement dans la liste des imports actifs, plutôt
* que de se fondre dans le texte secondaire gris. */
.hc-safe-to-close {
color: #22c55e;
font-weight: 500;
}
1 change: 1 addition & 0 deletions assets/tests/takeout-import-controller.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ describe('liste des imports Takeout en attente (#481)', () => {

const item = document.querySelector('[data-takeout-import-target="pendingList"] li');
expect(item.textContent).toMatch(/quitter cette page/i);
expect(item.querySelector('.hc-safe-to-close')).not.toBeNull();
},
);

Expand Down
2 changes: 1 addition & 1 deletion templates/web/takeout_import.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
parsing, import), contrairement à la phase d'upload (#481),
fermer l'onglet est sans risque — le traitement continue en
arrière-plan et reste consultable au retour sur la page. -->
<p class="text-xs" style="color: var(--hc-text-secondary, var(--hc-text))" hidden
<p class="text-xs hc-safe-to-close" hidden
data-takeout-import-target="safeToCloseMessage">
Vous pouvez fermer cet onglet sans risque : l'import continue en arrière-plan.
Revenez sur cette page à tout moment pour suivre sa progression.
Expand Down
2 changes: 1 addition & 1 deletion var/tailwind/app.built.css

Large diffs are not rendered by default.

Loading