From 229b3b2a74e19095ffba5208741689cd6860fe32 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 28 Oct 2016 09:47:10 +0200
Subject: [PATCH] [www] Use https in more places

Switch over to https where possible for more files.

This addresses the templates folder.

Change-Id: I817c62556087edba32d51f32a283ab7f01042a41
---
 www/templates/css.tmpl           |  4 +--
 www/templates/footer.tmpl        | 28 +++++++--------
 www/templates/header.tmpl        | 58 ++++++++++++++++----------------
 www/templates/navigation.tmpl    | 14 ++++----
 www/templates/script_search.tmpl |  2 +-
 5 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/www/templates/css.tmpl b/www/templates/css.tmpl
index 2a154c9ce7..5a120fa7de 100644
--- a/www/templates/css.tmpl
+++ b/www/templates/css.tmpl
@@ -7,8 +7,8 @@
 
 
     <!-- Fonts -->
-    <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css" rel="stylesheet">
-    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css" rel="stylesheet">
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/www/templates/footer.tmpl b/www/templates/footer.tmpl
index e4bd62f588..b376b22e7e 100644
--- a/www/templates/footer.tmpl
+++ b/www/templates/footer.tmpl
@@ -6,27 +6,27 @@
                     <h3>OpenStack</h3>
                     <ul>
                         <li><a
-href="http://www.openstack.org/projects/">Projects</a></li>
+href="https://www.openstack.org/projects/">Projects</a></li>
                         <li><a
-href="http://www.openstack.org/projects/openstack-security/">OpenStack
+href="https://www.openstack.org/projects/openstack-security/">OpenStack
 Security</a></li>
                         <li><a
-href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                        <li><a href="http://www.openstack.org/blog/">Blog</a></li>
-                        <li><a href="http://www.openstack.org/news/">News</a></li>
+href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
+                        <li><a href="https://www.openstack.org/blog/">Blog</a></li>
+                        <li><a href="https://www.openstack.org/news/">News</a></li>
                     </ul>
                 </div>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Community</h3>
                     <ul>
-                        <li><a href="http://www.openstack.org/community/">User
+                        <li><a href="https://www.openstack.org/community/">User
 Groups</a></li>
                         <li><a
-href="http://www.openstack.org/community/events/">Events</a></li>
+href="https://www.openstack.org/community/events/">Events</a></li>
                         <li><a
-href="http://www.openstack.org/community/jobs/">Jobs</a></li>
+href="https://www.openstack.org/community/jobs/">Jobs</a></li>
                         <li><a
-href="http://www.openstack.org/foundation/companies/">Companies</a></li>
+href="https://www.openstack.org/foundation/companies/">Companies</a></li>
                         <li><a
 href="/infra/manual/developers.html">Contribute</a></li>
                     </ul>
@@ -37,7 +37,7 @@ href="/infra/manual/developers.html">Contribute</a></li>
                         <li><a href="http://docs.openstack.org">OpenStack
 Manuals</a></li>
                         <li><a
-href="http://www.openstack.org/software/start/">Getting Started</a></li>
+href="https://www.openstack.org/software/start/">Getting Started</a></li>
                         <li><a href="http://developer.openstack.org">API
 Documentation</a></li>
                         <li><a href="https://wiki.openstack.org">Wiki</a></li>
@@ -46,12 +46,12 @@ Documentation</a></li>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Branding & Legal</h3>
                     <ul>
-                        <li><a href="http://www.openstack.org/brand/">Logos &
+                        <li><a href="https://www.openstack.org/brand/">Logos &
 Guidelines</a></li>
                         <li><a
-href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark
+href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark
 Policy</a></li>
-                        <li><a href="http://www.openstack.org/privacy/">Privacy
+                        <li><a href="https://www.openstack.org/privacy/">Privacy
 Policy</a></li>
                         <li><a
 href="https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement">OpenStack
@@ -79,7 +79,7 @@ class="newsletter-btn">Join</button>
                     </form> -->
                     <p class="fine-print">
                         The OpenStack project is provided under the Apache 2.0
-license. Openstack.org is powered by <a href="http://rackspace.com"
+license. Openstack.org is powered by <a href="https://rackspace.com"
 target="_blank">Rackspace Cloud Computing</a>.
                     </p>
                 </div>
diff --git a/www/templates/header.tmpl b/www/templates/header.tmpl
index 00cf351d62..27cfeb23a4 100644
--- a/www/templates/header.tmpl
+++ b/www/templates/header.tmpl
@@ -59,25 +59,25 @@ id="bs-example-navbar-collapse-1">
             </li>
 
             <li>
-    <a href="http://www.openstack.org/software/" class="drop" id="dropdownMenuSoftware">Software <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/software/" class="drop" id="dropdownMenuSoftware">Software <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuSoftware">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/">Overview</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/project-navigator/">Project Navigator</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/sample-configs/">Sample Configs</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/">Overview</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/project-navigator/">Project Navigator</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/sample-configs/">Sample Configs</a></li>
         <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/start/">Get Started</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/roadmap/">Roadmap</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/latest-release/">Latest Release</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/sourcecode/">Source Code</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/start/">Get Started</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/roadmap/">Roadmap</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/latest-release/">Latest Release</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/sourcecode/">Source Code</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/user-stories/" class="drop" id="dropdownMenuUsers">Users <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/user-stories/" class="drop" id="dropdownMenuUsers">Users <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuUsers">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/user-stories/">Overview</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/user-stories/">Overview</a></li>
         <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/enterprise/">OpenStack in the Enterprise</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/appdev/">Application Developers</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/enterprise/">OpenStack in the Enterprise</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/appdev/">Application Developers</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="//superuser.openstack.org/">Superuser Magazine</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/surveys/landing">User Survey</a></li>
     </ul>
@@ -85,38 +85,38 @@ id="bs-example-navbar-collapse-1">
 <li>
     <a href="http://www.openstack.org/community/" class="drop" id="dropdownMenuCommunity">Community <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuCommunity">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/">Welcome! Start Here</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/foundation/">OpenStack Foundation</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://wiki.openstack.org">OpenStack Wiki</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://groups.openstack.org">User Groups</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/speakers/">Speakers Bureau</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/">Welcome! Start Here</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/">OpenStack Foundation</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://wiki.openstack.org">OpenStack Wiki</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://groups.openstack.org">User Groups</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/speakers/">Speakers Bureau</a></li>
         <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/foundation/companies/">Supporting Companies</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/jobs/">Jobs</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/companies/">Supporting Companies</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/jobs/">Jobs</a></li>
         <li role="presentation" class="divider"></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/join/">Join The Community</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/marketplace/">Marketplace</a>
+    <a href="https://www.openstack.org/marketplace/">Marketplace</a>
 </li>
 <li>
-    <a href="http://www.openstack.org/events/" class="drop" id="dropdownMenuEvents">Events <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/events/" class="drop" id="dropdownMenuEvents">Events <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuEvents">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/events/">Overview</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/summit/">The OpenStack Summit</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/events/#openstack_days">OpenStack Days</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/events/">Overview</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/summit/">The OpenStack Summit</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/events/#openstack_days">OpenStack Days</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/learn/" class="drop" id="dropdownMenuLearn">Learn <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/learn/" class="drop" id="dropdownMenuLearn">Learn <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuEvents">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/marketplace/training/">Training</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/marketplace/training/">Training</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="//superuser.openstack.org">Superuser Magazine</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="//ask.openstack.org">Ask a Technical Question</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/news/">News</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/blog/">Blog</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/videos/summits">Summit Videos</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/news/">News</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/blog/">Blog</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/videos/summits">Summit Videos</a></li>
     </ul>
 </li>
 <li>
diff --git a/www/templates/navigation.tmpl b/www/templates/navigation.tmpl
index 6ac69956a4..7e9381ee24 100644
--- a/www/templates/navigation.tmpl
+++ b/www/templates/navigation.tmpl
@@ -1,24 +1,24 @@
 <ul id="Menu1">
  <li>
-  <a href="http://www.openstack.org/" title="Go to the OpenStack Home page">Home</a>
+  <a href="https://www.openstack.org/" title="Go to the OpenStack Home page">Home</a>
  </li>
  <li>
-  <a class="link" href="http://www.openstack.org/software/" title="About OpenStack">About</a>
+  <a class="link" href="https://www.openstack.org/software/" title="About OpenStack">About</a>
  </li>
  <li>
-  <a class="link" href="http://www.openstack.org/user-stories/" title="Read stories about companies that use OpenStack to get work done.">User Stories</a>
+  <a class="link" href="https://www.openstack.org/user-stories/" title="Read stories about companies that use OpenStack to get work done.">User Stories</a>
  </li>
  <li>
-  <a class="link" href="http://www.openstack.org/community/" title="Go to the OpenStack Community page">Community</a>
+  <a class="link" href="https://www.openstack.org/community/" title="Go to the OpenStack Community page">Community</a>
  </li>
  <li>
-  <a class="link" href="http://www.openstack.org/profile/" title="Edit your OpenStack community profile">Profile</a>
+  <a class="link" href="https://www.openstack.org/profile/" title="Edit your OpenStack community profile">Profile</a>
  </li>
  <li>
-  <a href="http://www.openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a>
+  <a href="https://www.openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a>
  </li>
  <li>
-  <a href="http://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a>
+  <a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a>
  </li>
  <li>
   <a class="current" href="http://docs.openstack.org/" title="Go to the OpenStack Documentation">Documentation</a>
diff --git a/www/templates/script_search.tmpl b/www/templates/script_search.tmpl
index 286b011539..4620696334 100644
--- a/www/templates/script_search.tmpl
+++ b/www/templates/script_search.tmpl
@@ -1,4 +1,4 @@
-<script src="http://www.google.com/jsapi" type="text/javascript">
+<script src="https://www.google.com/jsapi" type="text/javascript">
 </script>
 <script type="text/javascript">
  //<![CDATA[