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

Merge branch 'gh-pages' of https://github.com/spring-projects/gh-pages into gh-pages

Browse Source
This commit is contained in:
Janne Valkealahti
2016-03-22 12:37:07 +00:00
parent 975a7c2224 d25f656a48
commit b9a0860d88
4 changed files with 13 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_config.yml
View File

@@ -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
_includes/page.html
View File

@@ -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>

28
_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>
{@ }); @}
@@ -29,26 +33,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'>

46
js/projectDocumentationWidget.js
View File

@@ -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;