diff --git a/doc/release-notes/10941-remove-custom-guides-navbar.md b/doc/release-notes/10941-remove-custom-guides-navbar.md new file mode 100644 index 00000000000..69251af1649 --- /dev/null +++ b/doc/release-notes/10941-remove-custom-guides-navbar.md @@ -0,0 +1 @@ +Navigation across the guides has been improved. You can now click in the upper left to go "home". The navbar has been simplified with fewer links. The bottom of every page now has "Next" and "Previous" links. A "Source" link at the bottom has also been added. See #10942. diff --git a/doc/sphinx-guides/source/_static/docsdataverse_org.css b/doc/sphinx-guides/source/_static/docsdataverse_org.css index 726abcc42bd..d861a788681 100755 --- a/doc/sphinx-guides/source/_static/docsdataverse_org.css +++ b/doc/sphinx-guides/source/_static/docsdataverse_org.css @@ -35,6 +35,10 @@ iframe { a.navbar-brand, a.navbar-brand:hover { color:#C55B28 !important; + height: 50px; + background: rgba(0, 0, 0, 0) url("../_static/images/dataverseicon.png") no-repeat scroll 0 8px; + line-height: 20px; + padding-left: 26px; } span.navbar-brand {color:#C55B28 !important; padding-left: 32px; height: 50px;} span.navbar-brand .icon-dataverse {color:#C55B28; font-size:28px; margin: -4px 0 0 -27px; position: absolute;} @@ -48,13 +52,6 @@ ul.navbar-nav li.dropdown.open > span.dropdown-toggle {background: #e7e7e7;} .text-dataset {color:#31708F;} .text-file {color:#777777;} -#dataverse-org-homepage-url { - height: 50px; - background: rgba(0, 0, 0, 0) url("../_static/images/dataverseicon.png") no-repeat scroll 0 8px; - line-height: 20px; - padding-left: 26px; -} - .navbar-default .navbar-nav > li > a { color: #303030 !important; } @@ -189,4 +186,4 @@ div.sphinx-tabs { li div.sphinx-tabs { padding-left: 0; -} \ No newline at end of file +} diff --git a/doc/sphinx-guides/source/_static/navbar_from_dataverse_org.js b/doc/sphinx-guides/source/_static/navbar_from_dataverse_org.js deleted file mode 100644 index 7432b63d38d..00000000000 --- a/doc/sphinx-guides/source/_static/navbar_from_dataverse_org.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - Use the HTML from the Dataverse.org navbar - See: https://github.com/IQSS/dataverse.org/tree/master/dataverse_org/templates/sphinx-navbar -*/ -function load_navbar(){ - //var navbar_url = 'http://127.0.0.1:8000/nav-only-json/?callback=?'; - //var navbar_url = 'http://beta.dataverse.org/nav-only-json/?callback=?'; - var navbar_url = 'http://dataverse.org/nav-only-json/?callback=?'; - - var jqxhr = $.getJSON( navbar_url, function(data) { - console.log( "success" ); - $('#dv-bs-navbar-details').html(data.navbar_html); - $("#dataverse-org-homepage-url").attr("href", data.dataverse_dot_org_homepage_url) - }) - .fail(function() { - console.log( "error" ); - $('#dv-bs-navbar-details').html(''); - }) -} \ No newline at end of file diff --git a/doc/sphinx-guides/source/_templates/navbar.html b/doc/sphinx-guides/source/_templates/navbar.html deleted file mode 100644 index d88306be8ae..00000000000 --- a/doc/sphinx-guides/source/_templates/navbar.html +++ /dev/null @@ -1,70 +0,0 @@ -{# For dataverse.org SPHINX projects #} -{# Instructions: #} -{# (1) For a Sphinx project, copy the **contents** of this file into **navbar.html** #} -{# (2) Location of **navbar.html** within a SPHINX project: #} -{# - /source/_templates/**navbar.html** #} - - - diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py index 2aa1b486919..26e71672f2e 100755 --- a/doc/sphinx-guides/source/conf.py +++ b/doc/sphinx-guides/source/conf.py @@ -144,7 +144,7 @@ # ("Link", "http://example.com", True), # ], 'navbar_links': [ - ("View 3.6.2 Guides", "http://docs.dataverse.org/en/3.6.2/", True), + ("About Dataverse", "https://dataverse.org", True), ], # Global TOC depth for "site" navbar tab. (Default: 1) diff --git a/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html b/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html index d5df46c60d5..aa1d860a924 100755 --- a/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html +++ b/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html @@ -1,9 +1,12 @@