Skip to content

Commit

Permalink
Fix content warning issues over https
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bclozel committed Dec 16, 2015
1 parent 8227656 commit d25f656
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 4 additions & 10 deletions _includes/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit d25f656

Please sign in to comment.