From e942d513001b6fec22d53493daeee4a6363d5564 Mon Sep 17 00:00:00 2001 From: Carl-Erik Kopseng Date: Fri, 12 Oct 2018 02:36:02 +0200 Subject: [PATCH] Add banner that points to latest version closes #1923 Only displays on doc pages for non-recent versions --- docs/_includes/banner.html | 10 ++++++++++ docs/_includes/head.html | 8 +++++++- docs/_layouts/default.html | 2 ++ docs/_layouts/page.html | 12 ++++++------ docs/assets/css/main.scss | 4 ++++ 5 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 docs/_includes/banner.html diff --git a/docs/_includes/banner.html b/docs/_includes/banner.html new file mode 100644 index 000000000..6b64d73f7 --- /dev/null +++ b/docs/_includes/banner.html @@ -0,0 +1,10 @@ + + + diff --git a/docs/_includes/head.html b/docs/_includes/head.html index 7a6c3a62a..3617bad7a 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -6,6 +6,9 @@ + {% comment %} To make all documentation pages, regardless of version, lead search traffic to the latest version, @@ -14,8 +17,11 @@ {% assign url_parts = page.url | split: "/" %} - {%if page.url contains "/releases/v" %} + {%if page.url contains "/releases/v" and url_parts[2] != "latest" and url_parts[2] != {site.sinon.current_release} %} {% assign canonical_page_url = "/releases/latest/" | append: url_parts[3] %} + {% else %} {% assign canonical_page_url = page.url | replace:'index.html','' %} {% endif %} diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 68c748c6d..54a06d5fe 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -6,6 +6,8 @@
+ {% include banner.html %} + {{ content }}
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html index ce233ad75..9655bad55 100644 --- a/docs/_layouts/page.html +++ b/docs/_layouts/page.html @@ -3,12 +3,12 @@ ---
-
-

{{ page.title }}

-
+
+

{{ page.title }}

+
-
- {{ content }} -
+
+ {{ content }} +
diff --git a/docs/assets/css/main.scss b/docs/assets/css/main.scss index 209b2150f..3c9306d78 100644 --- a/docs/assets/css/main.scss +++ b/docs/assets/css/main.scss @@ -18,6 +18,10 @@ body { background: #fff; } +.hidden { + display: none; +} + .navbar { background: #fff; margin-top: 10px;