From 8614f66ab7b194733489c2da9bcb02a194c59421 Mon Sep 17 00:00:00 2001
From: Matthew Kassawara <mkassawara@gmail.com>
Date: Mon, 4 Jan 2016 13:04:24 -0700
Subject: [PATCH] [www] Add versioning to networking guide

Add versioning to the networking guide as follows:

1) Remove the networking guide from the template that
   includes similar continuous-release guides.
2) Add the networking guide below the template to the
   index.html, liberty/index.html, kilo/index.html, and
   juno/index.html files using specific releases.
3) Move the <div> tags from the template to the index.html
   files.

Note: The juno/index.html file references the Kilo version
      of the networking guide.

Change-Id: Ib3465beb3969fb1411e43286794f40695a3768ce
---
 www/index.html                          | 6 +++++-
 www/juno/index.html                     | 6 +++++-
 www/kilo/index.html                     | 6 +++++-
 www/liberty/index.html                  | 6 +++++-
 www/templates/ops_and_admin_guides.tmpl | 4 ----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/www/index.html b/www/index.html
index f1d984a522..49832777e4 100644
--- a/www/index.html
+++ b/www/index.html
@@ -75,7 +75,11 @@
                     <a href="/liberty/config-reference/content/">Configuration Reference</a>
                     <p>Installation and configuration options for OpenStack</p>
                 </div>
-                {% include 'templates/ops_and_admin_guides.tmpl' %}
+                <div class="docs-link-sections">
+                    {% include 'templates/ops_and_admin_guides.tmpl' %}
+                    <a href="/liberty/networking-guide/">Networking Guide</a>
+                    <p>Deploy and manage OpenStack Networking (neutron)</p>
+                </div>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
diff --git a/www/juno/index.html b/www/juno/index.html
index 81ca6247b2..e5009f75cd 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -75,7 +75,11 @@
                         <a href="/juno/config-reference/content/">Configuration Reference</a>
                         <p>Installation and configuration options for OpenStack</p>
                     </div>
-                    {% include 'templates/ops_and_admin_guides.tmpl' %}
+                    <div class="docs-link-sections">
+                        {% include 'templates/ops_and_admin_guides.tmpl' %}
+                        <a href="/kilo/networking-guide/">Networking Guide</a>
+                        <p>Deploy and manage OpenStack Networking (neutron)</p>
+                    </div>
                 </div>
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     {% include 'templates/user_guides.tmpl' %}
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 9dba063ce1..5c48d8a24b 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -74,7 +74,11 @@
                     <a href="/kilo/config-reference/content/">Configuration Reference</a>
                     <p>Installation and configuration options for OpenStack</p>
                 </div>
-                {% include 'templates/ops_and_admin_guides.tmpl' %}
+                <div class="docs-link-sections">
+                    {% include 'templates/ops_and_admin_guides.tmpl' %}
+                    <a href="/kilo/networking-guide/">Networking Guide</a>
+                    <p>Deploy and manage OpenStack Networking (neutron)</p>
+                </div>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
diff --git a/www/liberty/index.html b/www/liberty/index.html
index ff51dfe475..f676940bd2 100644
--- a/www/liberty/index.html
+++ b/www/liberty/index.html
@@ -75,7 +75,11 @@
                     <a href="/liberty/config-reference/content/">Configuration Reference</a>
                     <p>Installation and configuration options for OpenStack</p>
                 </div>
-                {% include 'templates/ops_and_admin_guides.tmpl' %}
+                <div class="docs-link-sections">
+                    {% include 'templates/ops_and_admin_guides.tmpl' %}
+                    <a href="/liberty/networking-guide/">Networking Guide</a>
+                    <p>Deploy and manage OpenStack Networking (neutron)</p>
+                </div>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
diff --git a/www/templates/ops_and_admin_guides.tmpl b/www/templates/ops_and_admin_guides.tmpl
index b3b5a7e51c..d52d6993cc 100644
--- a/www/templates/ops_and_admin_guides.tmpl
+++ b/www/templates/ops_and_admin_guides.tmpl
@@ -1,11 +1,8 @@
-                <div class="docs-link-sections">
                     <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
                     <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                     <p>Manage and troubleshoot an OpenStack cloud</p>
                     <a href="/ha-guide/">High Availability Guide</a>
                     <p>Install and configure OpenStack for high availability</p>
-                    <a href="/networking-guide/">Networking Guide</a>
-                    <p>Deploy and manage OpenStack Networking (neutron)</p>
                     <a href="/ops/">Operations Guide</a>
                     <p>Design, create, and administer a production OpenStack cloud</p>
                     <a href="/security-guide/">Security Guide</a>
@@ -14,4 +11,3 @@
                     <p>Obtain, create, and modify OpenStack-compatible virtual machine images</p>
                     <a href="/arch-design/">Architecture Design Guide</a>
                     <p>Guidelines for designing an OpenStack cloud</p>
-                </div>