diff --git a/cypress/integration/origin-search.spec.js b/cypress/integration/origin-search.spec.js --- a/cypress/integration/origin-search.spec.js +++ b/cypress/integration/origin-search.spec.js @@ -77,11 +77,11 @@ // Check all three checkboxes and check if // correct url params are added cy.get('#swh-search-origins-with-visit') - .check() + .check({force: true}) .get('#swh-filter-empty-visits') - .check() + .check({force: true}) .get('#swh-search-origin-metadata') - .check() + .check({force: true}) .then(() => { const searchText = origin.url; doSearch(searchText); @@ -128,9 +128,9 @@ it('should not paginate if there are not many results', function() { // Setup search cy.get('#swh-search-origins-with-visit') - .uncheck() + .uncheck({force: true}) .get('#swh-filter-empty-visits') - .uncheck() + .uncheck({force: true}) .then(() => { const searchText = 'libtess'; @@ -154,9 +154,9 @@ stubOriginVisitLatestRequests(); // Setup search cy.get('#swh-search-origins-with-visit') - .uncheck() + .uncheck({force: true}) .get('#swh-filter-empty-visits') - .uncheck() + .uncheck({force: true}) .then(() => { const searchText = 'many.origins'; @@ -219,9 +219,9 @@ stubOriginVisitLatestRequests(); // Setup search cy.get('#swh-search-origins-with-visit') - .uncheck() + .uncheck({force: true}) .get('#swh-filter-empty-visits') - .uncheck() + .uncheck({force: true}) .then(() => { const searchText = 'many.origins'; @@ -268,9 +268,9 @@ stubOriginVisitLatestRequests(); // Setup search cy.get('#swh-search-origins-with-visit') - .uncheck() + .uncheck({force: true}) .get('#swh-filter-empty-visits') - .uncheck() + .uncheck({force: true}) .then(() => { const searchText = 'many.origins'; diff --git a/cypress/integration/persistent-identifiers.spec.js b/cypress/integration/persistent-identifiers.spec.js --- a/cypress/integration/persistent-identifiers.spec.js +++ b/cypress/integration/persistent-identifiers.spec.js @@ -137,14 +137,14 @@ .contains(td.objectPids[0]) .should('have.attr', 'href', this.Urls.browse_swh_id(td.objectPids[0])); - cy.get(`#swh-id-tab-${td.objectType} .swh-id-context-option`) + cy.get(`#swh-id-tab-${td.objectType} .swh-id-option`) .click(); cy.get(`#swh-id-tab-${td.objectType} .swh-id`) .contains(td.objectPids[1]) .should('have.attr', 'href', this.Urls.browse_swh_id(td.objectPids[1])); - cy.get(`#swh-id-tab-${td.objectType} .swh-id-context-option`) + cy.get(`#swh-id-tab-${td.objectType} .swh-id-option`) .click(); cy.get(`#swh-id-tab-${td.objectType} .swh-id`) diff --git a/cypress/integration/vault.spec.js b/cypress/integration/vault.spec.js --- a/cypress/integration/vault.spec.js +++ b/cypress/integration/vault.spec.js @@ -325,7 +325,7 @@ cy.get(`#vault-task-${this.revision}`) .find('input[type="checkbox"]') - .click(); + .click({force: true}); cy.contains('button', 'Remove selected tasks') .click(); diff --git a/swh/web/assets/config/bootstrap-pre-customize.scss b/swh/web/assets/config/bootstrap-pre-customize.scss --- a/swh/web/assets/config/bootstrap-pre-customize.scss +++ b/swh/web/assets/config/bootstrap-pre-customize.scss @@ -8,6 +8,7 @@ // override some global bootstrap sass variables before generating stylesheets // global text colors and fonts +$primary: #e20026; $body-color: rgba(0, 0, 0, 0.55); $font-family-sans-serif: "Alegreya Sans", sans-serif !important; $link-color: rgba(0, 0, 0, 0.75); diff --git a/swh/web/assets/src/bundles/vault/vault-ui.js b/swh/web/assets/src/bundles/vault/vault-ui.js --- a/swh/web/assets/src/bundles/vault/vault-ui.js +++ b/swh/web/assets/src/bundles/vault/vault-ui.js @@ -175,8 +175,10 @@ tableRow = ``; } - tableRow += ''; - tableRow += `${cookingTask.object_type}`; + tableRow += '
'; + tableRow += ``; + tableRow += ``; + tableRow += `${cookingTask.object_type}`; tableRow += `${cookingTask.object_id}`; tableRow += `${progressBar.outerHTML}`; let downloadLink = downloadLinkWait; diff --git a/swh/web/templates/browse/browse.html b/swh/web/templates/browse/browse.html --- a/swh/web/templates/browse/browse.html +++ b/swh/web/templates/browse/browse.html @@ -12,6 +12,7 @@ {% block title %}{{ heading }} – Software Heritage archive{% endblock %} {% block navbar-content %} + {% if snapshot_context %}

@@ -42,6 +43,7 @@

{% endif %} + {% endblock %} {% block browse-content %} diff --git a/swh/web/templates/browse/origin-visits.html b/swh/web/templates/browse/origin-visits.html --- a/swh/web/templates/browse/origin-visits.html +++ b/swh/web/templates/browse/origin-visits.html @@ -41,23 +41,26 @@

History

-
-
-