From 81b33af4796d52b800adcd0cb3957f311b869421 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 12 Sep 2013 11:19:38 -0500
Subject: [PATCH] Update index.html pages to show Admin User Guide and to make
 pages consistent in style

bug: #1224547

Change-Id: I83498853757def153443227f5704e1aa4001bd44
author: diane fleming
---
 www/api/api-ref-guides.html | 44 ++++++++++++++---
 www/api/index.html          | 77 ++++++++++++++++++++---------
 www/developer/index.html    | 59 +++++++++++++++++++++-
 www/index.html              | 20 +++++---
 www/install/index.html      | 96 +++++++++++++++++++----------------
 www/trunk/index.html        | 99 +++++++++++++++++++------------------
 6 files changed, 267 insertions(+), 128 deletions(-)

diff --git a/www/api/api-ref-guides.html b/www/api/api-ref-guides.html
index fb9e90fa82..9e3b8505ea 100755
--- a/www/api/api-ref-guides.html
+++ b/www/api/api-ref-guides.html
@@ -60,9 +60,6 @@ div.c1 {width: 100%;}
         <div class="container">
             <div class="span-12">
                 <h3 class="subhead"><a href="http://docs.openstack.org/">Documentation</a> &gt; API References</h3>
-                
-                <p>Develop code for OpenStack clouds.</p>
-                <p>&nbsp;</p>
             </div>
             
             <div class="searchArea span-10 last">
@@ -99,8 +96,43 @@ div.c1 {width: 100%;}
             </div>
         </div>
         
-        <div class="container">
-            <div class="span-12">
+       <div class="container"> <div class="span-12">
+            <h4 class="special">Develop applications for OpenStack clouds</h4>
+            <dl>
+                <dd><a
+                    href="http://api.openstack.org/api-ref.html"
+                    >API Complete Reference</a>
+                </dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-block-storage/2.0/content/"
+                    >Block Storage Service API v2
+                    Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-compute/2/content/"
+                    >Compute API v2 and Extensions
+                    Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
+                    >Identity Service API v2.0
+                    Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-network/2.0/content/"
+                    >Networking API v2.0 Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-image-service/2.0/content/"
+                    >Image Service API v2 Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-image-service/1.1/content/"
+                    >Image Service API v1 Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/"
+                    >Object Storage API v1 Reference</a></dd>
+                <dd><a
+                    href="http://docs.openstack.org/api/openstack-compute/programmer/content/"
+                    >Programming Compute API with
+                    Shell and Python, 1st ed.</a></dd>
+            </dl>
+            <!--<div class="span-12">
                 <h2><a href="http://docs.openstack.org/api/openstack-block-storage/2.0/content/">OpenStack Block Storage Service API v2 Reference</a></h2>
                 
                 <p>Block Storage Service API v2.</p>
@@ -131,7 +163,7 @@ div.c1 {width: 100%;}
                 <p>Object Storage API v1.</p>
                 
             </div>
-        </div>
+        </div>--></div></div>
         
         <div class="container" id="footer">
             <hr>
diff --git a/www/api/index.html b/www/api/index.html
index 12b5ffd8e2..8fb2c1fd84 100644
--- a/www/api/index.html
+++ b/www/api/index.html
@@ -133,29 +133,62 @@
         }, true);
         </script>
         </div> -->
-<div class="container">
-		<div class="span-12">
-		<h2><a href="http://docs.openstack.org/api/quick-start/content/">OpenStack API Quick Start</a>
-			</h2>	
-			<p>Shows how to make requests against an OpenStack cloud.
-			</p>
-			<h2><a href="http://docs.openstack.org/api/openstack-compute/programmer/content/">OpenStack Compute API v1.1 Developer Guide with Shell and Python</a>
-			</h2>	
-			<p>Walk through of all Compute API commands using Python and shell.
-			</p>
-			<h2><a href="/api/api-ref-guides.html">API References</a>
-			</h2>	
-			<p>OpenStack API References for the OpenStack APIs.
-			</p>					
-		</div>
-		<div class="span-12 last">
-		<h2><a href="http://api.openstack.org">API Complete Reference </a>
-			</h2>
-			<p>Found at api.openstack.org.</p>
 
-		</div>
-		</div>
-		</div>          
+		</div> 
+    <div class="container">
+      <div class="span-12">
+        
+        
+        <h4 class="special">Use the OpenStack dashboard and command-line clients</h4>
+        <dl>
+          <dd><a
+            href="http://docs.openstack.org/api/quick-start/content/"
+            >API Quick Start</a></dd>			
+          <dd><a
+            href="http://docs.openstack.org/user-guide/content/"
+            >End User Guide</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/user-guide-admin/content/"
+            >Admin User Guide</a></dd>
+        </dl>
+        
+        <h4 class="special">Develop applications for OpenStack clouds</h4>
+        <dl>
+          <dd><a
+            href="http://api.openstack.org/api-ref.html"
+            >API Complete Reference</a>
+          </dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-block-storage/2.0/content/"
+            >Block Storage Service API v2
+            Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-compute/2/content/"
+            >Compute API v2 and Extensions
+            Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
+            >Identity Service API v2.0
+            Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-network/2.0/content/"
+            >Networking API v2.0 Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-image-service/2.0/content/"
+            >Image Service API v2 Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-image-service/1.1/content/"
+            >Image Service API v1 Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/"
+            >Object Storage API v1 Reference</a></dd>
+          <dd><a
+            href="http://docs.openstack.org/api/openstack-compute/programmer/content/"
+            >Programming Compute API with
+            Shell and Python, 1st ed.</a></dd>
+        </dl>
+      </div>
+    </div>
     <div class="container">
       <div id="footer">
         <hr />
diff --git a/www/developer/index.html b/www/developer/index.html
index 73b7c84824..3bae9bd836 100644
--- a/www/developer/index.html
+++ b/www/developer/index.html
@@ -121,7 +121,7 @@
     </div>
   </div>
   <div class="container">
-    <div class="span-12 last">
+   <!-- <div class="span-12 last">
       <h2><a href="http://docs.openstack.org/developer/openstack-projects.html">Python Developer Documentation</a>
       </h2>
       <p>Details about each project's internals for Python developers.
@@ -142,7 +142,62 @@
         Tempest test suite used in the OpenStack gate,
         as well as for testing your own clouds.
       </p>
-    </div>
+    </div> -->
+    <div class="span-12">
+      <h4 class="special">Develop applications for OpenStack clouds</h4>
+      <dl>
+        <dd><a
+          href="http://api.openstack.org/api-ref.html"
+          >API Complete Reference</a>
+        </dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-block-storage/2.0/content/"
+          >Block Storage Service API v2
+          Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-compute/2/content/"
+          >Compute API v2 and Extensions
+          Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
+          >Identity Service API v2.0
+          Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-network/2.0/content/"
+          >Networking API v2.0 Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-image-service/2.0/content/"
+          >Image Service API v2 Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-image-service/1.1/content/"
+          >Image Service API v1 Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/"
+          >Object Storage API v1 Reference</a></dd>
+        <dd><a
+          href="http://docs.openstack.org/api/openstack-compute/programmer/content/"
+          >Programming Compute API with
+          Shell and Python, 1st ed.</a></dd>
+      </dl>
+      <h4 class="special">Contribute to the OpenStack
+        infrastructure and code </h4>
+      <dl>
+        <dd><a
+          href="http://docs.openstack.org/developer/openstack-projects.html"
+          >Python Developer Documentation</a>
+        </dd>
+        <dd><a
+          href="http://docs.openstack.org/developer/language-bindings.html"
+          >Language Bindings and Python Clients</a>
+        </dd>
+        <dd><a href="http://ci.openstack.org/">OpenStack
+          Project Infrastructure</a>
+        </dd>
+        <dd><a
+          href="http://docs.openstack.org/developer/tempest/"
+          >Tempest Test Suite for OpenStack Documentation</a></dd>
+      </dl>
+  </div>
   </div>
   <div class="container">
     <div id="footer">
diff --git a/www/index.html b/www/index.html
index de93f67905..d8b70a63b9 100644
--- a/www/index.html
+++ b/www/index.html
@@ -229,16 +229,22 @@
 			
 			<div class="span-12 last">
 				<p>&nbsp;</p>
+				
+				<h4 class="special">Use the OpenStack dashboard and command-line clients</h4>
+				<dl>
+					<dd><a
+						href="http://docs.openstack.org/api/quick-start/content/"
+						>API Quick Start</a></dd>			
+					<dd><a
+						href="http://docs.openstack.org/user-guide/content/"
+						>End User Guide</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/user-guide-admin/content/"
+						>Admin User Guide</a></dd>
+				</dl>
 
 				<h4 class="special">Develop applications for OpenStack clouds</h4>
 				<dl>
-					<dd><a
-							href="http://docs.openstack.org/api/quick-start/content/"
-							>API Quick Start</a></dd>
-					
-					<dd><a
-						href="http://docs.openstack.org/user-guide/content/"
-							>End User Guide</a></dd>
 					<dd><a
 							href="http://api.openstack.org/api-ref.html"
 							>API Complete Reference</a>
diff --git a/www/install/index.html b/www/install/index.html
index 4cb3bc9086..80dbf9c69c 100644
--- a/www/install/index.html
+++ b/www/install/index.html
@@ -129,51 +129,61 @@
 		</div>
 		<div class="container">
 			<div class="span-18">
-				<p>Install and configure OpenStack Grizzly services on
-					various Linux distributions. </p>
-				<p>&nbsp;</p>
-				<h2><a
+				<h4 class="special">Install OpenStack</h4>
+				<dl>
+					<dd><a
 						href="http://docs.openstack.org/grizzly/basic-install/apt/content"
-						>OpenStack Basic Installation Guide for Ubuntu 12.04
-						(LTS) and Debian Wheezy</a>
-				</h2>
-				<p>Install and configure OpenStack Grizzly services
-					with Ubuntu 12.04 (LTS) or Debian Wheezy. Includes
-					the Identity, Image, Compute, Block Storage, and
-					Networking services. Set up a controller, network,
-					and compute node.</p>
-				<h2><a
-						href="http://docs.openstack.org/grizzly/basic-install/yum/content"
-						>OpenStack Basic Installation Guide for Fedora
-						18</a>
-				</h2>
-				<p>Install and configure OpenStack Grizzly services
-					with Fedora 18. Includes the Identity, Image,
-					Compute, Block Storage, and Networking services.
-					Set up a controller, network, and compute node. </p>
-				<h2><a
-						href="http://docs.openstack.org/grizzly/openstack-compute/install/yum/content/"
-						>OpenStack Installation Guide for Red
-						Hat Enterprise Linux, CentOS, and Fedora</a>
-				</h2>
-				<p>Install and configure OpenStack Grizzly services
-					with Red Hat Enterprise Linux (RHEL), 
-					CentOS, or Fedora 17. Includes the Identity, Image, Compute,
-					and Object Storage services. Register virtual
-					machine (VM) images and run VM instances. View
-					configuration file examples.</p>
-				<h2><a
+						>Basic Installation Guide for Ubuntu 12.04
+						(LTS) and Debian Wheezy</a></dd>
+					<dd>
+						<a
+							href="http://docs.openstack.org/grizzly/basic-install/yum/content"
+							>Basic Installation Guide for Fedora
+							18</a></dd>
+					<dd>
+						<a
+							href="http://docs.openstack.org/grizzly/openstack-compute/install/yum/content/"
+							>Installation Guide for Red Hat Enterprise
+							Linux, CentOS, and Fedora</a></dd>
+					<dd><a
 						href="http://docs.openstack.org/grizzly/openstack-compute/install/apt/content/"
-						>OpenStack Installation Guide for
-						Ubuntu 12.04 (LTS)</a>
-				</h2>
-				<p>Install and configure OpenStack Grizzly services
-					with Ubuntu 12.04 (LTS). Includes the Identity,
-					Image, Compute, and Object Storage services.
-					Register virtual machine (VM) images and run VM
-					instances. View configuration file examples.</p>
-			</div>
-			<div class="span-12 last"> </div>
+						>Installation Guide for Ubuntu 12.04
+						(LTS)</a></dd>
+				</dl>
+				<h4 class="special">Configure and run an OpenStack
+					cloud</h4>
+				<dl>
+					<dd><a
+						href="http://docs.openstack.org/grizzly/openstack-block-storage/admin/content/"
+						>Block Storage Service Administration
+						Guide</a>
+					</dd>
+					<dd><a
+						href="http://docs.openstack.org/grizzly/openstack-compute/admin/content/"
+						>Compute Administration Guide</a>
+					</dd>
+					<dd><a
+						href="http://docs.openstack.org/trunk/openstack-ha/content/index.html"
+						
+						>High Availability Guide</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/grizzly/openstack-network/admin/content/"
+						>Networking Administration Guide</a>
+					</dd>
+					<dd><a
+						href="http://docs.openstack.org/grizzly/openstack-object-storage/admin/content/"
+						>Object Storage Administration Guide</a>
+					</dd>
+					<dd><a href="http://docs.openstack.org/ops/"
+						>Operations Guide</a></dd>
+					<dd><a href="http://docs.openstack.org/sec/"
+						>Security Guide</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/trunk/openstack-image/content/"
+						>Virtual Machine Image Guide</a></dd>
+				</dl>
+				
+		</div>
 		</div>
 		<div class="container">
 			<div id="footer">
diff --git a/www/trunk/index.html b/www/trunk/index.html
index 1bed631b2e..de6b4eac8f 100644
--- a/www/trunk/index.html
+++ b/www/trunk/index.html
@@ -96,6 +96,7 @@
 		<div class="container">
 			<div class="span-12">
 				<h3 class="subhead">Documentation</h3>
+				
 			</div>
 			<div class="searchArea span-10 last">
 				<div id="cse" style="width: 100%;"> Loading </div>
@@ -130,6 +131,8 @@
 		</script>
 			</div>
 		</div>
+		<div class="container"><div class="span-18"><p><b>Note:</b> The OpenStack documentation is
+			undergoing a major rework. Some links might not work while we move books around.</p></div></div>
 		<div class="container">
 			<div class="span-12">
 				<div class="dropDownTrigger">
@@ -163,10 +166,7 @@
 						href="http://openstack.org/software/start/"
 						>How to Get Started with OpenStack</a></h4>
 				<h4 class="special">Install OpenStack</h4>
-				<b>Note:The OpenStack documentation is
-				currently undergoing a major rework,
-				some links might not work at the
-				moment while we move books around.</b>
+				
 				<dl>
 					<dd><a
 					       href="http://docs.openstack.org/trunk/install-guide/install/yum/content/"
@@ -206,69 +206,72 @@
 					<dd><a
 					       href="http://docs.openstack.org/trunk/security-guide/content/"
 					       >Security Guide</a></dd>
-				</dl>
-				<h4 class="special">Use an OpenStack cloud</h4>
-				<dl>
-					<dd><a
-					       href="http://docs.openstack.org/user-guide/content"
-					       >End User Guide</a></dd>
-					<dd><a
-					       href="http://docs.openstack.org/user-guide-admin/content"
-					       >Admin User Guide</a></dd>
 					<dd><a
 						href="http://docs.openstack.org/trunk/image-guide/content/"
 						>Virtual Machine Image
 						Guide</a></dd>
-
+				</dl>
+				<h4 class="special">Get involved</h4>
+				<dl>
+					<dd><a
+						href="http://www.openstack.org/join"
+						>Join the OpenStack Foundation</a>
+					</dd>
+					<dd><a
+						href="http://www.openstack.org/user-survey/"
+						>Take the Deployment Survey</a>
+					</dd>
 				</dl>
 			</div>
 			<div class="span-12 last">
 <p>&nbsp;</p>
-				<h4 class="special">Use and develop software for
-					OpenStack clouds</h4>
+				<h4 class="special">Use the OpenStack dashboard and command-line clients</h4>
 				<dl>
 					<dd><a
-							href="http://docs.openstack.org/api/quick-start/content/"
-							>API Quick Start</a></dd>
+						href="http://docs.openstack.org/api/quick-start/content/"
+						>API Quick Start</a></dd>			
 					<dd><a
-							href="http://docs.openstack.org/api/openstack-compute/programmer/content/"
-							>Programming Compute API with
-							Shell and Python, 1st ed.</a></dd>
+						href="http://docs.openstack.org/user-guide/content/"
+						>End User Guide</a></dd>
 					<dd><a
-							href="http://docs.openstack.org/cli/quick-start/content/"
-							>Clients Guide</a></dd>
+						href="http://docs.openstack.org/user-guide-admin/content/"
+						>Admin User Guide</a></dd>
+				</dl>
+				
+				<h4 class="special">Develop applications for OpenStack clouds</h4>
+				<dl>
 					<dd><a
-							href="http://api.openstack.org/api-ref.html"
-							>API Complete Reference</a>
+						href="http://api.openstack.org/api-ref.html"
+						>API Complete Reference</a>
 					</dd>
 					<dd><a
-							href="http://docs.openstack.org/api/openstack-block-storage/2.0/content/"
-							>Block Storage Service API v2
-							Reference</a></dd>
-					<dd><a
-							href="http://docs.openstack.org/api/openstack-compute/2/content/"
-							>Compute API v2 and Extensions
-							Reference</a></dd>
-					<dd><a
-							href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
-							>Identity Service API v2.0
-							Reference</a></dd>
-					<dd><a
-						href="http://docs.openstack.org/api/openstack-network/2.0/content/"
-						>Networking API v2.0
+						href="http://docs.openstack.org/api/openstack-block-storage/2.0/content/"
+						>Block Storage Service API v2
 						Reference</a></dd>
 					<dd><a
-							href="http://docs.openstack.org/api/openstack-image-service/2.0/content/"
-							>Image Service API v2
-							Reference</a></dd>
+						href="http://docs.openstack.org/api/openstack-compute/2/content/"
+						>Compute API v2 and Extensions
+						Reference</a></dd>
 					<dd><a
-							href="http://docs.openstack.org/api/openstack-image-service/1.0/content/"
-							>Image Service API v1
-							Reference</a></dd>
+						href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
+						>Identity Service API v2.0
+						Reference</a></dd>
 					<dd><a
-							href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/"
-							>Object Storage API v1
-							Reference</a></dd>
+						href="http://docs.openstack.org/api/openstack-network/2.0/content/"
+						>Networking API v2.0 Reference</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/api/openstack-image-service/2.0/content/"
+						>Image Service API v2 Reference</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/api/openstack-image-service/1.1/content/"
+						>Image Service API v1 Reference</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/"
+						>Object Storage API v1 Reference</a></dd>
+					<dd><a
+						href="http://docs.openstack.org/api/openstack-compute/programmer/content/"
+						>Programming Compute API with
+						Shell and Python, 1st ed.</a></dd>
 				</dl>
 				<h4 class="special">Contribute to the OpenStack
 					infrastructure and code </h4>