Refactor the archives page and add some more versions

2 files changed, 30 insertions, 23 deletions

diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml
index b5d3e7b1..d3a2229e 100644
--- a/content/_data/versions.yaml
+++ b/content/_data/versions.yaml
@@ -1,9 +1,9 @@
-latest: 10.6
+current:
+- '10.6'
 
-online:
-- 10.6
+previous:
+- '10.5'
+- '10.4'
 
 offline:
-- 10.5
-- 10.4
-- 10.3
+- '10.3'
diff --git a/content/archives.html b/content/archives.html
index 7cdc1600..e53aa14b 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -1,41 +1,48 @@
 ---
+title: Docs archives | GitLab
 comments: false
-last_updated: 2018-09-04
+last_updated: 2018-04-12
 ---
 
 <h1>Docs archives</h1>
 
-Browse the archives for different GitLab versions. To browse them locally,
-you'll need to have <a href='https://docs.docker.com/install/' target='_blank'>Docker installed</a>.
+This website contains online documentation for the current version of GitLab
+and the two previous versions.
 
-<h2>Online archives</h2>
+<% unless @items['/_data/versions.yaml'][:offline].nil? %>
+To browse a version that is not available online, see the
+<a href='#offline-archives'>offline archives</a>.
+<% end %>
 
-The following archives are available online and can be browsed on
-<a href='/'>https://docs.gitlab.com</a>.
+<h2 id="current-version">Current versions <a class="anchor" href="#current-version" title="Permalink"></a></h2>
 
-<% @items['/_data/versions.yaml'][:online].each do |version| %>
+The current stable version is
+<a href='/<%= @items['/_data/versions.yaml'][:current].first %>/'><%= @items['/_data/versions.yaml'][:current].first %></a>.
 
-<h3><%= version %></h3>
+<h2 id="previous-online-versions">Previous online versions <a class="anchor" href="#previous-online-versions" title="Permalink"></a></h2>
 
-Visit the <a href='/<%= version %>/'>GitLab <%= version %> docs</a> or download
-them and browse locally:
-
-<div class="highlight"><pre class="highlight shell"><code>docker run <span class="nt">-it</span> <span class="nt">--rm</span> <span class="nt">-p</span> 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:<%= version %>
-</code></pre></div>
+The following archives are available online:
 
+<ul>
+<% @items['/_data/versions.yaml'][:previous].each do |version| %>
+  <li>
+    <a href='/<%= version %>/'><%= version %></a>
+  </li>
 <% end %>
+</ul>
 
-<h2>Offline archives</h2>
+<% unless @items['/_data/versions.yaml'][:offline].nil? %>
+<h2 id="offline-archives">Offline archives <a class="anchor" href="#offline-archives" title="Permalink"></a></h2>
 
-The following archives are available offline.
+The following archives are available and can be browsed offline. You'll need to have
+<a href='https://docs.docker.com/install/' target='_blank'>Docker installed</a>.
 
 <% @items['/_data/versions.yaml'][:offline].each do |version| %>
 
 <h3><%= version %></h3>
 
-Download them and browse locally:
-
 <div class="highlight"><pre class="highlight shell"><code>docker run <span class="nt">-it</span> <span class="nt">--rm</span> <span class="nt">-p</span> 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:<%= version %>
 </code></pre></div>
 
 <% end %>
+<% end %>