Merge "[www] sync Kilo index page and fix page titles"

This commit is contained in:
Jenkins 2015-10-12 13:17:59 +00:00 committed by Gerrit Code Review
commit 258624c8ec
5 changed files with 196 additions and 192 deletions

View File

@ -1,7 +1,7 @@
{% set scriptdir = '../common/js/' %}
{% set cssdir = '../common/css/' %}
{% extends "templates/base.tmpl" %}
{% block pagetitle %}Current{% endblock %}
{% block pagetitle %}Havana{% endblock %}
{% block title %}{% endblock %}
{% block header %}
{% endblock header %}

View File

@ -1,7 +1,7 @@
{% set scriptdir = '../common/js/' %}
{% set cssdir = '../common/css/' %}
{% extends "templates/base.tmpl" %}
{% block pagetitle %}Current{% endblock %}
{% block pagetitle %}Icehouse{% endblock %}
{% block title %}{% endblock %}
{% block header %}
{% endblock header %}

View File

@ -6,8 +6,8 @@
{% block header %}
{% endblock header %}
{% block content %}
<!-- Begin Page Content -->
<div class="top-docs-wrapper">
<!-- Begin Page Content -->
<div class="top-docs-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-8">
@ -42,8 +42,8 @@
<div id="superuser-img"></div>
</div>
</div>
</div>
<div class="mid-docs-wrapper" id="docs-main-body">
</div>
<div class="mid-docs-wrapper" id="docs-main-body">
<div class="container">
<div class="row">
<div class="col-lg-9 col-md-9 col-sm-9">
@ -53,7 +53,7 @@
{% include 'templates/dropdown_releases_and_languages.tmpl' %}
</div>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-12">
@ -71,7 +71,6 @@
<h3 id="api-guides"><i class="fa fa-book"></i> API References</h3>
<a href="http://developer.openstack.org/api-ref.html">API Complete Reference (HTML)</a>
<a href="http://developer.openstack.org/api-ref-guides/bk-api-ref.pdf">API Complete Reference (PDF)</a>
<a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">Block Storage API v2 (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">Block Storage API v1 (DEPRECATED)</a>
<a href="http://developer.openstack.org/api-ref-compute-v2.1.html">Compute API v2.1 (CURRENT)</a>
@ -139,5 +138,5 @@
</div>
</div>
</div>
<!-- End Page Content -->
<!-- End Page Content -->
{% endblock content %}

View File

@ -1,7 +1,7 @@
{% set scriptdir = '../common/js/' %}
{% set cssdir = '../common/css/' %}
{% extends "templates/base.tmpl" %}
{% block pagetitle %}Current{% endblock %}
{% block pagetitle %}Juno{% endblock %}
{% block title %}{% endblock %}
{% block header %}
{% endblock header %}

View File

@ -1,13 +1,13 @@
{% set scriptdir = '../common/js/' %}
{% set cssdir = '../common/css/' %}
{% extends "templates/base.tmpl" %}
{% block pagetitle %}Current{% endblock %}
{% block pagetitle %}Kilo{% endblock %}
{% block title %}{% endblock %}
{% block header %}
{% endblock header %}
{% block content %}
<!-- Begin Page Content -->
<div class="top-docs-wrapper">
<!-- Begin Page Content -->
<div class="top-docs-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-8">
@ -42,9 +42,8 @@
<div id="superuser-img"></div>
</div>
</div>
</div>
</div>
<div class="mid-docs-wrapper" id="docs-main-body">
</div>
<div class="mid-docs-wrapper" id="docs-main-body">
<div class="container">
<div class="row">
<div class="col-lg-9 col-md-9 col-sm-9">
@ -54,7 +53,7 @@
{% include 'templates/dropdown_releases_and_languages.tmpl' %}
</div>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-12">
@ -63,7 +62,7 @@
<div class="row docs-toc">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="docs-link-sections">
<h3><i class="fa fa-cogs"></i> Install Guides</h3>
<h3 id="install-guides"><i class="fa fa-cogs"></i> Install Guides</h3>
<a href="/kilo/install-guide/install/zypper/content/">Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12</a>
<a href="/kilo/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</a>
<a href="/kilo/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
@ -82,7 +81,7 @@
<a href="http://developer.openstack.org/api-ref-identity-v3.html">Identity API v3 (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-identity-v3-ext.html">Identity API v3 extensions (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-identity-v2.html">Identity API v2.0 (SUPPORTED)</a>
<a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">Identity Admin API v2.0 (SUPPORTED)
<a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">Identity Admin API v2.0 (SUPPORTED)</a>
<a href="http://developer.openstack.org/api-ref-identity-v2-ext.html">Identity API v2.0 extensions (SUPPORTED)</a>
<a href="http://developer.openstack.org/api-ref-image-v2.html">Image Service API v2 (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-image-v1.html">Image Service API v1 (SUPPORTED)</a>
@ -90,10 +89,12 @@
<a href="http://developer.openstack.org/api-ref-networking-v2-ext.html">Networking API v2.0 extensions (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">Object Storage API v1 (SUPPORTED)</a>
<a href="http://developer.openstack.org/api-ref-orchestration-v1.html">Orchestration API v1 (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-share-v2.html">Shared File Systems API v2 (CURRENT)</a>
<a href="http://developer.openstack.org/api-ref-share-v1.html">Shared File Systems API v1 (SUPPORTED)</a>
<a href="http://developer.openstack.org/api-ref-telemetry-v2.html">Telemetry API v2 (CURRENT)</a>
</div>
<div class="docs-link-sections">
<h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
<h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
<a href="/arch-design/content/">Architecture Design Guide</a>
<a href="/kilo/config-reference/content/">Configuration Reference</a>
<a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
@ -105,17 +106,17 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="docs-link-sections">
<h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
<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>
<a href="/high-availability-guide/content/">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/networking-guide/">Networking Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
<a href="/arch-design/content/">Architecture Design Guide</a>
</div>
<div class="docs-link-sections">
<h3><i class="fa fa-cloud"></i> User Guides</h3>
<h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
<a href="http://developer.openstack.org/api-guide/quick-start/">API Guide</a>
<a href="/user-guide/">End User Guide (includes Python SDK)</a>
<a href="/user-guide-admin/">Admin User Guide</a>
@ -123,6 +124,10 @@
<a href="http://developer.openstack.org">Open source software for application development</a>
</div>
{% include 'templates/contributor_guides.tmpl' %}
<div class="docs-link-sections">
<h3 id="training-guides"><i class="fa fa-university"></i> Training Guides</h3>
<a href="/upstream-training/">Upstream training</a>
</div>
</div>
</div>
<div class="row docs-contribute-wrapper">
@ -133,5 +138,5 @@
</div>
</div>
</div>
<!-- End Page Content -->
<!-- End Page Content -->
{% endblock content %}