diff --git a/www/admin/index.html b/www/pike/admin/index.html similarity index 92% rename from www/admin/index.html rename to www/pike/admin/index.html index f126bbf84a..94a4d689f8 100644 --- a/www/admin/index.html +++ b/www/pike/admin/index.html @@ -26,9 +26,9 @@ <h3><i class="fa fa-book"></i> Administrator Guides for OpenStack Services</h3> {% for project in projects|sort(attribute='name') -%} {% if project.type in ['service', 'other'] and project.has_admin_guide %} - <a href="/{{project.name}}/latest/admin/"> - {{project.service}} ({{project.name}}) - </a><br /> + <a href="/{{project.name}}/{{series}}/admin/"> + {{project.service}} ({{project.name}}) + </a><br /> {% endif %} {%- endfor %} </div> diff --git a/www/api/index.html b/www/pike/api/index.html similarity index 93% rename from www/api/index.html rename to www/pike/api/index.html index 9beb29ba96..a1a4ca0c87 100644 --- a/www/api/index.html +++ b/www/pike/api/index.html @@ -36,7 +36,7 @@ <a href="https://developer.openstack.org/api-ref/{{project.service_type}}/"> API Reference</a> {% endif %} {% if project.has_in_tree_api_docs %} - <a href="https://docs.openstack.org/{{project.name}}/latest/api/"> API Guide</a> + <a href="/{{project.name}}/{{series}}/api/"> API Guide</a> {% endif %} {% if project.has_api_guide %} <a href="https://developer.openstack.org/api-guide/{{project.service_type}}/"> API Guide</a> @@ -50,7 +50,7 @@ <div class="docs-link-sections"> <h3><i class="fa fa-cloud"></i> User Guides</h3> <a href="https://developer.openstack.org/api-guide/quick-start/">API Guide</a><br/> - <a href="/user-guide/">OpenStack End User Guide (includes Python SDK)</a><br/> + <a href="../user/">OpenStack End User Guides (includes Python SDK)</a><br/> <a href="https://developer.openstack.org">Open source software for application development</a><br/> </div> </div> diff --git a/www/configuration/index.html b/www/pike/configuration/index.html similarity index 95% rename from www/configuration/index.html rename to www/pike/configuration/index.html index bbd075eda5..3fa990996a 100644 --- a/www/configuration/index.html +++ b/www/pike/configuration/index.html @@ -24,12 +24,12 @@ <div class="col-lg-6 col-md-6 col-sm-6"> <div class="docs-link-sections"> <h3><i class="fa fa-book"></i> Configuration Guides for OpenStack Services</h3> - <a href="/oslo.config/latest/configuration/"> + <a href="/oslo.config/{{series}}/configuration/"> General information about configuring OpenStack (oslo.config) </a><br /> {% for project in projects|sort(attribute='name') -%} {% if project.type in ['service', 'other'] and project.has_config_ref %} - <a href="/{{project.name}}/latest/configuration/"> + <a href="/{{project.name}}/{{series}}/configuration/"> {{project.service}} ({{project.name}}) </a><br /> {% endif %} diff --git a/www/project-deploy-guide/draft/index.html b/www/pike/deploy/index.html similarity index 93% rename from www/project-deploy-guide/draft/index.html rename to www/pike/deploy/index.html index b53a195dd6..e801d054c7 100644 --- a/www/project-deploy-guide/draft/index.html +++ b/www/pike/deploy/index.html @@ -22,8 +22,8 @@ <div class="col-lg-6 col-md-6 col-sm-6"> <div class="docs-link-sections"> <h3><i class="fa fa-cogs"></i>By deployment method</h3> - <p><a href="/project-deploy-guide/openstack-ansible/draft/">OpenStack-Ansible Deployment Guide</a></li></p> - <p><a href="/project-deploy-guide/kolla-ansible/draft/">Kolla Deployment Guide</a></li></p> + <p><a href="/project-deploy-guide/openstack-ansible/">OpenStack-Ansible Deployment Guide</a></li></p> + <p><a href="/project-deploy-guide/kolla-ansible/">Kolla Deployment Guide</a></li></p> </div> </div> </div> diff --git a/www/draft/draft-index.html b/www/pike/index.html similarity index 92% rename from www/draft/draft-index.html rename to www/pike/index.html index c91a7ec0bd..5578e2c1fe 100644 --- a/www/draft/draft-index.html +++ b/www/pike/index.html @@ -1,5 +1,5 @@ {% extends "templates/base.tmpl" %} -{% block pagetitle %}Draft{% endblock %} +{% block pagetitle %}{% endblock %} {% block title %}{% endblock %} {% block header %} {% endblock header %} @@ -55,34 +55,34 @@ <div class="row docs-toc"> <div class="col-lg-6 col-md-6 col-sm-6"> <div class="docs-link-sections"> - <h3 id="install-guides"><i class="fa fa-cogs"></i>Draft Installation Tutorials and Guides</h3> - <a href="/project-install-guide/draft/">Installation Tutorials and Guides</a> + <h3 id="install-guides"><i class="fa fa-cogs"></i>Installation Tutorials and Guides</h3> + <a href="install/">Installation Tutorials and Guides</a> </div> <div class="docs-link-sections"> - <h3 id="deploy-guides"><i class="fa fa-cogs"></i>Draft Deployment Guides</h3> - <a href="/project-deploy-guide/draft/">Deployment Guides</a> + <h3 id="deploy-guides"><i class="fa fa-cogs"></i>Deployment Guides</h3> + <a href="deploy/">Deployment Guides</a> </div> <div class="docs-link-sections"> - <h3 id="configuration-guides"><i class="fa fa-wrench"></i>Draft Configuration Guides</h3> - <a href="/configuration/">Configuration Reference</a> + <h3 id="configuration-guides"><i class="fa fa-wrench"></i>Configuration Guides</h3> + <a href="configuration/">Configuration Reference</a> </div> <div class="docs-link-sections"> - <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i>Draft Operations and Administration Guides</h3> - <a href="/draft/ha-guide-draft/">Draft High Availability Guide</a> + <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i>Operations and Administration Guides</h3> + <a href="/ha-guide/">High Availability Guide</a> </div> <div class="docs-link-sections"> - <h3 id="api-guides"><i class="fa fa-book"></i>Draft API Guides</h3> - <a href="https://developer.openstack.org/draft/firstapp-dotnet/">Writing Your First Application: .Net</a> - <a href="https://developer.openstack.org/draft/firstapp-fog/">Writing Your First Application: Fog</a> - <a href="https://developer.openstack.org/draft/firstapp-pkgcloud/">Writing Your First Application: Pkgcloud</a> - <a href="https://developer.openstack.org/draft/firstapp-shade/">Writing Your First Application: Shade</a> + <h3 id="api-guides"><i class="fa fa-book"></i>API Guides</h3> + <a href="https://developer.openstack.org/draft/firstapp-dotnet/">Writing Your First Application: .Net</a><br/> + <a href="https://developer.openstack.org/draft/firstapp-fog/">Writing Your First Application: Fog</a><br/> + <a href="https://developer.openstack.org/draft/firstapp-pkgcloud/">Writing Your First Application: Pkgcloud</a><br/> + <a href="https://developer.openstack.org/draft/firstapp-shade/">Writing Your First Application: Shade</a><br/> </div> </div> <div class="col-lg-6 col-md-6 col-sm-6"> <div class="docs-link-sections"> - <h3><i class="fa fa-pencil"></i>Draft Translated Guides</h3> + <h3><i class="fa fa-pencil"></i>Translated Guides</h3> To help with translation, join the - <a href="/developer/i18n/">OpenStack I18n team</a> + <a href="/i18n/">OpenStack I18n team</a> <h4 id="zh_CN">Chinese (zh_CN)</h4> <a href="/draft/zh_CN/install-guide-obs/">Installation Guide for openSUSE and SUSE Linux Enterprise</a> <a href="/draft/zh_CN/install-guide-rdo/">Installation Guide for Red Hat Enterprise Linux and CentOS</a> diff --git a/www/project-install-guide/draft/index.html b/www/pike/install/index.html similarity index 93% rename from www/project-install-guide/draft/index.html rename to www/pike/install/index.html index ff4e1b5e80..bb6877ee5b 100644 --- a/www/project-install-guide/draft/index.html +++ b/www/pike/install/index.html @@ -18,7 +18,7 @@ </p> <p> If you prefer to install OpenStack using an automated deployment - tool, see the <a href="http://docs.openstack.org/project-deploy-guide/draft/index.html">Draft Deployment Guides.</a> + tool, see the <a href="../deploy/">Deployment Guides.</a> </p> </div> </div> @@ -34,7 +34,8 @@ setting up your environment, and launching your instance. </p> <p> - <a class="overview-btn docs-btn" style="width:80%;text-transform:initial;" href="/draft/install-guide/"> + <a class="overview-btn docs-btn" style="width:80%;text-transform:initial;" + href="/install-guide/"> OpenStack Installation Tutorial </a> </p> diff --git a/www/pike/language-bindings.html b/www/pike/language-bindings.html new file mode 100644 index 0000000000..c4cf78fd13 --- /dev/null +++ b/www/pike/language-bindings.html @@ -0,0 +1,64 @@ +{% set series = 'latest' %} +{% set projects = PROJECT_DATA[series] %} +{% extends "templates/base.tmpl" %} +{% block pagetitle %}Language bindings{% endblock %} +{% block title %} +<a href="https://docs.openstack.org/">Documentation</a> > Language Bindings and Python Clients +{% endblock %} +{% block content %} +<!-- 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"> + <h1>OpenStack API Bindings</h1> + <p> + This page contains documentation about the Python bindings provided by OpenStack and how to use them. + </p> + </div> + </div> + </div> + <div class="mid-docs-wrapper" id="docs-main-body"> + <div class="container"> + <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-book"></i> Bindings for the OpenStack APIs</h3> +{% for project in projects|sort(attribute='service') -%} +{% if project.type == 'client' %} + <a href="/{{project.name}}/{{series}}/"> + {{project.service}} ({{project.description}}) + </a><br /> +{% endif %} +{%- endfor %} + </div> + </div> + <div class="col-lg-6 col-md-6 col-sm-6"> + <div class="docs-link-sections"> + <h3><i class="fa fa-cloud"></i> Use the dashboard and command-line clients</h3> + <a href="../user/"> + OpenStack End User Guide + </a><br /> + <p> + User guide for the OpenStack dashboard and command-line clients. + </p> + <a href="/python-openstackclient/{{series}}/"> + Unified OpenStack Client + </a><br /> + <p> + Documentation for python-openstackclient, a unified shell command structure. + </p> + </div> + </div> + </div> + <div class="row docs-contribute-wrapper"> + <div class="col-lg-12"> + <p>Documentation treated like code, powered by the community - interested?</p> + <a href="/contributor-guide/" class="overview-btn contribute-btn" + >How To Contribute <i class="fa fa-chevron-right"></i></a> + </div> + </div> + </div> + </div> + +{% endblock content %} diff --git a/www/pike/openstack-projects.html b/www/pike/openstack-projects.html new file mode 100644 index 0000000000..733a2f30f8 --- /dev/null +++ b/www/pike/openstack-projects.html @@ -0,0 +1,105 @@ +{% set series = 'latest' %} +{% set projects = PROJECT_DATA[series] %} +{% extends "templates/base.tmpl" %} +{% block pagetitle %}Services and Libraries{% endblock %} +{% block title %} +<a href="https://docs.openstack.org">Documentation</a> > Services and Libraries +{% endblock %} +{% block content %} + <!-- 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"> + <h1>OpenStack Projects</h1> + <p> + This page contains project-specific documentation for + OpenStack services and libraries. + </p> + </div> + </div> +</div> +<div class="mid-docs-wrapper" id="docs-main-body"> + <div class="container"> + <div class="row"> + <div class="col-lg-12"> + </div> + </div> + <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-cog"></i> OpenStack Services</h3> +{% for project in projects|sort(attribute='service') %} +{% if project.type in ['service', 'other'] %} + <a href="/{{project.name}}/latest/"> + {{project.service}} ({{project.name}})</a><br /> +{% endif %} +{% endfor %} + </div> + + <div class="docs-link-sections"> + <h3><i class="fa fa-cog"></i> Bare Metal Sub Projects</h3> +{% for project in projects|sort(attribute='service') %} +{% if project.type == 'baremetal' %} + <a href="/{{project.name}}/latest/"> + {{project.service}} ({{project.name}})</a><br /> +{% endif %} +{% endfor %} + </div> + + <div class="docs-link-sections"> + <h3><i class="fa fa-cog"></i> Networking Sub Projects</h3> +{% for project in projects|sort(attribute='service') %} +{% if project.type == 'networking' %} + <a href="/{{project.name}}/latest/"> + {{project.service}} ({{project.name}})</a><br /> +{% endif %} +{% endfor %} + </div> + + <div class="docs-link-sections"> + <h3><i class="fa fa-cog"></i> Deployment Projects</h3> +{% for project in projects|sort(attribute='service') %} +{% if project.type == 'deployment' %} + <a href="/{{project.name}}/latest/"> + {{project.service}}</a><br /> +{% endif %} +{% endfor %} + </div> + + <div class="docs-link-sections"> + <h3><i class="fa fa-cog"></i> Contributor Tools</h3> +{% for project in projects|sort(attribute='name') %} +{% if project.type in ['tool'] %} + <a href="/{{project.name}}/latest/">{{project.name}}</a><br /> + <p>{{project.service}} </p> +{% endif %} +{% endfor %} + </div> + + </div> + <div class="col-lg-6 col-md-6 col-sm-6"> + + <div class="docs-link-sections"> + <h3><i class="fa fa-pencil"></i> Using Libraries</h3> +{% for project in projects|sort(attribute='name') %} +{% if project.type == 'library' %} + <a href="/{{project.name}}/latest/">{{project.name}}</a><br /> + <p>{{project.service}}</p> +{% endif %} +{% endfor %} + </div> + + </div> + </div> + <div class="row docs-contribute-wrapper"> + <div class="col-lg-12"> + <p>Documentation treated like code, powered by the community - interested?</p> + <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a> + </div> + </div> + </div> +</div> + +{% endblock content %} diff --git a/www/user/index.html b/www/pike/user/index.html similarity index 91% rename from www/user/index.html rename to www/pike/user/index.html index 14a77011f7..bef4d32ec6 100644 --- a/www/user/index.html +++ b/www/pike/user/index.html @@ -1,7 +1,5 @@ {% set series = 'latest' %} {% set projects = PROJECT_DATA[series] %} -{% set scriptdir = '../common/js/' %} -{% set cssdir = '../common/css/' %} {% extends "templates/base.tmpl" %} {% block pagetitle %}User Guides{% endblock %} {% block title %} @@ -34,7 +32,7 @@ <h3><i class="fa fa-cog"></i> OpenStack Services</h3> {% for project in projects|sort(attribute='service') %} {% if project.type in ['service', 'other'] and project.has_user_guide %} - <a href="/{{project.name}}/latest/user/"> + <a href="/{{project.name}}/{{series}}/user/"> {{project.service}} ({{project.name}})</a><br /> {% endif %} {% endfor %} @@ -46,7 +44,7 @@ <h3><i class="fa fa-cog"></i> Client Libraries</h3> {% for project in projects|sort(attribute='name') %} {% if project.type in ['client'] and project.has_user_guide %} - <a href="/{{project.name}}/latest/">{{project.name}}</a><br /> + <a href="/{{project.name}}/{{series}}/">{{project.name}}</a><br /> <p>{{project.service}} </p> {% endif %} {% endfor %} diff --git a/www/templates/dropdown_releases_and_languages.tmpl b/www/templates/dropdown_releases_and_languages.tmpl index 1981374130..36a991bb30 100644 --- a/www/templates/dropdown_releases_and_languages.tmpl +++ b/www/templates/dropdown_releases_and_languages.tmpl @@ -3,10 +3,10 @@ <a data-toggle="dropdown" href="#">More Releases & Languages <i class="fa fa-caret-down fa-3"></i></a> <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> <li role="presentation" class="dropdown-header">Releases</li> + <li role="presentation"><a role="menuitem" tabindex="-1" href="/pike">Pike (under development)</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="/ocata">Ocata (current release)</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="/newton">Newton</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="/mitaka">Mitaka</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="/draft/draft-index.html">Unreleased</a></li> <li role="presentation" class="dropdown-header">Languages</li> <li role="presentation"><a role="menuitem" tabindex="-1" href="/de">Deutsch (German)</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="/fr">Français (French)</a></li>