Merge pull request scala#6596 from exoego/older-version-notice

lrytz · web-flow · commit aac607b81ff5 · 2018-06-07T12:35:56.000+02:00
Add older version notice &amp; version in spec title
diff --git a/spec/_config.yml b/spec/_config.yml
@@ -1,4 +1,6 @@
 baseurl: /files/archive/spec/2.12
+latestScalaVersion: 2.12
+thisScalaVersion: 2.12
 safe: true
 lsi: false
 highlighter: false
diff --git a/spec/_includes/version-notice.yml b/spec/_includes/version-notice.yml
@@ -0,0 +1,3 @@
+{% if site.thisScalaVersion != site.latestScalaVersion %}
+<div class="version-notice">This is the specification of a previous version of Scala. See the <a href="{{ site.baseurl}}/../{{ site.latestScalaVersion }}/">Scala {{ site.latestScalaVersion }} spec</a>.</div>
+{% endif %}
diff --git a/spec/_layouts/default.yml b/spec/_layouts/default.yml
@@ -26,16 +26,26 @@
   <link rel="stylesheet" type="text/css" media="(max-width: 1400px), (orientation: portrait)" href="public/stylesheets/screen-small.css">
   <link rel="stylesheet" type="text/css" media="print" href="public/stylesheets/print.css">
   <link rel="stylesheet" type="text/css" href="public/stylesheets/fonts.css">
-  <title>{{ page.title }}</title>
+  <title>{{ page.title }} | Scala {{ site.thisScalaVersion }}</title>
 </head>
 
 <body>
   <header>
-    <nav id="chapters"><a id="github" href="https://github.com/scala/scala/tree/2.12.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at GitHub"></a>{% assign sorted_pages = site.pages | sort:"name" %}{% for post in sorted_pages %}{% if post.chapter >= 0 %}<a href="{{site.baseurl}}{{ post.url }}">{{post.chapter}} {{ post.title }}</a>{% endif %}{% endfor %}</nav>
+    <nav id="chapters">
+      <a href="{{site.baseurl}}/" title="Table of Contents">Scala {{ site.thisScalaVersion }}</a>
+      <a id="github" href="https://github.com/scala/scala/tree/2.12.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at GitHub"></a>
+      {% assign sorted_pages = site.pages | sort:"name" %}
+      {% for post in sorted_pages %}
+        {% if post.chapter >= 0 %}
+        <a href="{{site.baseurl}}{{ post.url }}">{{post.chapter}} {{ post.title }}</a>
+        {% endif %}
+      {% endfor %}
+    </nav>
   </header>
   <aside class="left"><nav id="toc"></nav></aside>
 
   <main id="content">
+{% include version-notice.yml %}
 {{ content }}
   </main>
 
diff --git a/spec/_layouts/toc.yml b/spec/_layouts/toc.yml
@@ -7,7 +7,7 @@
   <link rel="shortcut icon" type="image/png" href="public/favicon.ico">
 
   <script src="//code.jquery.com/jquery-2.1.3.min.js"></script>
-  <title>{{ page.title }}</title>
+  <title>{{ page.title }} | Scala {{ site.thisScalaVersion }}</title>
 
   <link rel="stylesheet" type="text/css" href="public/stylesheets/screen.css">
   <link rel="stylesheet" type="text/css" href="public/stylesheets/screen-toc.css">
@@ -19,11 +19,12 @@
   <div id="header-main">
   <img id="scala-logo" src="public/images/scala-spiral-white.png" />
   <span id="title">Scala Language Specification</span>
-  <a id="github" href="https://github.com/scala/scala/tree/2.12.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at GitHub"></a>
+  <a id="github" href="https://github.com/scala/scala/tree/{{ site.thisScalaVersion }}.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at GitHub"></a>
   </div>
-  <div id="header-sub">Version 2.12</div>
+  <div id="header-sub">Version {{ site.thisScalaVersion }}</div>
 </header>
 <main>
+{% include version-notice.yml %}
 {{ content }}
 </main>
 </body>
diff --git a/spec/public/stylesheets/screen.css b/spec/public/stylesheets/screen.css
@@ -502,3 +502,16 @@ header {
 /* proper rendering of MathJax into highlighted code blocks */
 .fixws { white-space: pre; }
 .fixws .math { white-space: nowrap; }
+
+.version-notice {
+    background-color: #C93A3A;
+    color: #f2f2f2;
+    border:1px solid #ccc;
+    padding: 1em;
+    margin-bottom: 1em;
+}
+.version-notice a {
+    color: #f2f2f2;
+    font-weight: bold;
+    text-decoration: underline;
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{% if site.thisScalaVersion != site.latestScalaVersion %}`
	`2`	`+<div class="version-notice">This is the specification of a previous version of Scala. See the <a href="{{ site.baseurl}}/../{{ site.latestScalaVersion }}/">Scala {{ site.latestScalaVersion }} spec</a>.</div>`
	`3`	`+{% endif %}`