Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge spring-projects/gh-pages (#748)

Browse Source 
* 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.

* Revert "Display Pivotal Education related courseware"

This reverts commit bf15ee8a6da0f232254ac8d186184a5c274d63b3.

* Conditionalize showing reference doc/api doc links

If the reference doc URL of the API doc URL is empty, don't display a hyperlink.

* 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.

* Update for changes in github pages

* Upgrade rbenv Ruby version to 2.2.0

* Fix markdown syntax error

The kramdown backend doesn't support titles whithout empty lines before
them.

* Replace ZeroClipboard with clipboard.js

For copy/paste support in our code samples, we are using the
ZeroClipboard library which relies heavily on Flash.
Because many browsers/extensions are disabling this plugin nowadays,
this commit replaces ZeroClipboard with a native, lightweight solution
for this feature.

* Add rouge gem

* Polish page.html

Remove default attributes and other little improvements.

* remove alt attribute in <div>

* Upgrade github-pages gem to fix deprecation warnings

Previously, when running bundle exec jekyll serve a false-positive
deprecation warning was reported:

Deprecation: Auto-regeneration can no longer be set from your
configuration file(s). Use the --[no-]watch/-w command-line option
instead.

See https://github.com/jekyll/jekyll/issues/4831 for some details.
Jekyll 3.0.5 fixes the problem. This commit upgrades to the latest
version of github-pages, thereby also upgrading to Jekyll 3.0.5

* Jekyll must be run with "bundle exec" command

* Add defensive check for empty repository key
This commit is contained in:
Rob Winch
2017-03-27 13:00:33 -05:00
committed by GitHub
parent 77f5c94b37
commit b02094230f
14 changed files with 208 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_includes/badges.html
View File

@@ -1,7 +1,7 @@
{% if page.badges.twitter %}
<div class="project-sub-link">
<a href="https://twitter.com/{{ page.badges.twitter }}">
<div class="spring-icon project-badges twitter" alt="Twitter" title="Twitter">
<div class="spring-icon project-badges twitter" title="Twitter">
</div>
</a>
</div>
@@ -9,7 +9,7 @@
{% for badge in page.badges.custom %}
<div class="project-sub-link">
<a href="{{ badge.url }}">
<div class="spring-icon project-badges {{ badge.icon }}" alt="{{ badge.name }}" title="{{ badge.name }}">
<div class="spring-icon project-badges {{ badge.icon }}" title="{{ badge.name }}">
</div>
</a>
</div>

50
_includes/page.html
View File

@@ -1,10 +1,10 @@
<head>
<title>{{ site.name }}</title>
<link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png"/>
<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 rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700" />
<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" />
@@ -18,21 +18,21 @@
{{ head_links }}
<script type="text/javascript" src="{{site.baseurl}}/js/jquery.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/bootstrap/js/bootstrap-select.js"></script>
<script src="{{site.baseurl}}/js/jquery.js"></script>
<script src="{{site.baseurl}}/bootstrap/js/bootstrap.min.js"></script>
<script src="{{site.baseurl}}/bootstrap/js/bootstrap-select.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/underscore.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/backbone.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/projectDocumentationWidget.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/application.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/ZeroClipboard.min.js"></script>
<script type="text/javascript">
var apiBaseUrl = "{{ site.main_site_url }}";
var projectId = "{{ site.project }}";
var siteBaseUrl = "{{ site.baseurl }}";
<script src="{{site.baseurl}}/js/underscore.js"></script>
<script src="{{site.baseurl}}/js/backbone.js"></script>
<script src="{{site.baseurl}}/js/projectDocumentationWidget.js"></script>
<script src="{{site.baseurl}}/js/application.js"></script>
<script src="{{site.baseurl}}/js/clipboard.min.js"></script>
<script>
var apiBaseUrl = "{{ site.main_site_url }}",
projectId = "{{ site.project }}",
siteBaseUrl = "{{ site.baseurl }}";
</script>
<script type="text/javascript" src="{{site.baseurl}}/js/copySnippets.js"></script>
<script src="{{site.baseurl}}/js/copySnippets.js"></script>
<meta name="google-site-verification" content="7qGntFPD9lWAVCtUu5U77v4l68PsTHf6xpzgjQv2j2M" />
<script>
var _gaq = _gaq || [];
@@ -84,12 +84,12 @@
<div class="container-fluid">
<div class="search-form--container">
<form class="form-inline form-search"
action="{{site.main_site_url}}/search" method="get">
<input type="text"
action="{{site.main_site_url}}/search">
<input type="search"
class="search-query search-form--form js-search-input"
placeholder="Search for documention, guides, and posts..."
name="q" />
<button type="submit" class="search-form--submit">
<button class="search-form--submit">
<i class="icon-search"></i>
</button>
</form>
@@ -113,16 +113,10 @@
</ul>
</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>
&copy; <script> var d = new Date();
document.write(d.getFullYear());</script> <a href="https://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
<a href="https://pivotal.io/terms-of-use">Terms of Use</a> and
<a href="https://pivotal.io/privacy-policy">Privacy</a>
</div>
</div>
</div>

8
_includes/widget_templates.html
View File

@@ -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>
{@ }); @}