Skip to content

Commit 5cdf8e9

Browse files
author
Dave Syer
committed
Merge upstream gh-pages
 $ git remote add gh-pages-upstream git://... $ git merge -s ours --no-commit gh-pages-upstream $ git read-tree --prefix=src/pages/ -u gh-pages-upstream $ git commit -m "..."
2 parents d7e75db + 00119e8 commit 5cdf8e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+34173
-0
lines changed

‎src/pages/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#*
2+
.#*
3+
*~
4+
_site
5+
.idea
6+
*.sw?

‎src/pages/.ruby-gemset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
spring-gh-pages

‎src/pages/.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby-1.9.3

‎src/pages/Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "http://rubygems.org"
2+
3+
gem "github-pages"

‎src/pages/Gemfile.lock

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
GEM
2+
remote: http://rubygems.org/
3+
specs:
4+
RedCloth (4.2.9)
5+
classifier (1.3.3)
6+
fast-stemmer (>= 1.0.0)
7+
colorator (0.1)
8+
commander (4.1.5)
9+
highline (~> 1.6.11)
10+
directory_watcher (1.4.1)
11+
fast-stemmer (1.0.2)
12+
github-pages (1)
13+
RedCloth (= 4.2.9)
14+
jekyll (= 1.1.2)
15+
kramdown (= 1.0.2)
16+
liquid (= 2.5.1)
17+
maruku (= 0.6.1)
18+
rdiscount (= 1.6.8)
19+
redcarpet (= 2.2.2)
20+
highline (1.6.19)
21+
jekyll (1.1.2)
22+
classifier (~> 1.3)
23+
colorator (~> 0.1)
24+
commander (~> 4.1.3)
25+
directory_watcher (~> 1.4.1)
26+
kramdown (~> 1.0.2)
27+
liquid (~> 2.5.1)
28+
maruku (~> 0.5)
29+
pygments.rb (~> 0.5.0)
30+
redcarpet (~> 2.2.2)
31+
safe_yaml (~> 0.7.0)
32+
kramdown (1.0.2)
33+
liquid (2.5.1)
34+
maruku (0.6.1)
35+
syntax (>= 1.0.0)
36+
posix-spawn (0.3.6)
37+
pygments.rb (0.5.2)
38+
posix-spawn (~> 0.3.6)
39+
yajl-ruby (~> 1.1.0)
40+
rdiscount (1.6.8)
41+
redcarpet (2.2.2)
42+
safe_yaml (0.7.1)
43+
syntax (1.0.0)
44+
yajl-ruby (1.1.0)
45+
46+
PLATFORMS
47+
ruby
48+
49+
DEPENDENCIES
50+
github-pages

‎src/pages/README.markdown

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Introduction
2+
3+
Spring's project pages at http://projects.springframework.io are based on Jekyll and gh-pages.
4+
In order to keep everything looking similar, common elements of the Jekyll site layout, css, etc
5+
are stored in this shared gh-pages repository. If you're seeing this README in the gh-pages branch
6+
of an actual Spring project, that's because this file, along with all the other common files
7+
get merged periodically into each project.
8+
9+
It sounds a little funky (and it is), but it's way better than the misery of Git submodules.
10+
It's actually pretty easy. If you're just getting started, the follow the directions immediately
11+
below. If you're needing a refresher on how to keep things up to date, then head to the section
12+
at the bottom.
13+
14+
## How to start a new `gh-pages` project page
15+
From within your Spring project's git checkout directory:
16+
17+
git remote add gh-pages-upstream https://github.com/spring-projects/gh-pages.git
18+
git checkout --orphan gh-pages
19+
git pull gh-pages-upstream gh-pages
20+
21+
## Create index.html
22+
23+
1. Copy common-index.html to index.html
24+
2. Update the information within, build out the content of your site
25+
26+
## View the site locally
27+
28+
Follow the instructions at http://jekyllrb.com, which are really just as simple as the following
29+
(assuming your project name is "spring-xyz"):
30+
31+
gem install jekyll
32+
jekyll new spring-xyz
33+
cd spring-xyz
34+
jekyll serve --watch
35+
36+
## Commit your changes
37+
38+
git push origin gh-pages
39+
40+
41+
# How to keep common gh-pages content up to date
42+
43+
Once you've set up your project's gh-pages infrastructure above, you'll get notified whenever
44+
changes are made to the shared gh-pages project. Actually, _your project_ will get notified,
45+
because a webhook configured on the gh-pages project will fire that ultimately creates a new
46+
issue in your project's GH Issues.
47+
> Yeah, it would have been nice to do proper pull requests instead of issues, but this arrangement
48+
with gh-pages branches and upstreams isn't based on forking. That means pull requests are no can do.
49+
This also means that if your project doesn't have issues turned on, you won't get notified! So you
50+
might consider doing that if you haven't already.
51+
52+
In any case, whether or not you get notified via the issue coming in from the webhook, sync'ing
53+
up to the latest from the shared gh-pages project is easy enough:
54+
55+
> This assumes you've got the `gh-pages-upstream` remote set up, per the instructions in sections
56+
above.
57+
58+
git checkout gh-pages
59+
git pull --no-ff gh-pages-upstream gh-pages

‎src/pages/_config.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
### Global gh-pages pre-amble
2+
safe: true
3+
lsi: false
4+
pygments: true
5+
markdown: redcarpet
6+
redcarpet:
7+
extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
8+
9+
### Spring website specific
10+
main_site_url: http://springframework.io
11+
projects_site_url: http://projects.springframework.io
12+
forum_url: http://forum.springframework.io
13+
14+
### For testing only (comment this out in a real project)
15+
#sample: true
16+
17+
### Below this line might vary between projects
18+
19+
# Context path in the remote website (usually /<project>), will be prepended to absolute URLs for static resources
20+
baseurl: /spring-boot
21+
22+
# Name of the project for display in places like page titles
23+
name: Spring Boot
24+
25+
# ID of the project in the metadata API at springframework.io (if this is not a
26+
# valid project ID the javascript widgets in the home page will not work)
27+
project: spring-boot
28+
29+
# Project github URL
30+
github_repo_url: http://github.com/SpringSource/spring-boot
31+
32+
33+
# A forum link specific to this project
34+
forum: http://forum.springframework.io/forum/spring-projects/container

‎src/pages/_includes/badge.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div class="project-sub-link">{{include.link | markdownify}}</div>

‎src/pages/_includes/billboard.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<div class="billboard--wrapper project-header--wrapper">
2+
<div class="billboard--container">
3+
<div class="container-fluid">
4+
<div class="content--title">
5+
{% capture breadcrumb %}
6+
[Projects]({{ site.projects_site_url }}){% if include.parent_link %} : {{ include.parent_link }}{% endif %}
7+
{% endcapture %}
8+
{{ breadcrumb | markdownify }}
9+
</div>
10+
<div class="row-fluid">
11+
<div class="span8">
12+
<div class="project--links--container">
13+
<a href="{{ site.github_repo_url }}" class="project-link">
14+
<i class="icon-github"></i>
15+
</a>
16+
<a href="{{ site.forum }}" class="project-link project-link-forum">
17+
<div class="spring-icon spring-icon-forum"></div>
18+
</a>
19+
</div>
20+
<div class="project--title">{{ site.name }}</div>
21+
22+
<div class="project--description">
23+
{{ include.billboard_description | markdownify }}
24+
</div>
25+
<a class="btn btn-black uppercase project-quickstart-btn" href="#quick-start">Quick Start</a>
26+
</div>
27+
</div>
28+
</div>
29+
</div>
30+
<div class="billboard-bg">
31+
<div class="billboard-icon icon-spring-data-large"></div>
32+
</div>
33+
</div>

‎src/pages/_includes/documentation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div class="js-documentation-widget"></div>

‎src/pages/_includes/download_widget.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<div class="project-body--section" id="download-widget">
2+
3+
<div class="row-fluid download-widget--container">
4+
<div class="download-widget--header js-item-dropdown-widget--wrapper">
5+
<div class="download-widget--title">
6+
Download
7+
</div>
8+
<div data-download-widget-controls style="display: inline-block"></div>
9+
</div>
10+
<div class="download-widget--body">
11+
The recommended way to get the code for this project is to use a dependency management system. The snippet below can be
12+
copied and pasted into your build when you create a new project, or when adding <code>{{ site.project }}</code> to your project.
13+
<div class="highlight">
14+
<div class="js-download-maven-widget"></div>
15+
</div>
16+
</div>
17+
</div>
18+
</div>

‎src/pages/_includes/project_aggregator_include.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% include billboard.md %}
2+
3+
<div class="billboard-body--wrapper project-body--container">
4+
<div class="projects--wrapper project-aggregator">
5+
{{ include.main_content | markdownify }}
6+
</div>
7+
</div>

‎src/pages/_includes/project_block.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<div class="project--container">
2+
<div class="project-links--container">
3+
<a href="{{include.repo_url}}" class="project-link">
4+
<i class="icon-github"></i>
5+
<p>Repo</p>
6+
</a>
7+
<a href="{{include.site_url}}" class="project-link">
8+
<i class="icon-globe"></i>
9+
<p>Site</p>
10+
</a>
11+
</div>
12+
<div class="project-logo--container">
13+
<div class="project--title">{{include.project_title}}</div>
14+
<p class="project--description">{{include.project_description}}</p>
15+
</div>
16+
</div>

‎src/pages/_includes/project_home_include.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{% include billboard.md %}
2+
3+
<div class="billboard-body--wrapper project-body--container" id="quick-start">
4+
<div class="github-fork-ribbon--wrapper">
5+
<div class="github-fork-ribbon">
6+
<a href="{{ site.github_repo_url }}{{ site.baseurl }}">
7+
<i class="icon icon-github"></i>
8+
Fork me on GitHub
9+
</a>
10+
</div>
11+
</div>
12+
<div class="row-fluid">
13+
<div class="span8">
14+
<div class="project-body--section">
15+
{{ include.main_content | markdownify }}
16+
</div>
17+
</div>
18+
<div class="span4">{% include project_sidebar.md %}</div>
19+
</div>
20+
</div>

‎src/pages/_includes/project_sidebar.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{% include documentation.md %}
2+
3+
{% capture badges %}
4+
{% if site.sample %}
5+
{% include samples/badges.md %}
6+
{% else %}
7+
{% include badges.md %}
8+
{% endif %}
9+
{% endcapture %}
10+
11+
{%unless badges contains 'not found in _includes directory' %}
12+
<div class="right-pane-widget--container no-top-border">
13+
<div class="project-sub-link--wrapper">
14+
{{ badges | markdownify }}
15+
</div>
16+
</div>
17+
{%endunless%}
18+
19+
<div class="right-pane-widget--container no-top-border project-sidebar-resource--wrapper">
20+
{{ include.related_resources | markdownify }}
21+
</div>

‎src/pages/_includes/samples/badges.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{% capture cilink %}
2+
<a href="https://drone.io/github.com/springframework-meta/gs-rest-service/latest">
3+
<img src="https://drone.io/github.com/springframework-meta/gs-rest-service/status.png">
4+
</a>
5+
{% endcapture %}
6+
7+
{% capture travislink %}
8+
[![Build Status](https://travis-ci.org/SpringSource/spring-boot.png)](https://travis-ci.org/SpringSource/spring-boot)
9+
{% endcapture %}
10+
11+
{% capture bamboostatus %}
12+
[Bamboo Status](https://build.springsource.org/browse/XD)
13+
{% endcapture %}
14+
15+
{% include badge.md link=cilink %}
16+
{% include badge.md link=travislink %}
17+
{% include badge.md link=bamboostatus %}

0 commit comments

Comments
 (0)