Skip to content

Commit 062e941

Browse files
committed
Move to 2019 version
1 parent 5759074 commit 062e941

File tree

253 files changed

+10146
-3066
lines changed

Some content is hidden

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

253 files changed

+10146
-3066
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
_site
22
.sass-cache
3-
_site/
4-
Gemfile.lock
3+
.jekyll-metadata
4+
node_modules
5+
Gemfile.lock

404.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: default
3+
---
4+
5+
<div class="container text-center">
6+
<h1>404</h1>
7+
8+
<p><strong>Page not found :(</strong></p>
9+
<p>The requested page could not be found.</p>
10+
</div>

Gemfile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1-
source 'https://rubygems.org'
2-
gem 'github-pages', group: :jekyll_plugins
1+
source "https://rubygems.org"
2+
3+
# Hello! This is where you manage which Jekyll version is used to run.
4+
# When you want to use a different version, change it below, save the
5+
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
6+
#
7+
# bundle exec jekyll serve
8+
#
9+
# This will help ensure the proper Jekyll version is running.
10+
# Happy Jekylling!
11+
#gem "jekyll", "~> 3.7.3"
12+
13+
14+
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
15+
# uncomment the line below. To upgrade, run `bundle update github-pages`.
16+
gem "github-pages", group: :jekyll_plugins

Gemfile.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.10)
4+
activesupport (4.2.11.1)
55
i18n (~> 0.7)
66
minitest (~> 5.1)
77
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9-
addressable (2.5.2)
9+
addressable (2.6.0)
1010
public_suffix (>= 2.0.2, < 4.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source
@@ -27,13 +27,13 @@ GEM
2727
execjs (2.7.0)
2828
faraday (0.15.4)
2929
multipart-post (>= 1.2, < 3)
30-
ffi (1.10.0)
30+
ffi (1.11.1)
3131
forwardable-extended (2.6.0)
32-
gemoji (3.0.0)
33-
github-pages (197)
34-
activesupport (= 4.2.10)
32+
gemoji (3.0.1)
33+
github-pages (198)
34+
activesupport (= 4.2.11.1)
3535
github-pages-health-check (= 1.16.1)
36-
jekyll (= 3.7.4)
36+
jekyll (= 3.8.5)
3737
jekyll-avatar (= 0.6.0)
3838
jekyll-coffeescript (= 1.1.1)
3939
jekyll-commonmark-ghpages (= 0.1.5)
@@ -81,13 +81,13 @@ GEM
8181
octokit (~> 4.0)
8282
public_suffix (~> 3.0)
8383
typhoeus (~> 1.3)
84-
html-pipeline (2.10.0)
84+
html-pipeline (2.11.1)
8585
activesupport (>= 2)
8686
nokogiri (>= 1.4)
8787
http_parser.rb (0.6.0)
8888
i18n (0.9.5)
8989
concurrent-ruby (~> 1.0)
90-
jekyll (3.7.4)
90+
jekyll (3.8.5)
9191
addressable (~> 2.4)
9292
colorator (~> 1.0)
9393
em-websocket (~> 0.5)
@@ -204,39 +204,39 @@ GEM
204204
jekyll-feed (~> 0.9)
205205
jekyll-seo-tag (~> 2.1)
206206
minitest (5.11.3)
207-
multipart-post (2.0.0)
208-
nokogiri (1.10.2)
207+
multipart-post (2.1.1)
208+
nokogiri (1.10.3)
209209
mini_portile2 (~> 2.4.0)
210210
octokit (4.14.0)
211211
sawyer (~> 0.8.0, >= 0.5.3)
212212
pathutil (0.16.2)
213213
forwardable-extended (~> 2.6)
214-
public_suffix (3.0.3)
214+
public_suffix (3.1.1)
215215
rb-fsevent (0.10.3)
216216
rb-inotify (0.10.0)
217217
ffi (~> 1.0)
218218
rouge (2.2.1)
219219
ruby-enum (0.7.2)
220220
i18n
221221
ruby_dep (1.5.0)
222-
rubyzip (1.2.2)
222+
rubyzip (1.2.3)
223223
safe_yaml (1.0.5)
224224
sass (3.7.4)
225225
sass-listen (~> 4.0.0)
226226
sass-listen (4.0.0)
227227
rb-fsevent (~> 0.9, >= 0.9.4)
228228
rb-inotify (~> 0.9, >= 0.9.7)
229-
sawyer (0.8.1)
230-
addressable (>= 2.3.5, < 2.6)
231-
faraday (~> 0.8, < 1.0)
229+
sawyer (0.8.2)
230+
addressable (>= 2.3.5)
231+
faraday (> 0.8, < 2.0)
232232
terminal-table (1.8.0)
233233
unicode-display_width (~> 1.1, >= 1.1.1)
234234
thread_safe (0.3.6)
235235
typhoeus (1.3.1)
236236
ethon (>= 0.9.0)
237237
tzinfo (1.2.5)
238238
thread_safe (~> 0.1)
239-
unicode-display_width (1.5.0)
239+
unicode-display_width (1.6.0)
240240

241241
PLATFORMS
242242
ruby
@@ -245,4 +245,4 @@ DEPENDENCIES
245245
github-pages
246246

247247
BUNDLED WITH
248-
1.16.1
248+
2.0.2

LICENSE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 Nicolas Vanhoren
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,63 @@
1-
# Compomics Documentation Website
1+
# compomics.github.io
2+
Overview and documentation of CompOmics GitHub repositories.
23

3-
This repository contains the compomics.github.io site, which collates documentation from all Compomics projects on Github. The site is built automatically as the result of a Jenkins build triggered by a Github webhook. This runs a Groovy postbuild script (see [https://gist.github.com/iain8/d6cd41e4e2ef920c50af](here)) which passes the project name and github url to the script `generate-docs.py`, which retrieves the readme and wiki files and adds the necessary front-matter for Jekyll to parse them. Links in wiki pages are automatically amended to still point to the correct place.
4+
## Run website locally
5+
- Install Jekyll requirements
6+
- Install webpage dependencies: `bundle install`
7+
- Run Jekyll web server: `bundle exec jekyll serve`
8+
- The website is now hosted at http://localhost:4000
49

5-
The site can be viewed locally using `bundle exec jekyll serve` (useful for troubleshooting). It is strongly advised to separate all elements in a markdown file with newlines, as the jekyll parser is a lot less forgiving than the one on github wiki pages.
10+
## Create pages for GitHub repositories
11+
The entire pages folder can be generated automatically by `generate_docs.py`.
12+
This script can be configured trough a YAML config file or the command line
13+
interface (run `python generate_docs.py -h`). See `requirements.txt` for the
14+
required Python packages.
15+
16+
### Folder structure
17+
Requires the following folder structure for projects:
18+
```
19+
pages/
20+
|-- sample_project/
21+
|-- sample_project.md
22+
|-- wiki/
23+
|-- sample_wikipage.md
24+
|-- sample_wikipage2.md
25+
```
26+
where every GitHub repository has one folder with in its root the README file
27+
and a subfolder containing all wiki pages of that repository.
28+
29+
30+
### Jekyll file headers
31+
The project markdown files need to contain the following items in their header:
32+
33+
#### README file
34+
```
35+
---
36+
name: "simple"
37+
description: "A simple tool"
38+
layout: default
39+
tags: project_home, simple
40+
permalink: /projects/simple
41+
project: simple
42+
github_project: "https://github.com/compomics/simple"
43+
---
44+
```
45+
46+
#### Wiki page
47+
```
48+
---
49+
name: docs
50+
title: docs
51+
layout: default
52+
permalink: "/projects/simple/wiki/docs"
53+
tags: wiki, simple
54+
project: simple
55+
github_project: https://github.com/compomics/simple
56+
---
57+
```
58+
59+
# Created with
60+
- Jekyll template [Boostrap 4 Github Pages](https://nicolas-van.github.io/bootstrap-4-github-pages/).
61+
- Bootstrap 4
62+
- Font Awesome 4.7.0
63+
- ...

_config.yml

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,42 @@
1+
# Welcome to Jekyll!
2+
#
3+
# This config file is meant for settings that affect your whole blog, values
4+
# which you are expected to set up once and rarely edit after that. If you find
5+
# yourself editing this file very often, consider using Jekyll's data files
6+
# feature for the data you need to update frequently.
7+
#
8+
# For technical reasons, this file is *NOT* reloaded automatically when you use
9+
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10+
111
# Site settings
2-
title: Compomics Docs
3-
4-
description: > # this means to ignore newlines until "baseurl:"
5-
Welcome to the website for software projects created and maintained by the Computational Omics and
6-
Systems Biology Group. Below you can find a list of software we have developed, and on the subsequent
7-
pages are documentation and links to downloads and source code (hosted on our Github page).
8-
baseurl: "" # the subpath of your site, e.g. /blog/
9-
url: "http://compomics.github.io" # the base hostname & protocol for your site
10-
twitter_username: compomics
12+
# These are used to personalize your new site. If you look in the HTML files,
13+
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
14+
# You can create any custom variable you would like, and they will be accessible
15+
# in the templates via {{ site.myvariable }}.
16+
title: CompOmics documentation
17+
email: "compomics"
18+
description: >- # this means to ignore newlines until "baseurl:"
19+
CompOmics projects documentation
20+
#baseurl: "" # the subpath of your site, e.g. /blog
21+
#url: "" # the base hostname & protocol for your site, e.g. http://example.com
22+
twitter_username: CompOmics
1123
github_username: compomics
1224

13-
exclude: ["generate-docs.py", "README.md", "Gemfile", "Gemfile.lock"]
25+
repository: "compomics/compomics.github.io"
1426

1527
# Build settings
16-
markdown: kramdown
17-
kramdown:
18-
input: GFM
28+
plugins:
29+
# - jekyll-feed
30+
- jekyll-sitemap
1931

20-
defaults:
21-
-
22-
scope:
23-
type: projects
24-
values:
25-
layout: "default"
26-
page_type: project
32+
# A list of the pages to display in the navigation bar
33+
header_pages:
2734

28-
collections:
29-
projects:
30-
output: true
31-
output_ext: html
32-
permalink: /projects/:path.html
35+
# Exclude from processing.
36+
# The following items will not be processed, by default. Create a custom list
37+
# to override the default setting.
38+
exclude:
39+
- Gemfile
40+
- Gemfile.lock
41+
- node_modules
42+
- update_boostrap.sh

_includes/footer.html

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
1-
<footer id="footer">
21

3-
<div class="outer">
2+
<div class="py-2 border-top">
3+
<div class="container">
4+
<div class="row">
45

5-
Made by <a href="http://compomics.com">Compomics</a>. Site last <a href="https://github.com/compomics/compomics.github.io">generated</a> at {{ site.time | date: "%R on %F" }}.
6+
<div class="col-sm">
7+
<ul class="list-unstyled">
8+
<li>
9+
Made by <a href="https://www.compomics.com" target="_blank">CompOmics</a>
10+
</li>
11+
<li>
12+
Site last <a href="https://github.com/compomics/compomics.github.io" target="_blank">generated</a> at {{ site.time | date: "%R on %F" }}.
13+
</li>
14+
</ul>
15+
</div>
616

7-
</div>
17+
<div class="col-sm text-right">
18+
<span class="footer-social-icons">
19+
<a href="https://www.compomics.com" target="_blank"><i class="fa fa-home px-1"></i></a>
20+
<a href="https://github.com/CompOmics" target="_blank"><i class="fa fa-github px-1"></i></a>
21+
<a href="https://twitter.com/CompOmics" target="_blank"><i class="fa fa-twitter px-1"></i></a>
22+
<a href="https://www.youtube.com/channel/UCX7yNSWDCUeZx7WOTQ6MO1A" target="_blank"><i class="fa fa-youtube px-1"></i></a>
23+
</span>
24+
</div>
25+
26+
</div>
827

9-
</footer>
10-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/darkula.min.css">
11-
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
12-
<script>hljs.initHighlightingOnLoad();</script>
28+
</div>
29+
</div>

_includes/head.html

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<head>
2-
<meta charset="utf-8">
2+
<meta charset="utf-8">
33
<meta http-equiv="X-UA-Compatible" content="IE=edge">
44
<meta name="viewport" content="width=device-width, initial-scale=1">
5-
6-
<title>{% if page.name and page.url != "/index.html" %}
7-
{{ page.name }} - {% endif %}
8-
{{ site.title }}</title>
9-
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
10-
11-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
12-
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
13-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
14-
</head>
5+
{%- seo -%}
6+
<link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
7+
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
8+
<script src="{{ "/assets/javascript/bootstrap/jquery.min.js" | relative_url }}"></script>
9+
<script src="{{ "/assets/javascript/bootstrap/bootstrap.bundle.min.js" | relative_url }}"></script>
10+
</head>

0 commit comments

Comments
 (0)