Merge "[www] consolidate training guides and training labs"

This commit is contained in:
Jenkins 2016-05-25 04:44:16 +00:00 committed by Gerrit Code Review
commit ec48a5ee58
5 changed files with 14 additions and 16 deletions

View File

@ -90,7 +90,6 @@
{% include 'templates/user_guides.tmpl' %} {% include 'templates/user_guides.tmpl' %}
{% include 'templates/contributor_guides.tmpl' %} {% include 'templates/contributor_guides.tmpl' %}
{% include 'templates/training_guides.tmpl' %} {% include 'templates/training_guides.tmpl' %}
{% include 'templates/training_labs.tmpl' %}
</div> </div>
</div> </div>
<div class="row docs-contribute-wrapper"> <div class="row docs-contribute-wrapper">

View File

@ -89,7 +89,6 @@
{% include 'templates/user_guides.tmpl' %} {% include 'templates/user_guides.tmpl' %}
{% include 'templates/contributor_guides.tmpl' %} {% include 'templates/contributor_guides.tmpl' %}
{% include 'templates/training_guides.tmpl' %} {% include 'templates/training_guides.tmpl' %}
{% include 'templates/training_labs.tmpl' %}
</div> </div>
</div> </div>
<div class="row docs-contribute-wrapper"> <div class="row docs-contribute-wrapper">

View File

@ -1,5 +1,7 @@
<div class="docs-link-sections"> <div class="docs-link-sections">
<h3 id="training-guides"><i class="fa fa-university"></i> Training Guides</h3> <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides And Training Labs</h3>
<a href="/upstream-training/">Upstream training</a> <a href="/upstream-training/">Upstream training</a>
<p>Resources for the OpenStack Upstream Training program</p> <p>Resources for the OpenStack Upstream Training program</p>
<a href="/training_labs/">Training Labs</a>
<p>Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.</p>
</div> </div>

View File

@ -1,5 +0,0 @@
<div class="docs-link-sections">
<h3 id="training_labs"><i class="training-labs"></i>Training Labs</h3>
<a href="http://docs.openstack.org/training_labs/index.html">Training Labs</a>
<p>Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.</p>
</div>

View File

@ -3,24 +3,27 @@
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<body> <body>
<ul> <ul>
<li><a href="www/index.html">/index.html</a></li>
<li><a href="www/draft/draft-index.html">/draft/draft-index.html</a></li>
<li><a href="www/api/api-ref-guides.html">/api/api-ref-guides.html</a></li> <li><a href="www/api/api-ref-guides.html">/api/api-ref-guides.html</a></li>
<li><a href="www/arch/index.html">/arch/index.html</a></li> <li><a href="www/arch/index.html">/arch/index.html</a></li>
<li><a href="www/de/index.html">/de/index.html</a></li>
<li><a href="www/developer/language-bindings.html">/developer/language-bindings.html</a></li> <li><a href="www/developer/language-bindings.html">/developer/language-bindings.html</a></li>
<li><a href="www/developer/openstack-projects.html">/developer/openstack-projects.html</a></li> <li><a href="www/developer/openstack-projects.html">/developer/openstack-projects.html</a></li>
<li><a href="www/fr/index.html">/fr/index.html</a></li>
<li><a href="www/index.html">/index.html</a></li>
<li><a href="www/ja/index.html">/ja/index.html</a></li>
<li><a href="www/ko_KR/index.html">/ko_KR/index.html</a></li>
<li><a href="www/ops/index.html">/ops/index.html</a></li> <li><a href="www/ops/index.html">/ops/index.html</a></li>
<li><a href="www/pt_BR/index.html">/pt_BR/index.html</a></li>
<li><a href="www/sec/index.html">/sec/index.html</a></li> <li><a href="www/sec/index.html">/sec/index.html</a></li>
<li><a href="www/draft/draft-index.html">/draft/draft-index.html</a></li> <li><a href="www/training_labs/index.html">/training_labs/index.html</a></li>
<li><a href="www/zh_CN/index.html">/zh_CN/index.html</a></li> <!-- release -->
<li><a href="www/juno/index.html">/juno/index.html</a></li> <li><a href="www/juno/index.html">/juno/index.html</a></li>
<li><a href="www/kilo/index.html">/kilo/index.html</a></li> <li><a href="www/kilo/index.html">/kilo/index.html</a></li>
<li><a href="www/liberty/index.html">/liberty/index.html</a></li> <li><a href="www/liberty/index.html">/liberty/index.html</a></li>
<li><a href="www/mitaka/index.html">/mitaka/index.html</a></li> <li><a href="www/mitaka/index.html">/mitaka/index.html</a></li>
<!-- translation -->
<li><a href="www/de/index.html">/de/index.html</a></li>
<li><a href="www/fr/index.html">/fr/index.html</a></li>
<li><a href="www/ja/index.html">/ja/index.html</a></li>
<li><a href="www/ko_KR/index.html">/ko_KR/index.html</a></li>
<li><a href="www/pt_BR/index.html">/pt_BR/index.html</a></li>
<li><a href="www/zh_CN/index.html">/zh_CN/index.html</a></li>
</ul> </ul>
</body> </body>
</html> </html>