Skip to content

Commit

Permalink
Fix bug 977447, adding PDF links, also adds Ubuntu 12.04 Starter Guid…
Browse files Browse the repository at this point in the history 
…e to www.

Adds PDF links to root, trunk and essex landing pages.
Fix link to Starter Guide.
Fix bug 977447

Change-Id: Ie20f18b2ad076e9f2d3da0bb8fcc57a62ed69e5f
  • Loading branch information
@annegentle
annegentle committed May 11, 2012
1 parent b4b4801 commit 250b081
Show file tree
Hide file tree
Showing 3 changed files with 159 additions and 48 deletions.
38 changes: 29 additions & 9 deletions www/essex/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<li class="link"><a href="/trunk/" title=
"Go to the &quot;Essex&quot; page">trunk</a></li>

<li class="link"><a href="/essex/" title=
"Go to the &quot;Essex&quot; page">Essex</a></li>
<li class="link"><a href="/diablo/" title=
"Go to the &quot;Diablo&quot; page">Diablo</a></li>

<li class="link"><a href="/incubation/" title=
"Go to the &quot;Incubation&quot; page">Incubation</a></li>
Expand All @@ -193,9 +193,11 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/essex/openstack-compute/admin/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/trunk/openstack-compute/admin/os-compute-adminguide-trunk.pdf"
<a href=
"http://docs.openstack.org/trunk/openstack-compute/admin/bk-compute-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

<tr>
Expand All @@ -206,23 +208,41 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/essex/openstack-object-storage/admin/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
<a href=
"http://docs.openstack.org/trunk/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-objectstorage-adminguide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
class="roundedButton">Get PDF &raquo;</a> </td>
</tr>

<tr>
<td><a href=
"http://docs.openstack.org/essex/openstack-compute/install/content/">
OpenStack Install and Deploy Guide - Compute, Image, and Identity
OpenStack Install and Deploy Guide - Compute, Object Storage, Image, and Identity
services plus Dashboard</a></td>

<td><a href=
"http://docs.openstack.org/essex/openstack-compute/install/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/diablo/openstack-compute/install/openstack-install-guide-diablo.pdf"
<a href=
"http://docs.openstack.org/trunk/openstack-compute/install/openstack-install-guide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-install-guide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>
<tr>
<td><a href=
"http://docs.openstack.org/essex/openstack-compute/starter/content/">
OpenStack Starter Guide for Ubuntu 12.04 - Compute, Object Storage (all-in-one), Image, and Identity
services plus Dashboard</a></td>

<td><a href=
"http://docs.openstack.org/essex/openstack-compute/starter/content/"
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/essex/openstack-compute/starter/os-compute-starterguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-starterguide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>
</table>
</div>
Expand Down
36 changes: 34 additions & 2 deletions www/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,12 @@ <h2><a href="/developer/">Developer Documentation</a></h2>

<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/admin/content/"
class="roundedButton">Read &raquo;</a>
</td>
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/trunk/openstack-compute/admin/bk-compute-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

<tr>
Expand All @@ -204,6 +208,10 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/trunk/openstack-object-storage/admin/content/"
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/trunk/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-objectstorage-adminguide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

Expand All @@ -215,6 +223,10 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/trunk/openstack-network/admin/content/"
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/trunk/openstack-network/admin/quantum-admin-guide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/quantum-admin-guide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

Expand All @@ -227,8 +239,28 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/install/content/"
class="roundedButton">Read &raquo;</a>

<a href=
"http://docs.openstack.org/trunk/openstack-compute/install/openstack-install-guide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-install-guide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>
<tr>
<td><a href=
"http://docs.openstack.org/essex/openstack-compute/starter/content/">
OpenStack Starter Guide for Ubuntu 12.04 - Compute, Object Storage (all-in-one), Image, and Identity
services plus Dashboard</a></td>

<td><a href=
"http://docs.openstack.org/essex/openstack-compute/starter/content/"
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/essex/openstack-compute/starter/os-compute-starterguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-starterguide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>
</table>
</div>
</div>
Expand Down
133 changes: 96 additions & 37 deletions www/trunk/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="google-site-verification" content=
"Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />

<title>OpenStack Docs: Trunk</title><!-- Google Fonts -->
<title>OpenStack Docs: Current</title><!-- Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=PT+Sans&amp;subset=latin'
rel='stylesheet' type='text/css' /><!-- Framework CSS -->
<link rel="stylesheet" href=
Expand All @@ -23,8 +23,7 @@
<link rel="stylesheet" href=
"http://openstack.org/themes/openstack/css/main.css" type="text/css" media=
"screen, projection, print" />
<link rel="stylesheet" type="text/css" href="../common/css/docblitz.css" />
<link rel="stylesheet" type="text/css" href="/shadowbox/shadowbox.css" />
<link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css" />
<!--<script type="text/javascript">
var _gaq = _gaq || [];
Expand All @@ -42,10 +41,11 @@
</head>

<body class="docshome" id="docshome">

<div class="container">
<div id="header">
<div class="span-5">
<h1 id="logo"><a href="http://www.openstack.org/">Open Stack</a></h1>
<h1 id="logo"><a href="http://www.openstack.org/">OpenStack</a></h1>
</div>

<div class="span-19 last">
Expand Down Expand Up @@ -76,15 +76,48 @@ <h1 id="logo"><a href="http://www.openstack.org/">Open Stack</a></h1>
</div>
</div>
</div>
</div><!-- Page Content -->
</div>

<!-- Page Content -->

<div class="container">
<div class="searchArea span-16 prepend-4">
<h1>Notice: This page contains only links to Trunk builds of OpenStack
Manuals, these are the latest manuals and may or may not be accurate for
the trunk code as it changes daily. Comments are not enabled on this
site, go to a release site to comment on a document.</h1>
<!--<div id="cse" style="width: 100%;">Loading</div>
<div class="container">
<div class="searchArea span-16 prepend-4">
<h1>Search All OpenStack Manuals</h1>

<div id="cse" style="width: 100%;">
Loading
</div><script src="http://www.google.com/jsapi" type="text/javascript">
</script> <script type="text/javascript">
//<![CDATA[

google.load('search', '1', {language : 'en'});
var _gaq = _gaq || [];
_gaq.push(["_setAccount", "UA-17511903-6"]);
function _trackQuery(control, searcher, query) {
var gaQueryParamName = "q";
var loc = document.location;
var url = [
loc.pathname,
loc.search,
loc.search ? '&' : '?',
gaQueryParamName == '' ? 'q' : encodeURIComponent(gaQueryParamName),
'=',
encodeURIComponent(query)
].join('');
_gaq.push(["_trackPageview", url]);
}
google.setOnLoadCallback(function() {
var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
customSearchControl.setSearchStartingCallback(null, _trackQuery);
customSearchControl.draw('cse');
}, true);
//]]>
</script>
</div><!--
<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" /> -->
<!-- <div id="cse" style="width: 100%;">Loading</div>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">
google.load('search', '1', {language : 'en'});
Expand All @@ -93,9 +126,8 @@ <h1>Notice: This page contains only links to Trunk builds of OpenStack
customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
customSearchControl.draw('cse');
}, true);
</script>-->
</div>

</script>
</div> -->
<div id="manuals" class="span-24 last">
<h3 class="subhead">OpenStack Manuals</h3>

Expand Down Expand Up @@ -129,7 +161,7 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<div class="span-24 last">
<table class="manualTable">
<tr>
<th>Release: <strong>Trunk</strong></th>
<th>Release: <strong>current</strong></th>

<th>
<div class="dropDownTrigger">
Expand All @@ -138,6 +170,8 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<div class="dropDown">
<div>
<ul>
<li class="link"><a href="/essex/" title=
"Go to the &quot;Essex&quot; page">Essex</a></li>

<li class="link"><a href="/diablo/" title=
"Go to the &quot;Diablo&quot; page">Diablo</a></li>
Expand All @@ -158,10 +192,12 @@ <h2><a href="/developer/">Developer Documentation</a></h2>

<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/admin/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/trunk/openstack-compute/admin/os-compute-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/trunk/openstack-compute/admin/bk-compute-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

<tr>
Expand All @@ -172,25 +208,28 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/trunk/openstack-object-storage/admin/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
<a href=
"http://docs.openstack.org/trunk/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-objectstorage-adminguide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

<tr>
<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/starter/content/">
Ubuntu Oneiric Starter Guide - OpenStack Compute, Image, and Object
Storage services</a></td>
"http://docs.openstack.org/trunk/openstack-network/admin/content/">
OpenStack Network Connectivity Administration Guide</a></td>

<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/starter/content/"
"http://docs.openstack.org/trunk/openstack-network/admin/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/trunk/openstack-compute/starter/openstack-starter-guide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-starter-guide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
<a href=
"http://docs.openstack.org/trunk/openstack-network/admin/quantum-admin-guide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/quantum-admin-guide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>

<tr>
<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/install/content/">
Expand All @@ -200,9 +239,27 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
<td><a href=
"http://docs.openstack.org/trunk/openstack-compute/install/content/"
class="roundedButton">Read &raquo;</a>
<!--<a href="http://docs.openstack.org/diablo/openstack-compute/install/openstack-install-guide-diablo.pdf"

<a href=
"http://docs.openstack.org/trunk/openstack-compute/install/openstack-install-guide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-install-guide-trunk-pdf']);"
class="roundedButton">PDF</a>--></td>
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>
<tr>
<td><a href=
"http://docs.openstack.org/essex/openstack-compute/starter/content/">
OpenStack Starter Guide for Ubuntu 12.04 - Compute, Object Storage (all-in-one), Image, and Identity
services plus Dashboard</a></td>

<td><a href=
"http://docs.openstack.org/essex/openstack-compute/starter/content/"
class="roundedButton">Read &raquo;</a>
<a href=
"http://docs.openstack.org/essex/openstack-compute/starter/os-compute-starterguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-starterguide-trunk-pdf']);"
class="roundedButton">Get PDF &raquo;</a>
</td>
</tr>
</table>
</div>
Expand All @@ -217,13 +274,14 @@ <h2><a href="/developer/">Developer Documentation</a></h2>
Openstack.org is powered by <a href=
"http://www.rackspacecloud.com/">Rackspace Cloud Computing</a>.</p>
</div>
</div><script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>

<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
</div>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>

<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
</script>


<script type="text/javascript" charset="utf-8">
<script type="text/javascript" charset="utf-8">
//<![CDATA[
$(document).ready(function() {

Expand Down Expand Up @@ -253,5 +311,6 @@ <h2><a href="/developer/">Developer Documentation</a></h2>

//]]>
</script>

</body>
</html>

0 comments on commit 250b081

Please sign in to comment.