Page MenuHomeSoftware Heritage

templates/homepage: Include origin search form at the top of the page
ClosedPublic

Authored by anlambert on Jun 11 2020, 7:24 PM.

Details

Summary

Extract search form in a separate html file to include and out it at the
top of the homepage.

Related to T2317

Depends on D3266.

Test Plan

A cypress test has been added checking search feature is working from the homepage.

Diff Detail

Repository
rDWAPPS Web applications
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Update: Forgot to include script tag in include file

Build has FAILED

Patch application report for D3268 (id=11584)

Could not rebase; Attempt merge onto de0dfcb3b5...

Updating de0dfcb3..3865b4fc
Fast-forward
 cypress/integration/home.spec.js                   | 16 ++++++++++
 cypress/integration/origin-search.spec.js          | 22 ++++++-------
 cypress/integration/persistent-identifiers.spec.js |  4 +--
 cypress/integration/vault.spec.js                  |  2 +-
 swh/web/assets/config/bootstrap-pre-customize.scss |  1 +
 swh/web/assets/src/bundles/browse/origin-search.js |  2 +-
 swh/web/assets/src/bundles/vault/vault-ui.js       |  6 ++--
 swh/web/templates/browse/browse.html               |  2 ++
 swh/web/templates/browse/origin-visits.html        | 25 ++++++++-------
 swh/web/templates/browse/revision-log.html         | 28 ++++++++---------
 swh/web/templates/browse/search.html               | 25 +--------------
 swh/web/templates/browse/vault-ui.html             |  7 ++++-
 swh/web/templates/homepage.html                    |  9 ++++++
 swh/web/templates/includes/origin-search-form.html | 36 ++++++++++++++++++++++
 swh/web/templates/includes/show-swh-ids.html       |  6 ++--
 15 files changed, 121 insertions(+), 70 deletions(-)
 create mode 100644 swh/web/templates/includes/origin-search-form.html
Changes applied before test
commit 3865b4fc656e8bf62800c6ae4691a938853bf32a
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue Jun 9 16:23:39 2020 +0200

    templates/homepage: Include origin search form at the top of the page
    
    Related to T2317

commit 279cdbd61b7d3f4e2a453fff8225f97362b400bc
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Jun 11 19:08:44 2020 +0200

    assets, templates: Improve overall UI style
    
    Set Bootstrap primary color to SWH theme red color and use Bootstrap custom
    checboxes and radio buttons in order to get a nicer display of UI elements.
    
    Closes T2318

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/171/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/171/console

Build is green

Patch application report for D3268 (id=11586)

Could not rebase; Attempt merge onto de0dfcb3b5...

Updating de0dfcb3..1dc4fb2f
Fast-forward
 cypress/integration/home.spec.js                   | 16 +++++++++
 cypress/integration/origin-search.spec.js          | 22 ++++++------
 cypress/integration/persistent-identifiers.spec.js |  4 +--
 cypress/integration/vault.spec.js                  |  2 +-
 swh/web/assets/config/bootstrap-pre-customize.scss |  1 +
 swh/web/assets/src/bundles/browse/origin-search.js |  2 +-
 swh/web/assets/src/bundles/vault/vault-ui.js       |  6 ++--
 swh/web/templates/browse/browse.html               |  2 ++
 swh/web/templates/browse/origin-visits.html        | 25 ++++++++------
 swh/web/templates/browse/revision-log.html         | 28 +++++++--------
 swh/web/templates/browse/search.html               | 25 +-------------
 swh/web/templates/browse/vault-ui.html             |  7 +++-
 swh/web/templates/homepage.html                    |  9 +++++
 swh/web/templates/includes/origin-search-form.html | 40 ++++++++++++++++++++++
 swh/web/templates/includes/show-swh-ids.html       |  6 ++--
 15 files changed, 125 insertions(+), 70 deletions(-)
 create mode 100644 swh/web/templates/includes/origin-search-form.html
Changes applied before test
commit 1dc4fb2f57e1aa24718984cec0e691b0ee55e6bd
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue Jun 9 16:23:39 2020 +0200

    templates/homepage: Include origin search form at the top of the page
    
    Related to T2317

commit 279cdbd61b7d3f4e2a453fff8225f97362b400bc
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Jun 11 19:08:44 2020 +0200

    assets, templates: Improve overall UI style
    
    Set Bootstrap primary color to SWH theme red color and use Bootstrap custom
    checboxes and radio buttons in order to get a nicer display of UI elements.
    
    Closes T2318

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/174/ for more details.

vlorentz added a subscriber: vlorentz.

The padding between the checkboxes and "Overview" is too small imo

This revision now requires changes to proceed.Jun 11 2020, 8:20 PM

Looks like this will be solved in D3269, so nvm

This revision is now accepted and ready to land.Jun 11 2020, 8:22 PM

Build is green

Patch application report for D3268 (id=11603)

Could not rebase; Attempt merge onto dc25295b05...

Updating dc25295b..7a144e3e
Fast-forward
 cypress/integration/home.spec.js                   | 16 +++++++++
 cypress/integration/origin-search.spec.js          | 22 ++++++------
 cypress/integration/persistent-identifiers.spec.js |  4 +--
 cypress/integration/vault.spec.js                  |  2 +-
 swh/web/assets/config/bootstrap-pre-customize.scss |  1 +
 swh/web/assets/src/bundles/browse/origin-search.js |  2 +-
 swh/web/assets/src/bundles/vault/vault-ui.js       |  6 ++--
 swh/web/templates/browse/browse.html               |  2 ++
 swh/web/templates/browse/origin-visits.html        | 25 ++++++++------
 swh/web/templates/browse/revision-log.html         | 28 +++++++--------
 swh/web/templates/browse/search.html               | 25 +-------------
 swh/web/templates/browse/vault-ui.html             |  7 +++-
 swh/web/templates/homepage.html                    |  9 +++++
 swh/web/templates/includes/origin-search-form.html | 40 ++++++++++++++++++++++
 swh/web/templates/includes/show-swh-ids.html       |  6 ++--
 15 files changed, 125 insertions(+), 70 deletions(-)
 create mode 100644 swh/web/templates/includes/origin-search-form.html
Changes applied before test
commit 7a144e3e0a807944ac7f1ef9603fc27ef5a98bf5
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue Jun 9 16:23:39 2020 +0200

    templates/homepage: Include origin search form at the top of the page
    
    Related to T2317

commit 7d2742d531ac7e89c11a4636fede12a5075a9c9e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Jun 11 19:08:44 2020 +0200

    assets, templates: Improve overall UI style
    
    Set Bootstrap primary color to SWH theme red color and use Bootstrap custom
    checboxes and radio buttons in order to get a nicer display of UI elements.
    
    Closes T2318

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/180/ for more details.