diff --git a/cypress/integration/guided-tour.spec.js b/cypress/integration/guided-tour.spec.js --- a/cypress/integration/guided-tour.spec.js +++ b/cypress/integration/guided-tour.spec.js @@ -24,7 +24,6 @@ }; it('should start UI guided tour when clicking on help button', function() { - cy.ambassadorLogin(); cy.visit('/'); cy.get('.swh-help-link') .click(); @@ -34,7 +33,6 @@ }); it('should change guided tour page after current page steps', function() { - cy.ambassadorLogin(); cy.visit('/'); cy.get('.swh-help-link') @@ -52,7 +50,6 @@ it('should automatically open SWHIDs tab on second page of the guided tour', function() { const guidedTourPageIndex = 1; - cy.ambassadorLogin(); cy.visit('/').window().then(win => { const guidedTour = win.swh.guided_tour.getGuidedTour(); // jump to third guided tour page @@ -71,7 +68,6 @@ it('should stay at step while line numbers not clicked on content view tour', function() { const guidedTourPageIndex = 2; - cy.ambassadorLogin(); // jump to third guided tour page cy.visit('/').window().then(win => { const guidedTour = win.swh.guided_tour.getGuidedTour(); diff --git a/cypress/integration/layout.spec.js b/cypress/integration/layout.spec.js --- a/cypress/integration/layout.spec.js +++ b/cypress/integration/layout.spec.js @@ -5,7 +5,7 @@ * See top-level LICENSE file for more information */ -const url = '/browse/help/'; +const url = '/browse/vault/'; const statusUrl = 'https://status.softwareheritage.org'; describe('Test top-bar', function() { 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 @@ -556,7 +556,7 @@ it('should report invalid SWHID in top right search input', function() { const swhidInput = `swh:1:cnt:${this.unarchivedRepo.content[0].sha1git};lines=45-60/`; - checkInvalidSWHIDReport(this.Urls.browse_help(), '#swh-origins-search-top-input', swhidInput); + checkInvalidSWHIDReport(this.Urls.browse_vault(), '#swh-origins-search-top-input', swhidInput); }); it('should report SWHID with uppercase chars in search page input', function() { @@ -571,7 +571,7 @@ let swhidInput = `swh:1:cnt:${this.unarchivedRepo.content[0].sha1git}`.toUpperCase(); swhidInput += ';lines=45-60/'; - checkInvalidSWHIDReport(this.Urls.browse_help(), '#swh-origins-search-top-input', swhidInput.toLowerCase()); + checkInvalidSWHIDReport(this.Urls.browse_vault(), '#swh-origins-search-top-input', swhidInput.toLowerCase()); }); }); diff --git a/swh/web/browse/urls.py b/swh/web/browse/urls.py --- a/swh/web/browse/urls.py +++ b/swh/web/browse/urls.py @@ -17,12 +17,6 @@ from swh.web.common.utils import origin_visit_types, reverse -def _browse_help_view(request): - return render( - request, "browse/help.html", {"heading": "How to browse the archive ?"} - ) - - def _browse_search_view(request): return render( request, @@ -48,7 +42,6 @@ urlpatterns = [ url(r"^$", _browse_search_view), - url(r"^help/$", _browse_help_view, name="browse-help"), url(r"^search/$", _browse_search_view, name="browse-search"), url(r"^vault/$", _browse_vault_view, name="browse-vault"), # for backward compatibility diff --git a/swh/web/templates/browse/help.html b/swh/web/templates/browse/help.html deleted file mode 100644 --- a/swh/web/templates/browse/help.html +++ /dev/null @@ -1,189 +0,0 @@ -{% extends "./layout.html" %} - -{% comment %} -Copyright (C) 2017-2020 The Software Heritage developers -See the AUTHORS file at the top-level directory of this distribution -License: GNU Affero General Public License version 3, or any later version -See top-level LICENSE file for more information -{% endcomment %} - -{% block navbar-content %} -

How to browse the archive ?

-{% endblock %} - -{% block browse-content %} - - -

Overview

- -

- This web application aims to provide HTML views to easily navigate in the Software Heritage archive. This is an ongoing development - and new features and improvements will be progressively added over time. -

- -

URI scheme

- -

- The current URI scheme of that web application is described below and depends on the type of Software Heritage object to - browse. Its exhaustive documentation can be consulted from the official - - Software Heritage development documentation - -

- -
Context-independent browsing
- -

- Context-independent URLs provide information about objects (e.g., revisions, directories, contents, persons, …), independently - of the contexts where they have been found (e.g., specific software origins, branches, commits, …). -

- -

- Below are some examples of endpoints used to just render the corresponding information for user consumption: -

- - - -

- Where hyperlinks are created when browsing these kind of endpoints, they always point to other context-independent browsing - URLs. -

- -
Context-dependent browsing
- -

- Context-dependent URLs provide information about objects, limited to specific contexts where the objects have been found. -

- -

- Currently, browsing the Software Heritage objects in the context of an - origin is available. Below are some examples of such endpoints: -

- - - -

Search software origins to browse

- -In order to facilitate the browsing of the archive and generate relevant entry points to it, a -search interface is available. Currently, it enables to search software origins from the URLs they were retrieved -from. More search criteria will be added in the future. - - -{% endblock %} diff --git a/swh/web/templates/layout.html b/swh/web/templates/layout.html --- a/swh/web/templates/layout.html +++ b/swh/web/templates/layout.html @@ -210,11 +210,7 @@
  • - {% if user.is_authenticated and user.is_staff or "swh.ambassador" in user.get_all_permissions %} - - {% else %} - - {% endif %} +

    Help