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

Merge remote-tracking branch 'pages/gh-pages' into gh-pages

Browse Source
This commit is contained in:
Brian Clozel
2015-12-16 14:57:22 +01:00
parent efcb224b73 d25f656a48
commit 204b0bbb4b
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.markdown
View File

@@ -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
@@ -50,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
@@ -96,9 +95,10 @@ 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
gem install bundler
bundle
### Run jekyll

6
_config.yml
View File

@@ -29,6 +29,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>

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