From c340c6914f954e55261c61d2418133d7f599f387 Mon Sep 17 00:00:00 2001
From: Dave Syer <david_syer@hotmail.com>
Date: Tue, 30 Sep 2014 09:09:50 +0100
Subject: [PATCH 1/8] Fix "rm -rf" instruictions

Existing copy is wrong because "git rm -rf *" fails if there are any untracked files (e.g. target/). Changed to "git rm -rf `git ls-files`".
---
 README.markdown | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 8f3f7b981c2..5a462d848fe 100644
--- a/README.markdown
+++ b/README.markdown
@@ -15,8 +15,7 @@ From within your Spring project's git checkout directory:
 
 ### Remove all files
 
-    git rm -rf *
-    git rm -rf '.*'
+    git rm -rf `git ls-files` && rm -rf *
 
 ### Add the gh-pages-upstream remote
 

From ccb4a8a2bbfd19784511c6a5b4c014a7b59c3f73 Mon Sep 17 00:00:00 2001
From: Dave Syer <david_syer@hotmail.com>
Date: Tue, 30 Sep 2014 09:37:55 +0100
Subject: [PATCH 2/8] Gem installation instructions updated

Using "gem install" didn't work for me because of the Gemfile.lock that is in source control (presumably for a reason).
---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 5a462d848fe..49f89f78c61 100644
--- a/README.markdown
+++ b/README.markdown
@@ -95,9 +95,9 @@ Assuming you're already within your project's clone directory, and you've alread
 
 ### Install jekyll if you have not already
 
-> **Note:** Jekyll 1.1.2 is a known good version.
+> **Note:** Jekyll 1.1.2 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it:
 
-    gem install jekyll
+    bundle
 
 ### Run jekyll
 

From b67c026a16a5f49857bdd7f8a7d5ad641a775f41 Mon Sep 17 00:00:00 2001
From: Dave Syer <david_syer@hotmail.com>
Date: Tue, 30 Sep 2014 09:43:46 +0100
Subject: [PATCH 3/8] Fix directory name for sample pages

---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 5a462d848fe..5c56d982f60 100644
--- a/README.markdown
+++ b/README.markdown
@@ -49,11 +49,11 @@ At this point you need to make a decision: is your project a "grouping project",
 
 Based on your choice above, copy the correct sample page to `index.html`, e.g.:
 
-    $ cp sample-pages/project.html index.html
+    $ cp _sample-pages/project.html index.html
 
 or
 
-    $ cp sample-pages/project_group.html index.html
+    $ cp _sample-pages/project_group.html index.html
 
 
 ## Edit the content of your home page

From fc0cf54962dec3f213ce7b53ecefe7e146f650b6 Mon Sep 17 00:00:00 2001
From: Dave Syer <david_syer@hotmail.com>
Date: Tue, 30 Sep 2014 11:36:48 +0100
Subject: [PATCH 4/8] Add "gem install bundler" for people using vanilla Ruby

---
 README.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.markdown b/README.markdown
index 49f89f78c61..81c67e7601b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -97,6 +97,7 @@ Assuming you're already within your project's clone directory, and you've alread
 
 > **Note:** Jekyll 1.1.2 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it:
 
+    gem install bundler
     bundle
 
 ### Run jekyll

From bf15ee8a6da0f232254ac8d186184a5c274d63b3 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Mon, 9 Mar 2015 11:58:27 +0100
Subject: [PATCH 5/8] Display Pivotal Education related courseware

This change adds a new "Related Courseware" section in the side
container; this section lists links to courses and talks that are
relevant to the current project page.

Relevant content is fetched by the browser, with an AJAX request sent to
the Pivotal Education LMS API. This API uses the Referrer HTTP header as
input parameter to its content selection algorithm.

Note that CORS HTTP headers are also used to allow/disallow AJAX cross
domain requests.
---
 _includes/widget_templates.html  | 20 ++++++++++++++
 js/projectDocumentationWidget.js | 46 ++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/_includes/widget_templates.html b/_includes/widget_templates.html
index 4e609c6fff4..1495ae53dd4 100644
--- a/_includes/widget_templates.html
+++ b/_includes/widget_templates.html
@@ -29,6 +29,26 @@
     </div>
 </script>
 
+<script type="text/html" id="project-courses-widget-template">
+    <h2>Related Courseware</h2>
+    {@ if(hasCourses) { @}
+        <h3 id="education">Pivotal Education</h3>
+        <ul>
+        {@ _.each(courses, function(course) { @}
+          <li><a href="{@= course.url @}">{@= course.name @}</a></li>
+        {@ }); @}
+        </ul>
+    {@ } @}
+    {@ if(hasTalks) { @}
+        <h3 id="talks">Engineering Talks</h3>
+        <ul>
+        {@ _.each(talks, function(talk) { @}
+          <li><a href="{@= talk.url @}">{@= talk.name @}</a></li>
+        {@ }); @}
+        </ul>
+    {@ } @}
+</script>
+
 <script type="text/html" id="project-download-widget-controls-template">
     <div class="js-download-widget-selector">
         <select class='selector selectpicker'>
diff --git a/js/projectDocumentationWidget.js b/js/projectDocumentationWidget.js
index 900dab219ab..f6123f721dc 100644
--- a/js/projectDocumentationWidget.js
+++ b/js/projectDocumentationWidget.js
@@ -11,14 +11,19 @@ Spring.ProjectDocumentationWidget = function () {
   var quickStartEl = $('[data-download-widget-controls]');
   var mavenWidgetEl = $('.js-download-maven-widget');
   var documentationEl = $('.js-documentation-widget');
+  var resourcesEl = $('.project-sidebar-resource--wrapper');
 
   var projectUrl = apiBaseUrl + "/project_metadata/" + projectId;
   var promise = Spring.loadProject(projectUrl);
+  var coursesPromise = Spring.loadCourses("https://pivotallms.biglms.com/api/courses");
 
   promise.then(function (project) {
     Spring.buildDocumentationWidget(documentationEl, project);
     Spring.buildQuickStartWidget(quickStartEl, mavenWidgetEl, project);
   });
+  coursesPromise.then(function(courseware) {
+    Spring.buildCoursesWidget(resourcesEl, courseware);
+  });
 };
 
 Spring.buildDocumentationWidget = function (documentationEl, project) {
@@ -29,6 +34,17 @@ Spring.buildDocumentationWidget = function (documentationEl, project) {
   }).render();
 
 }
+Spring.buildCoursesWidget = function (resourcesEl, courseware) {
+  if(courseware.hasContent) {
+    var tpl = $("#project-courses-widget-template").text();
+    var view = new Spring.CoursesWidgetView({
+      el: resourcesEl,
+      model: courseware,
+      template: $("#project-courses-widget-template").text()
+    });
+    view.render();
+  }
+}
 Spring.buildQuickStartWidget = function (quickStartEl, mavenWidgetEl, project) {
   new Spring.QuickStartSelectorView({
     el: quickStartEl,
@@ -47,6 +63,13 @@ Spring.loadProject = function (url) {
     });
 }
 
+Spring.loadCourses = function (url) {
+  return $.getJSON(url)
+    .then(function(data) {
+      return new Spring.Courseware(data);
+  });
+}
+
 Spring.Release = function (data) {
   _.extend(this, data);
 }
@@ -63,6 +86,15 @@ Spring.Release.prototype = {
   }
 }
 
+Spring.Courseware = function (data) {
+  this.courses = data["edu1"];
+  this.talks = data["eng1"];
+  this.hasCourses = this.courses != null;
+  this.hasTalks = this.talks != null;
+  this.hasContent = this.hasTalks || this.hasCourses;
+  return this;
+};
+
 Spring.Project = function (data) {
   _.extend(this, data);
   var self = this;
@@ -87,6 +119,20 @@ Spring.DocumentationWidgetView = Backbone.View.extend({
   }
 });
 
+Spring.CoursesWidgetView = Backbone.View.extend({
+  initialize: function () {
+    this.template = _.template(this.options.template);
+    _.bindAll(this, "render");
+  },
+
+  render: function () {
+    this.$el.append(
+      this.template(this.model)
+    );
+    return this;
+  }
+});
+
 Spring.SnippetView = Backbone.View.extend({
   initialize: function () {
     var snippetType = this.options.snippetType;

From 7d63246f6b06ba623b954cd0dcdae74bbda734f2 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Thu, 16 Jul 2015 18:56:19 +0200
Subject: [PATCH 6/8] Revert "Display Pivotal Education related courseware"

This reverts commit bf15ee8a6da0f232254ac8d186184a5c274d63b3.
---
 _includes/widget_templates.html  | 20 --------------
 js/projectDocumentationWidget.js | 46 --------------------------------
 2 files changed, 66 deletions(-)

diff --git a/_includes/widget_templates.html b/_includes/widget_templates.html
index 1495ae53dd4..4e609c6fff4 100644
--- a/_includes/widget_templates.html
+++ b/_includes/widget_templates.html
@@ -29,26 +29,6 @@
     </div>
 </script>
 
-<script type="text/html" id="project-courses-widget-template">
-    <h2>Related Courseware</h2>
-    {@ if(hasCourses) { @}
-        <h3 id="education">Pivotal Education</h3>
-        <ul>
-        {@ _.each(courses, function(course) { @}
-          <li><a href="{@= course.url @}">{@= course.name @}</a></li>
-        {@ }); @}
-        </ul>
-    {@ } @}
-    {@ if(hasTalks) { @}
-        <h3 id="talks">Engineering Talks</h3>
-        <ul>
-        {@ _.each(talks, function(talk) { @}
-          <li><a href="{@= talk.url @}">{@= talk.name @}</a></li>
-        {@ }); @}
-        </ul>
-    {@ } @}
-</script>
-
 <script type="text/html" id="project-download-widget-controls-template">
     <div class="js-download-widget-selector">
         <select class='selector selectpicker'>
diff --git a/js/projectDocumentationWidget.js b/js/projectDocumentationWidget.js
index f6123f721dc..900dab219ab 100644
--- a/js/projectDocumentationWidget.js
+++ b/js/projectDocumentationWidget.js
@@ -11,19 +11,14 @@ Spring.ProjectDocumentationWidget = function () {
   var quickStartEl = $('[data-download-widget-controls]');
   var mavenWidgetEl = $('.js-download-maven-widget');
   var documentationEl = $('.js-documentation-widget');
-  var resourcesEl = $('.project-sidebar-resource--wrapper');
 
   var projectUrl = apiBaseUrl + "/project_metadata/" + projectId;
   var promise = Spring.loadProject(projectUrl);
-  var coursesPromise = Spring.loadCourses("https://pivotallms.biglms.com/api/courses");
 
   promise.then(function (project) {
     Spring.buildDocumentationWidget(documentationEl, project);
     Spring.buildQuickStartWidget(quickStartEl, mavenWidgetEl, project);
   });
-  coursesPromise.then(function(courseware) {
-    Spring.buildCoursesWidget(resourcesEl, courseware);
-  });
 };
 
 Spring.buildDocumentationWidget = function (documentationEl, project) {
@@ -34,17 +29,6 @@ Spring.buildDocumentationWidget = function (documentationEl, project) {
   }).render();
 
 }
-Spring.buildCoursesWidget = function (resourcesEl, courseware) {
-  if(courseware.hasContent) {
-    var tpl = $("#project-courses-widget-template").text();
-    var view = new Spring.CoursesWidgetView({
-      el: resourcesEl,
-      model: courseware,
-      template: $("#project-courses-widget-template").text()
-    });
-    view.render();
-  }
-}
 Spring.buildQuickStartWidget = function (quickStartEl, mavenWidgetEl, project) {
   new Spring.QuickStartSelectorView({
     el: quickStartEl,
@@ -63,13 +47,6 @@ Spring.loadProject = function (url) {
     });
 }
 
-Spring.loadCourses = function (url) {
-  return $.getJSON(url)
-    .then(function(data) {
-      return new Spring.Courseware(data);
-  });
-}
-
 Spring.Release = function (data) {
   _.extend(this, data);
 }
@@ -86,15 +63,6 @@ Spring.Release.prototype = {
   }
 }
 
-Spring.Courseware = function (data) {
-  this.courses = data["edu1"];
-  this.talks = data["eng1"];
-  this.hasCourses = this.courses != null;
-  this.hasTalks = this.talks != null;
-  this.hasContent = this.hasTalks || this.hasCourses;
-  return this;
-};
-
 Spring.Project = function (data) {
   _.extend(this, data);
   var self = this;
@@ -119,20 +87,6 @@ Spring.DocumentationWidgetView = Backbone.View.extend({
   }
 });
 
-Spring.CoursesWidgetView = Backbone.View.extend({
-  initialize: function () {
-    this.template = _.template(this.options.template);
-    _.bindAll(this, "render");
-  },
-
-  render: function () {
-    this.$el.append(
-      this.template(this.model)
-    );
-    return this;
-  }
-});
-
 Spring.SnippetView = Backbone.View.extend({
   initialize: function () {
     var snippetType = this.options.snippetType;

From 086e2b3d2bc6212657675bc936166892461825be Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Tue, 4 Aug 2015 08:12:53 -0700
Subject: [PATCH 7/8] Conditionalize showing reference doc/api doc links

If the reference doc URL of the API doc URL is empty, don't display a hyperlink.
---
 _includes/widget_templates.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/_includes/widget_templates.html b/_includes/widget_templates.html
index 4e609c6fff4..b06f96e9af7 100644
--- a/_includes/widget_templates.html
+++ b/_includes/widget_templates.html
@@ -18,8 +18,12 @@
                             <div class="spring-icon {@= release.statusIconClass() @}"></div>
                         </div>
                         <div class="item--right-column">
-                            <a href='{@= release.refDocUrl @}' class="docs-link reference-link">Reference</a>
-                            <a href='{@= release.apiDocUrl @}' class="docs-link api-link">API</a>
+                            {@ if (release.refDocUrl !== '') { @}
+                                <a href='{@= release.refDocUrl @}' class="docs-link reference-link">Reference</a>
+                            {@ }; @}
+                            {@ if (release.apiDocUrl !== '') { @}
+                                <a href='{@= release.apiDocUrl @}' class="docs-link api-link">API</a>
+                            {@ }; @}
                         </div>
                     </div>
                     {@ }); @}

From d25f656a48fa3d9f3d6bc93c2557e2ca22911900 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Wed, 16 Dec 2015 14:23:00 +0100
Subject: [PATCH 8/8] Fix content warning issues over https

When served with HTTP/2 and TLS, project pages show several mixed
content errors:

* the imported Google fonts
* the AJAX call to spring.io to get the current project information
* the newsletter iframe

This commit changes URLs to use https or protocol-relative URLs when
possible. This also deletes the now defunct newsletter integration.
---
 _config.yml         |  6 +++---
 _includes/page.html | 14 ++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/_config.yml b/_config.yml
index ddc41fb5dfd..a222501fd1f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -32,6 +32,6 @@ custom_gradle_template: false
 
 ### The following properties are constant for most projects
 
-main_site_url: http://spring.io
-projects_site_url: http://projects.spring.io
-questions_url: http://spring.io/questions
+main_site_url: https://spring.io
+projects_site_url: https://projects.spring.io
+questions_url: https://spring.io/questions
diff --git a/_includes/page.html b/_includes/page.html
index f342858f2bd..87df027ffe9 100644
--- a/_includes/page.html
+++ b/_includes/page.html
@@ -4,7 +4,7 @@
     <link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png"/>
 
     <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap.min.css" />
-    <link href='http://fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700' rel='stylesheet' type='text/css'>
+    <link href='//fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/font-awesome/css/font-awesome.min.css" />
     <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap-select.css" />
 
@@ -114,15 +114,9 @@
                         </div>
                     </div>
                     &copy; <script type="text/javascript"> var d = new Date();
-                    document.write(d.getFullYear());</script> <a href="http://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
-                    <a href="http://www.pivotal.io/terms-of-use">Terms of Use</a> and
-                    <a href="http://www.pivotal.io/privacy-policy">Privacy</a>
-                </div>
-                <div class="span4 footer-newsletter--wrapper pull-right">
-                    <div class="footer-newsletter--container">
-                        <label>Subscribe to our newsletter</label>
-                        <iframe frameborder="0" height="42px" scrolling="no" src="http://play.gopivotal.com/OSS_Website_Spring_SpringNewsletterSubscriptionEmailOnly.html" style="border:none" width="324px"></iframe>
-                    </div>
+                    document.write(d.getFullYear());</script> <a href="https://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
+                    <a href="https://www.pivotal.io/terms-of-use">Terms of Use</a> and
+                    <a href="https://www.pivotal.io/privacy-policy">Privacy</a>
                 </div>
             </div>
         </div>