Skip to content
Snippets Groups Projects

templates/homepage: Redesign landing page and sidebar

Modify homepage and sidebar design:

  • Remove huge Web API links and put a smaller instead at the bottom right of the search box

  • Remove redundant links

  • Set gray background to search interface

  • Simplify sidebar menu

Below is the result:

image

Closes #2317 (closed)

Depends on !334 (closed).


Migrated from D3269 (view on Phabricator)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Author Maintainer

    Rebase

  • Build has FAILED

    Patch application report for D3269 (id=11585)

    Could not rebase; Attempt merge onto de0dfcb3...

    Updating de0dfcb3..d4efaee6
    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/assets/src/bundles/webapp/webapp.css       |  4 ++
     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                    | 50 +++++++++++-----------
     swh/web/templates/includes/origin-search-form.html | 36 ++++++++++++++++
     swh/web/templates/includes/show-swh-ids.html       |  6 +--
     swh/web/templates/layout.html                      | 16 +------
     17 files changed, 141 insertions(+), 111 deletions(-)
     create mode 100644 swh/web/templates/includes/origin-search-form.html
    Changes applied before test
    commit d4efaee6b59723a081123908fc712c3e96dbbe9f
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Tue Jun 9 17:37:32 2020 +0200
    
        templates/homepage: Redesign landing page and sidebar
        
        - Remove huge Web API links and put a smaller instead at the bottom right
          of the search box
        
        - Remove redundant links
        
        - Set gray background to search interface
        
        - Simplify sidebar menu
        
        Closes #2317
    
    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 #2317
    
    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 #2318

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

  • vlorentz mentioned in merge request !334 (closed)

    mentioned in merge request !334 (closed)

  • nice!

  • Merge request was accepted

  • vlorentz approved this merge request

    approved this merge request

  • Build is green

    Patch application report for D3269 (id=11587)

    Could not rebase; Attempt merge onto de0dfcb3...

    Updating de0dfcb3..41f48e8d
    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/assets/src/bundles/webapp/webapp.css       |  4 ++
     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                    | 50 +++++++++++-----------
     swh/web/templates/includes/origin-search-form.html | 40 +++++++++++++++++
     swh/web/templates/includes/show-swh-ids.html       |  6 +--
     swh/web/templates/layout.html                      | 16 +------
     17 files changed, 145 insertions(+), 111 deletions(-)
     create mode 100644 swh/web/templates/includes/origin-search-form.html
    Changes applied before test
    commit 41f48e8d9f1b88f6fca9e4f3953218a43347cd06
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Tue Jun 9 17:37:32 2020 +0200
    
        templates/homepage: Redesign landing page and sidebar
        
        - Remove huge Web API links and put a smaller instead at the bottom right
          of the search box
        
        - Remove redundant links
        
        - Set gray background to search interface
        
        - Simplify sidebar menu
        
        Closes #2317
    
    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 #2317
    
    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 #2318

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

  • Author Maintainer

    Rebase

  • Build is green

    Patch application report for D3269 (id=11604)

    Could not rebase; Attempt merge onto dc25295b...

    Updating dc25295b..344af307
    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/assets/src/bundles/webapp/webapp.css       |  4 ++
     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                    | 50 +++++++++++-----------
     swh/web/templates/includes/origin-search-form.html | 40 +++++++++++++++++
     swh/web/templates/includes/show-swh-ids.html       |  6 +--
     swh/web/templates/layout.html                      | 16 +------
     17 files changed, 145 insertions(+), 111 deletions(-)
     create mode 100644 swh/web/templates/includes/origin-search-form.html
    Changes applied before test
    commit 344af307038907bae653129d46344bd664653ca3
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Tue Jun 9 17:37:32 2020 +0200
    
        templates/homepage: Redesign landing page and sidebar
        
        - Remove huge Web API links and put a smaller instead at the bottom right
          of the search box
        
        - Remove redundant links
        
        - Set gray background to search interface
        
        - Simplify sidebar menu
        
        Closes #2317
    
    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 #2317
    
    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 #2318

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

  • Author Maintainer

    Merge request was merged

Please register or sign in to reply
Loading