From aa272ce55cac4c334b96ab755cb1c7b0ba7ddebb Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Tue, 24 May 2016 09:32:01 +0900 Subject: [PATCH] [www] consolidate training guides and training labs Change-Id: I368c816e66cad3b134b0fe309538e347e499f049 --- www/index.html | 1 - www/liberty/index.html | 1 - www/templates/training_guides.tmpl | 4 +++- www/templates/training_labs.tmpl | 5 ----- www/www-index.html | 19 +++++++++++-------- 5 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 www/templates/training_labs.tmpl diff --git a/www/index.html b/www/index.html index 3fdf7f14a6..c006c98864 100644 --- a/www/index.html +++ b/www/index.html @@ -90,7 +90,6 @@ {% include 'templates/user_guides.tmpl' %} {% include 'templates/contributor_guides.tmpl' %} {% include 'templates/training_guides.tmpl' %} - {% include 'templates/training_labs.tmpl' %}
diff --git a/www/liberty/index.html b/www/liberty/index.html index 7a9f5f2542..9c11990884 100644 --- a/www/liberty/index.html +++ b/www/liberty/index.html @@ -89,7 +89,6 @@ {% include 'templates/user_guides.tmpl' %} {% include 'templates/contributor_guides.tmpl' %} {% include 'templates/training_guides.tmpl' %} - {% include 'templates/training_labs.tmpl' %}
diff --git a/www/templates/training_guides.tmpl b/www/templates/training_guides.tmpl index ced5993e86..5f86e3980d 100644 --- a/www/templates/training_guides.tmpl +++ b/www/templates/training_guides.tmpl @@ -1,5 +1,7 @@
-

Training Guides

+

Training Guides And Training Labs

Upstream training

Resources for the OpenStack Upstream Training program

+ Training Labs +

Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.

diff --git a/www/templates/training_labs.tmpl b/www/templates/training_labs.tmpl deleted file mode 100644 index 31800328e7..0000000000 --- a/www/templates/training_labs.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -
-

Training Labs

- Training Labs -

Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.

-
diff --git a/www/www-index.html b/www/www-index.html index 67194e517f..f4045c2540 100644 --- a/www/www-index.html +++ b/www/www-index.html @@ -3,24 +3,27 @@