This is an automated email from the ASF dual-hosted git repository.
wonook pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-nemo-website.git
commit 1a7f850a65085da78b594bff7df8656dc9f2dc88
Author: Won Wook SONG <wsong0...@gmail.com>
AuthorDate: Fri Sep 9 21:11:58 2022 +0900
upgrade versions
---
.gitignore | 3 +-
.ruby-version | 2 +-
Dockerfile | 26 +++
Gemfile | 28 ++-
Gemfile.lock | 263 +++++++++++++++++++---
_config.yml | 9 +-
_includes/docs_nav.html | 43 ++--
_includes/head.html | 8 +-
_includes/js_files.html | 8 +-
_includes/section_nav.html | 4 +-
_includes/topnav.html | 18 +-
_layouts/default.html | 9 +-
_layouts/docs.html | 14 +-
_layouts/page.html | 18 +-
_layouts/post.html | 8 +-
_sass/_jekyll-doc-theme.scss | 63 ++++++
_sass/_syntax-highlighting.scss | 2 +-
_sass/_typeahead.scss | 2 +
404.html => assets/404.html | 1 +
allposts.html => assets/allposts.html | 3 +-
{css => assets/css}/font-awesome.min.css | 0
assets/css/main.scss | 21 ++
{fonts => assets/fonts}/FontAwesome.otf | Bin
{fonts => assets/fonts}/fontawesome-webfont.eot | Bin
{fonts => assets/fonts}/fontawesome-webfont.svg | 0
{fonts => assets/fonts}/fontawesome-webfont.ttf | Bin
{fonts => assets/fonts}/fontawesome-webfont.woff | Bin
{fonts => assets/fonts}/fontawesome-webfont.woff2 | Bin
assets/img/bg.jpg | Bin 0 -> 661519 bytes
{img => assets/img}/coral.png | Bin
assets/img/jekyll-dark.png | Bin 0 -> 52735 bytes
assets/img/jekyll.png | Bin 0 -> 11998 bytes
assets/img/logonav.png | Bin 0 -> 12672 bytes
{img => assets/img}/nemo-logo.png | Bin
{img => assets/img}/onyx-light.png | Bin
{img => assets/img}/onyx.png | Bin
{img => assets/img}/onyx_logo.png | Bin
{js => assets/js}/bootstrap.min.js | 0
assets/js/main.js | 33 +++
{js => assets/js}/typeahead.bundle.min.js | 0
assets/runtime_arch.png | Bin 94970 -> 0 bytes
search.json => assets/search.json | 6 +-
css/main.scss | 86 -------
img/bg.jpg | Bin 411341 -> 0 bytes
js/main.js | 34 ---
nginx.conf | 43 ++++
publish.sh | 2 +-
47 files changed, 532 insertions(+), 225 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1fcf69d..9d72b1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,5 @@ tang.conf
_site
tmp
.sass_cache/*
-.sass-cache/*
\ No newline at end of file
+.sass-cache/*
+.jekyll-cache/*
diff --git a/.ruby-version b/.ruby-version
index af5a3dd..45b90e2 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4.2p198
\ No newline at end of file
+3.1.2p20
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..09ea554
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,26 @@
+ARG JEKYLL_BASEURL=''
+
+####################################
+
+FROM ruby:alpine as builder
+
+RUN apk add --no-cache make build-base
+RUN gem install bundler
+
+WORKDIR /jekyll
+ADD Gemfile Gemfile.lock ./
+RUN bundle install
+
+ADD . .
+ARG JEKYLL_BASEURL
+RUN bundle exec jekyll build --baseurl $JEKYLL_BASEURL
+
+####################################
+
+FROM nginx:alpine
+
+ARG JEKYLL_BASEURL
+COPY --from=builder /jekyll/_site /usr/share/nginx/html/$JEKYLL_BASEURL
+COPY nginx.conf /etc/nginx/nginx.conf
+
+EXPOSE 80
diff --git a/Gemfile b/Gemfile
index 6ac80f6..6aab1f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,18 +1,28 @@
source "https://rubygems.org";
ruby RUBY_VERSION
-gem "jekyll", "3.4.3"
+# gem "jekyll", "4.0"
# to use GitHub Pages
-# gem "github-pages", group: :jekyll_plugins
+gem "github-pages", group: :jekyll_plugins
# If you have any plugins, put them here!
-group :jekyll_plugins do
- gem "jekyll-feed"
- gem "jekyll-sitemap"
- gem "jekyll-redirect-from"
- gem "jekyll-seo-tag"
+# group :jekyll_plugins do
+# gem "jekyll-feed"
+# gem "jekyll-sitemap"
+# gem "jekyll-redirect-from"
+# gem "jekyll-seo-tag"
+# end
+
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data
gem
+# and associated library.
+install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+ gem "tzinfo", "~> 1.2"
+ gem "tzinfo-data"
end
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
+
+
+gem "webrick", "~> 1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 98f1648..314a2e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,67 +1,272 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.7.0)
- public_suffix (>= 2.0.2, < 5.0)
+ activesupport (6.0.5.1)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ zeitwerk (~> 2.2, >= 2.2.2)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.11.1)
colorator (1.1.0)
- ffi (1.12.2)
+ commonmarker (0.23.5)
+ concurrent-ruby (1.1.10)
+ dnsruby (1.61.9)
+ simpleidn (~> 0.1)
+ em-websocket (0.5.3)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0)
+ ethon (0.15.0)
+ ffi (>= 1.15.0)
+ eventmachine (1.2.7)
+ execjs (2.8.1)
+ faraday (2.5.2)
+ faraday-net_http (>= 2.0, < 3.1)
+ ruby2_keywords (>= 0.0.4)
+ faraday-net_http (3.0.0)
+ ffi (1.15.5)
forwardable-extended (2.6.0)
- jekyll (3.4.3)
+ gemoji (3.0.1)
+ github-pages (227)
+ github-pages-health-check (= 1.17.9)
+ jekyll (= 3.9.2)
+ jekyll-avatar (= 0.7.0)
+ jekyll-coffeescript (= 1.1.1)
+ jekyll-commonmark-ghpages (= 0.2.0)
+ jekyll-default-layout (= 0.1.4)
+ jekyll-feed (= 0.15.1)
+ jekyll-gist (= 1.5.0)
+ jekyll-github-metadata (= 2.13.0)
+ jekyll-include-cache (= 0.2.1)
+ jekyll-mentions (= 1.6.0)
+ jekyll-optional-front-matter (= 0.3.2)
+ jekyll-paginate (= 1.1.0)
+ jekyll-readme-index (= 0.3.0)
+ jekyll-redirect-from (= 0.16.0)
+ jekyll-relative-links (= 0.6.1)
+ jekyll-remote-theme (= 0.4.3)
+ jekyll-sass-converter (= 1.5.2)
+ jekyll-seo-tag (= 2.8.0)
+ jekyll-sitemap (= 1.4.0)
+ jekyll-swiss (= 1.0.0)
+ jekyll-theme-architect (= 0.2.0)
+ jekyll-theme-cayman (= 0.2.0)
+ jekyll-theme-dinky (= 0.2.0)
+ jekyll-theme-hacker (= 0.2.0)
+ jekyll-theme-leap-day (= 0.2.0)
+ jekyll-theme-merlot (= 0.2.0)
+ jekyll-theme-midnight (= 0.2.0)
+ jekyll-theme-minimal (= 0.2.0)
+ jekyll-theme-modernist (= 0.2.0)
+ jekyll-theme-primer (= 0.6.0)
+ jekyll-theme-slate (= 0.2.0)
+ jekyll-theme-tactile (= 0.2.0)
+ jekyll-theme-time-machine (= 0.2.0)
+ jekyll-titles-from-headings (= 0.5.3)
+ jemoji (= 0.12.0)
+ kramdown (= 2.3.2)
+ kramdown-parser-gfm (= 1.1.0)
+ liquid (= 4.0.3)
+ mercenary (~> 0.3)
+ minima (= 2.5.1)
+ nokogiri (>= 1.13.6, < 2.0)
+ rouge (= 3.26.0)
+ terminal-table (~> 1.4)
+ github-pages-health-check (1.17.9)
+ addressable (~> 2.3)
+ dnsruby (~> 1.60)
+ octokit (~> 4.0)
+ public_suffix (>= 3.0, < 5.0)
+ typhoeus (~> 1.3)
+ html-pipeline (2.14.2)
+ activesupport (>= 2)
+ nokogiri (>= 1.4)
+ http_parser.rb (0.8.0)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
+ jekyll (3.9.2)
addressable (~> 2.4)
colorator (~> 1.0)
+ em-websocket (~> 0.5)
+ i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 3.0)
+ jekyll-watch (~> 2.0)
+ kramdown (>= 1.17, < 3)
+ liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
- rouge (~> 1.7)
+ rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
- jekyll-feed (0.11.0)
- jekyll (~> 3.3)
- jekyll-redirect-from (0.15.0)
+ jekyll-avatar (0.7.0)
+ jekyll (>= 3.0, < 5.0)
+ jekyll-coffeescript (1.1.1)
+ coffee-script (~> 2.2)
+ coffee-script-source (~> 1.11.1)
+ jekyll-commonmark (1.4.0)
+ commonmarker (~> 0.22)
+ jekyll-commonmark-ghpages (0.2.0)
+ commonmarker (~> 0.23.4)
+ jekyll (~> 3.9.0)
+ jekyll-commonmark (~> 1.4.0)
+ rouge (>= 2.0, < 4.0)
+ jekyll-default-layout (0.1.4)
+ jekyll (~> 3.0)
+ jekyll-feed (0.15.1)
+ jekyll (>= 3.7, < 5.0)
+ jekyll-gist (1.5.0)
+ octokit (~> 4.2)
+ jekyll-github-metadata (2.13.0)
+ jekyll (>= 3.4, < 5.0)
+ octokit (~> 4.0, != 4.4.0)
+ jekyll-include-cache (0.2.1)
+ jekyll (>= 3.7, < 5.0)
+ jekyll-mentions (1.6.0)
+ html-pipeline (~> 2.3)
+ jekyll (>= 3.7, < 5.0)
+ jekyll-optional-front-matter (0.3.2)
+ jekyll (>= 3.0, < 5.0)
+ jekyll-paginate (1.1.0)
+ jekyll-readme-index (0.3.0)
+ jekyll (>= 3.0, < 5.0)
+ jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
+ jekyll-relative-links (0.6.1)
+ jekyll (>= 3.3, < 5.0)
+ jekyll-remote-theme (0.4.3)
+ addressable (~> 2.0)
+ jekyll (>= 3.5, < 5.0)
+ jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+ rubyzip (>= 1.3.0, < 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
- jekyll-seo-tag (2.6.1)
+ jekyll-seo-tag (2.8.0)
+ jekyll (>= 3.8, < 5.0)
+ jekyll-sitemap (1.4.0)
+ jekyll (>= 3.7, < 5.0)
+ jekyll-swiss (1.0.0)
+ jekyll-theme-architect (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-cayman (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-dinky (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-hacker (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-leap-day (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-merlot (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-midnight (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-minimal (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-modernist (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-primer (0.6.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-github-metadata (~> 2.9)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-slate (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-tactile (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-time-machine (0.2.0)
+ jekyll (> 3.5, < 5.0)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-titles-from-headings (0.5.3)
jekyll (>= 3.3, < 5.0)
- jekyll-sitemap (1.2.0)
- jekyll (~> 3.3)
- jekyll-watch (1.5.1)
+ jekyll-watch (2.2.1)
listen (~> 3.0)
- kramdown (1.17.0)
- liquid (3.0.6)
- listen (3.2.1)
+ jemoji (0.12.0)
+ gemoji (~> 3.0)
+ html-pipeline (~> 2.2)
+ jekyll (>= 3.0, < 5.0)
+ kramdown (2.3.2)
+ rexml
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
+ liquid (4.0.3)
+ listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
+ minima (2.5.1)
+ jekyll (>= 3.5, < 5.0)
+ jekyll-feed (~> 0.9)
+ jekyll-seo-tag (~> 2.1)
+ minitest (5.16.3)
+ nokogiri (1.13.8-x86_64-darwin)
+ racc (~> 1.4)
+ octokit (4.25.1)
+ faraday (>= 1, < 3)
+ sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (4.0.3)
- rb-fsevent (0.10.3)
+ public_suffix (4.0.7)
+ racc (1.6.0)
+ rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
- rouge (1.11.1)
+ rexml (3.2.5)
+ rouge (3.26.0)
+ ruby2_keywords (0.0.5)
+ rubyzip (2.3.2)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
+ sawyer (0.9.2)
+ addressable (>= 2.3.5)
+ faraday (>= 0.17.3, < 3)
+ simpleidn (0.2.1)
+ unf (~> 0.1.4)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ thread_safe (0.3.6)
+ typhoeus (1.4.0)
+ ethon (>= 0.9.0)
+ tzinfo (1.2.10)
+ thread_safe (~> 0.1)
+ tzinfo-data (1.2022.3)
+ tzinfo (>= 1.0.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.8.2)
+ unicode-display_width (1.8.0)
+ wdm (0.1.1)
+ webrick (1.7.0)
+ zeitwerk (2.6.0)
PLATFORMS
- ruby
+ x86_64-darwin-21
DEPENDENCIES
- jekyll (= 3.4.3)
- jekyll-feed
- jekyll-redirect-from
- jekyll-seo-tag
- jekyll-sitemap
+ github-pages
+ tzinfo (~> 1.2)
tzinfo-data
+ wdm (~> 0.1.1)
+ webrick (~> 1.7)
RUBY VERSION
- ruby 2.6.8p205
+ ruby 3.1.2p20
BUNDLED WITH
- 2.1.4
+ 2.3.11
diff --git a/_config.yml b/_config.yml
index 61f5a92..c95208a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,20 +3,22 @@ title: Nemo
email: n...@spl.snu.ac.kr
description: >
A Data Processing System for Flexible Employment With Different Deployment
Characteristics.
+lang: en-US
baseurl: "" # the subpath of your site, e.g. /blog/
url: http://nemo.apache.org/ # the base hostname & protocol for your site
git_address: https://github.com/apache/incubator-nemo
git_edit_address: https://github.com/apache/incubator-nemo-website
-# theme options from https://bootswatch.com/
+# theme options from https://bootswatch.com/3/
# comment out this to use default Bootstrap
-bootwatch: readable
+bootwatch: readable # paper # cerulean cosmo custom cyborg darkly flatly
journal lumen readable sandstone simplex slate solar spacelab superhero united
yeti
# Build settings
markdown: kramdown
highlighter: rouge
-gems:
+# Plugins (previously gems:)
+plugins:
- jekyll-feed
- jekyll-redirect-from
- jekyll-seo-tag
@@ -28,6 +30,7 @@ exclude:
- .idea/
- .gitignore
- README.md
+ - vendor
timezone: Asia/Seoul
defaults:
- scope:
diff --git a/_includes/docs_nav.html b/_includes/docs_nav.html
index fa438ae..c1db9be 100644
--- a/_includes/docs_nav.html
+++ b/_includes/docs_nav.html
@@ -1,22 +1,29 @@
<div class="panel-group" id="accordion" role="tablist"
aria-multiselectable="true">
-{% for section in site.data.docs %}
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion"
href="#collapse-{{forloop.index}}" aria-expanded="false"
aria-controls="collapse-{{forloop.index}}">
- {{ section.title }}
- </a>
- </h4>
- </div>
- <div id="collapse-{{forloop.index}}" class="panel-collapse collapse"
role="tabpanel" aria-label="Side Navigation">
- <div class="list-group">
- {% for item in section.docs %}
- {% assign item_url = item | prepend:"/docs/" | append:"/" %}
- {% assign p = site.docs | where:"url", item_url | first %}
- <a class="list-group-item {% if item_url == page.url %}active{%
endif %}" href="{{ p.url | prepend: site.baseurl }}">{{ p.title }}</a>
- {% endfor %}
+ {% for section in site.data.docs %}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion"
href="#collapse-{{forloop.index}}" aria-expanded="false"
aria-controls="collapse-{{forloop.index}}">
+ {{ section.title }}
+ </a>
+ </h4>
+ </div>
+ {% assign collapsed = true %}
+ {% for item in section.docs %}
+ {% assign item_url = item | prepend:"/docs/" | append:"/" %}
+ {% if item_url == page.url %}
+ {% assign collapsed = false %}
+ {% endif %}
+ {% endfor %}
+ <div class="panel-collapse{% if collapsed %} collapse{% endif %}"
id="collapse-{{forloop.index}}" role="tabpanel" aria-label="Side Navigation">
+ <div class="list-group">
+ {% for item in section.docs %}
+ {% assign item_url = item | prepend:"/docs/" | append:"/" %}
+ {% assign p = site.docs | where:"url", item_url | first %}
+ <a class="list-group-item {% if item_url == page.url %}active{%
endif %}" href="{{ p.url | relative_url }}">{{ p.title }}</a>
+ {% endfor %}
+ </div>
</div>
</div>
- </div>
-{% endfor %}
+ {% endfor %}
</div>
diff --git a/_includes/head.html b/_includes/head.html
index c87423a..0cf66ba 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,12 +3,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl
}}">
- <link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | prepend:
site.baseurl }}">
+ <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}">
+ <link rel="stylesheet" href="{{ "/assets/css/font-awesome.min.css" |
relative_url }}">
- <link rel="shortcut icon" href="{{ "/favicon.ico?1" | prepend:
site.baseurl }}">
+ <link rel="shortcut icon" href="{{ "/favicon.ico?1" | relative_url }}">
{% seo %}
<link rel="canonical" href="{{ page.url | replace:'index.html','' |
prepend: site.baseurl | prepend: site.url }}">
- <link rel="alternate" type="application/rss+xml" title="{{ site.title }}"
href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+ <link rel="alternate" type="application/rss+xml" title="{{ site.title }}"
href="{{ "/feed.xml" | absolute_url }}" />
</head>
diff --git a/_includes/js_files.html b/_includes/js_files.html
index c1f7a2e..cde8e3b 100644
--- a/_includes/js_files.html
+++ b/_includes/js_files.html
@@ -1,8 +1,8 @@
<script>
var baseurl = '{{ site.baseurl }}'
</script>
-<script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
-<script src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }} "></script>
-<script src="{{ "/js/typeahead.bundle.min.js" | prepend: site.baseurl }}
"></script>
+<script src="https://code.jquery.com/jquery-1.12.4.min.js";></script>
+<script src="{{ "/assets/js/bootstrap.min.js" | relative_url }} "></script>
+<script src="{{ "/assets/js/typeahead.bundle.min.js" | relative_url }}
"></script>
-<script src="{{ "/js/main.js" | prepend: site.baseurl }} "></script>
+<script src="{{ "/assets/js/main.js" | relative_url }} "></script>
diff --git a/_includes/section_nav.html b/_includes/section_nav.html
index 89008e3..cba548d 100644
--- a/_includes/section_nav.html
+++ b/_includes/section_nav.html
@@ -24,7 +24,7 @@ next, lets build a link to it.
{% assign previous = forloop.index0 | minus: 1 %}
{% assign previous_page = docs[previous] | prepend:"/docs/" |
append:"/" %}
<li class="previous">
- <a href="{{ previous_page | prepend: site.baseurl }}">
+ <a href="{{ previous_page | relative_url }}">
<span aria-hidden="true">←</span> Previous
</a>
</li>
@@ -40,7 +40,7 @@ next, lets build a link to it.
{% assign next = forloop.index0 | plus: 1 %}
{% assign next_page = docs[next] | prepend:"/docs/" | append:"/" %}
<li class="next">
- <a href="{{ next_page | prepend: site.baseurl }}">
+ <a href="{{ next_page | relative_url }}">
Next <span aria-hidden="true">→</span>
</a>
</li>
diff --git a/_includes/topnav.html b/_includes/topnav.html
index 1895dea..88ae944 100644
--- a/_includes/topnav.html
+++ b/_includes/topnav.html
@@ -8,23 +8,23 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.baseurl }}/">
- <span><img src="{{site.baseurl}}/img/nemo-logo.png"></span>
+ <span><img src="{{ "/assets/img/nemo-logo.png" | relative_url
}}" alt="Logo"></span>
</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
- <li {% if page.sectionid=='docs' %} class="active" {% endif
%}><a href="{{ "/docs/home/" | prepend: site.baseurl }}">Docs</a></li>
- <li {% if page.title=='APIs' %} class="active" {% endif %}><a
href="{{ "/apidocs" | prepend: site.baseurl }}">APIs</a></li>
- <li {% if page.title=='Downloads' %} class="active" {% endif
%}><a href="{{ "/pages/downloads" | prepend: site.baseurl }}">Downloads</a></li>
- <li {% if page.title=='Talks' %} class="active" {% endif %}><a
href="{{ "/pages/talks" | prepend: site.baseurl }}">Talks</a></li>
- <li {% if page.title=='Team' %} class="active" {% endif %}><a
href="{{ "/pages/team" | prepend: site.baseurl }}">Team</a></li>
- <li {% if page.title=='License' %} class="active" {% endif
%}><a href="{{ "/pages/license" | prepend: site.baseurl }}">License</a></li>
- <li {% if page.sectionid=='blog' %} class="active" {% endif
%}><a href="{{ site.posts.first.url | prepend: site.baseurl }}">Blog</a></li>
+ <li {% if page.sectionid=='docs' %} class="active" {% endif
%}><a href="{{ "/docs/home/" | relative_url }}">Docs</a></li>
+ <li {% if page.title=='APIs' %} class="active" {% endif %}><a
href="{{ "/apidocs" | relative_url }}">APIs</a></li>
+ <li {% if page.title=='Downloads' %} class="active" {% endif
%}><a href="{{ "/pages/downloads" | relative_url }}">Downloads</a></li>
+ <li {% if page.title=='Talks' %} class="active" {% endif %}><a
href="{{ "/pages/talks" | relative_url }}">Talks</a></li>
+ <li {% if page.title=='Team' %} class="active" {% endif %}><a
href="{{ "/pages/team" | relative_url }}">Team</a></li>
+ <li {% if page.title=='License' %} class="active" {% endif
%}><a href="{{ "/pages/license" | relative_url }}">License</a></li>
+ <li {% if page.sectionid=='blog' %} class="active" {% endif
%}><a href="{{ site.posts.first.url | relative_url }}">Blog</a></li>
</ul>
<div class="navbar-right">
<form class="navbar-form navbar-left">
<div class="form-group has-feedback">
- <input id="search-box" type="text"
class="form-control" placeholder="Search...">
+ <input id="search-box" type="search"
class="form-control" placeholder="Search...">
<i class="fa fa-search form-control-feedback"></i>
</div>
</form>
diff --git a/_layouts/default.html b/_layouts/default.html
index f2f4e18..9a74980 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="{{ page.lang | default: site.lang | default: "en" }}">
{% include head.html %}
@@ -9,8 +9,15 @@
<div class="page-content">
<div class="wrapper">
+
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12">
{{ content }}
</div>
+ </div>
+ </div>
+ </div>
</div>
{% include footer.html %}
diff --git a/_layouts/docs.html b/_layouts/docs.html
index f7fc33b..3316f83 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -11,12 +11,14 @@ layout: default
<div class="col-md-8">
<h1>{{ page.title }}</h1>
<div id="markdown-content-container">{{ content }}</div>
- <p class="text-center">
- <br />
- <a target="_blank"
href="{{site.git_edit_address}}/tree/asf-site/{{ page.path }}" class="btn
btn-default btn-sm githubEditButton" role="button">
- <i class="fa fa-pencil"></i> Improve this page
- </a>
- </p>
+ <div style="clear:both;">
+ <p class="text-center">
+ <br />
+ <a target="_blank" href="{{site.git_edit_address}}/{{
page.path }}" class="btn btn-default" role="button">
+ <i class="fa fa-pencil fa-lg"></i> Improve this page
+ </a>
+ </p>
+ </div>
<hr>
{% include section_nav.html %}
</div>
diff --git a/_layouts/page.html b/_layouts/page.html
index dbb0249..c577f59 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -2,12 +2,14 @@
layout: default
---
-<div class="container">
- <div class="row">
- <header class="post-header">
- <h1 class="post-title">{{ page.title }}</h1>
- </header>
-
- <div id="markdown-content-container">{{ content }}</div>
- </div>
+<div class="post">
+
+ <header class="post-header">
+ <h1 class="post-title">{{ page.title }}</h1>
+ </header>
+
+ <article class="post-content">
+ {{ content }}
+ </article>
+
</div>
diff --git a/_layouts/post.html b/_layouts/post.html
index c2ab1db..8fd0ac9 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -10,9 +10,9 @@ layout: default
<h4>RECENT POSTS</h4>
<ul class="list-unstyled post-list-container">
{% for post in site.posts limit:10 %}
- <li><a href="{{ post.url | prepend: site.baseurl }}" {% if
page.title==post.title %} class="active" {% endif %}>{{ post.title }}</a></li>
+ <li><a href="{{ post.url | relative_url }}" {% if
page.title==post.title %} class="active" {% endif %}>{{ post.title }}</a></li>
{% endfor %}
- <li><a href="{{ "/allposts" | prepend: site.baseurl
}}">All posts ...</a></li>
+ <li><a href="{{ "/allposts" | relative_url }}">All posts
...</a></li>
</ul>
</div>
</div>
@@ -25,13 +25,13 @@ layout: default
<ul class="pager">
{% if page.previous %}
<li class="previous">
- <a href="{{ page.previous.url | prepend: site.baseurl }}">
+ <a href="{{ page.previous.url | relative_url }}">
<span aria-hidden="true">←</span> Older
</a>
</li>
{% endif %} {% if page.next %}
<li class="next">
- <a href="{{ page.next.url | prepend: site.baseurl }}">
+ <a href="{{ page.next.url | relative_url }}">
Newer <span aria-hidden="true">→</span>
</a>
</li>
diff --git a/_sass/_jekyll-doc-theme.scss b/_sass/_jekyll-doc-theme.scss
new file mode 100644
index 0000000..8401da9
--- /dev/null
+++ b/_sass/_jekyll-doc-theme.scss
@@ -0,0 +1,63 @@
+
+html {
+ position: relative;
+ min-height: 100%;
+ }
+ body {
+ padding-top: $navbar-height + $navbar-margin-bottom;
+ margin-bottom: 46px;
+ }
+
+ .navbar-brand{
+ img{
+ margin: -$navbar-padding-vertical 0;
+ height: $navbar-height;
+ padding: 10px 0;
+ }
+ }
+
+
+ .header-container {
+ background-color: black;
+ background: url('../img/bg.jpg') no-repeat 50% 0;
+ color: #fff;
+
+ h1 {
+ color: #fff;
+ }
+ // background-attachment: fixed;
+ background-size: cover;
+ background-position: center 36%;
+ margin-top: -37px;
+ }
+ .navbar-container {
+ font-size: 16px;
+ }
+ .page-content {
+ padding-bottom: 20px;
+ }
+ .footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ padding-top: 10px;
+ background-color: $gray-lighter;
+ color: $gray-dark;
+ }
+
+ .post-list-container {
+ li a.active {
+ font-weight: bold;
+ }
+ }
+ *[id]:before {
+ display: block;
+ content: " ";
+ margin-top: -75px;
+ height: 75px;
+ visibility: hidden;
+ }
+ .navbar-form .has-feedback .form-control-feedback{
+ top:10px
+ }
+
\ No newline at end of file
diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss
index 92f8a8c..94fdb00 100644
--- a/_sass/_syntax-highlighting.scss
+++ b/_sass/_syntax-highlighting.scss
@@ -2,7 +2,7 @@
* Syntax highlighting styles
*/
.highlight {
- background: #fff;
+ background: #f5f5f5;
.hll { background-color: #f8f8f8; border: 1px solid #ccc; padding: 6px
10px; border-radius: 3px; }
diff --git a/_sass/_typeahead.scss b/_sass/_typeahead.scss
index d594cc3..7eec682 100644
--- a/_sass/_typeahead.scss
+++ b/_sass/_typeahead.scss
@@ -19,6 +19,8 @@ span.twitter-typeahead {
}
// Added to suggestion elements.
.tt-suggestion {
+ color: $navbar-default-color;
+
// mimic .dropdown-menu > li > a
padding: 3px 20px;
line-height: $line-height-base;
diff --git a/404.html b/assets/404.html
similarity index 87%
rename from 404.html
rename to assets/404.html
index 2c68768..22cb8c1 100644
--- a/404.html
+++ b/assets/404.html
@@ -1,5 +1,6 @@
---
layout: default
+permalink: 404.html
---
<div class="container text-center">
diff --git a/allposts.html b/assets/allposts.html
similarity index 75%
rename from allposts.html
rename to assets/allposts.html
index 44bbe60..caf4b3d 100644
--- a/allposts.html
+++ b/assets/allposts.html
@@ -2,6 +2,7 @@
title: Blog
layout: default
sectionid: blog
+permalink: allposts.html
---
@@ -9,7 +10,7 @@ sectionid: blog
<div class="inner-content">
<h1>All Posts</h1> {% for page in site.posts %}
<p>
- <strong><a href="{{ page.url | prepend: site.baseurl }}">{{
page.title }}</a></strong>
+ <strong><a href="{{ page.url | relative_url }}">{{ page.title
}}</a></strong>
<span>on {{ page.date | date: "%B %e, %Y" }} {% if page.author %}
by {{ page.author }}{% endif %}</span>
</p>
{% endfor %}
diff --git a/css/font-awesome.min.css b/assets/css/font-awesome.min.css
similarity index 100%
rename from css/font-awesome.min.css
rename to assets/css/font-awesome.min.css
diff --git a/assets/css/main.scss b/assets/css/main.scss
new file mode 100755
index 0000000..291aeaf
--- /dev/null
+++ b/assets/css/main.scss
@@ -0,0 +1,21 @@
+---
+# Only the main Sass file needs front matter (the dashes are enough)
+---
+@charset "utf-8";
+
+// Import partials from `sass_dir` (defaults to `_sass`)
+
+@import
+ {% if site.bootwatch %}
+ "bootswatch/{{site.bootwatch | downcase}}/variables",
+ {% endif %}
+
+ "bootstrap",
+
+ {% if site.bootwatch %}
+ "bootswatch/{{site.bootwatch | downcase}}/bootswatch",
+ {% endif %}
+
+ "syntax-highlighting",
+ "jekyll-doc-theme"
+;
diff --git a/fonts/FontAwesome.otf b/assets/fonts/FontAwesome.otf
similarity index 100%
rename from fonts/FontAwesome.otf
rename to assets/fonts/FontAwesome.otf
diff --git a/fonts/fontawesome-webfont.eot
b/assets/fonts/fontawesome-webfont.eot
similarity index 100%
rename from fonts/fontawesome-webfont.eot
rename to assets/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg
b/assets/fonts/fontawesome-webfont.svg
similarity index 100%
rename from fonts/fontawesome-webfont.svg
rename to assets/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf
b/assets/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from fonts/fontawesome-webfont.ttf
rename to assets/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff
b/assets/fonts/fontawesome-webfont.woff
similarity index 100%
rename from fonts/fontawesome-webfont.woff
rename to assets/fonts/fontawesome-webfont.woff
diff --git a/fonts/fontawesome-webfont.woff2
b/assets/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from fonts/fontawesome-webfont.woff2
rename to assets/fonts/fontawesome-webfont.woff2
diff --git a/assets/img/bg.jpg b/assets/img/bg.jpg
new file mode 100644
index 0000000..ea2ad5a
Binary files /dev/null and b/assets/img/bg.jpg differ
diff --git a/img/coral.png b/assets/img/coral.png
similarity index 100%
rename from img/coral.png
rename to assets/img/coral.png
diff --git a/assets/img/jekyll-dark.png b/assets/img/jekyll-dark.png
new file mode 100644
index 0000000..4c11237
Binary files /dev/null and b/assets/img/jekyll-dark.png differ
diff --git a/assets/img/jekyll.png b/assets/img/jekyll.png
new file mode 100644
index 0000000..4b5e06d
Binary files /dev/null and b/assets/img/jekyll.png differ
diff --git a/assets/img/logonav.png b/assets/img/logonav.png
new file mode 100644
index 0000000..cac0f61
Binary files /dev/null and b/assets/img/logonav.png differ
diff --git a/img/nemo-logo.png b/assets/img/nemo-logo.png
similarity index 100%
rename from img/nemo-logo.png
rename to assets/img/nemo-logo.png
diff --git a/img/onyx-light.png b/assets/img/onyx-light.png
similarity index 100%
rename from img/onyx-light.png
rename to assets/img/onyx-light.png
diff --git a/img/onyx.png b/assets/img/onyx.png
similarity index 100%
rename from img/onyx.png
rename to assets/img/onyx.png
diff --git a/img/onyx_logo.png b/assets/img/onyx_logo.png
similarity index 100%
rename from img/onyx_logo.png
rename to assets/img/onyx_logo.png
diff --git a/js/bootstrap.min.js b/assets/js/bootstrap.min.js
similarity index 100%
rename from js/bootstrap.min.js
rename to assets/js/bootstrap.min.js
diff --git a/assets/js/main.js b/assets/js/main.js
new file mode 100644
index 0000000..5349508
--- /dev/null
+++ b/assets/js/main.js
@@ -0,0 +1,33 @@
+$(function () {
+
+ function initSearchBox() {
+ var pages = new Bloodhound({
+ datumTokenizer: Bloodhound.tokenizers.obj.whitespace('title'),
+ // datumTokenizer: Bloodhound.tokenizers.whitespace,
+ queryTokenizer: Bloodhound.tokenizers.whitespace,
+
+ prefetch: baseurl + '/search.json'
+ });
+
+ $('#search-box').typeahead({
+ minLength: 0,
+ highlight: true
+ }, {
+ name: 'pages',
+ display: 'title',
+ source: pages
+ });
+
+ $('#search-box').bind('typeahead:select', function (ev, suggestion) {
+ window.location.href = suggestion.url;
+ });
+ }
+
+ function styleContentToMD() {
+ $('#markdown-content-container table').addClass('table');
+ $('#markdown-content-container img').addClass('img-responsive');
+ }
+
+ initSearchBox();
+ styleContentToMD();
+});
diff --git a/js/typeahead.bundle.min.js b/assets/js/typeahead.bundle.min.js
similarity index 100%
rename from js/typeahead.bundle.min.js
rename to assets/js/typeahead.bundle.min.js
diff --git a/assets/runtime_arch.png b/assets/runtime_arch.png
deleted file mode 100644
index 79bb8de..0000000
Binary files a/assets/runtime_arch.png and /dev/null differ
diff --git a/search.json b/assets/search.json
similarity index 79%
rename from search.json
rename to assets/search.json
index 282fea2..c7e895c 100644
--- a/search.json
+++ b/assets/search.json
@@ -1,4 +1,5 @@
---
+permalink: search.json
---
[
{% for section in site.data.docs %}
@@ -7,8 +8,7 @@
{% assign p = site.docs | where:"url", item_url | first %}
{
"title": "{{ p.title }}",
- "url": "{{ p.url | prepend: site.baseurl }}"
-
+ "url": "{{ p.url | relative_url }}"
},
{% endfor %}
{% endfor %}
@@ -16,7 +16,7 @@
{% for post in site.posts %}
{
"title": "{{ post.title | escape }}",
- "url": "{{ post.url | prepend: site.baseurl }}"
+ "url": "{{ post.url | relative_url }}"
}{% unless forloop.last %},{% endunless %}
{% endfor %}
]
diff --git a/css/main.scss b/css/main.scss
deleted file mode 100755
index 7c6d80d..0000000
--- a/css/main.scss
+++ /dev/null
@@ -1,86 +0,0 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-// Import partials from `sass_dir` (defaults to `_sass`)
-
-
-
-@import
- {% if site.bootwatch %}
- "bootswatch/{{site.bootwatch | downcase}}/variables",
- {% endif %}
-
- "bootstrap",
-
- {% if site.bootwatch %}
- "bootswatch/{{site.bootwatch | downcase}}/bootswatch",
- {% endif %}
-
- "syntax-highlighting",
- "typeahead"
-;
-
-html {
- position: relative;
- min-height: 100%;
-}
-body {
- padding-top: $navbar-height + $navbar-margin-bottom;
- margin-bottom: 46px;
-}
-
-.navbar-brand{
- img{
- margin: -$navbar-padding-vertical 0;
- height: $navbar-height;
- padding: 10px 0;
- }
-}
-
-
-.header-container {
- background-color: black;
- background: url('../img/bg.jpg') no-repeat 50% 0;
- color: #4B4B4B;
-
- h1 {
- color: #4B4B4B;
- }
- // background-attachment: fixed;
- background-size: cover;
- background-position: center 36%;
- margin-top: -37px;
-}
-.navbar-container {
- font-size: 16px;
-}
-.page-content {
- padding-bottom: 20px;
-}
-.footer {
- position: absolute;
- bottom: 0;
- width: 100%;
- height: 46px;
- padding-top: 10px;
- background-color: $gray-lighter;
- color: $gray-dark;
-}
-
-.post-list-container {
- li a.active {
- font-weight: bold;
- }
-}
-*[id]:before {
- display: block;
- content: " ";
- margin-top: -75px;
- height: 75px;
- visibility: hidden;
-}
-.navbar-form .has-feedback .form-control-feedback{
- top:10px
-}
diff --git a/img/bg.jpg b/img/bg.jpg
deleted file mode 100644
index 63ac207..0000000
Binary files a/img/bg.jpg and /dev/null differ
diff --git a/js/main.js b/js/main.js
deleted file mode 100644
index edcff17..0000000
--- a/js/main.js
+++ /dev/null
@@ -1,34 +0,0 @@
-$(function() {
-
- // $('.collapse').collapse('hide');
- $('.list-group-item.active').parent().parent('.collapse').collapse('show');
-
-
- var pages = new Bloodhound({
- datumTokenizer: Bloodhound.tokenizers.obj.whitespace('title'),
- // datumTokenizer: Bloodhound.tokenizers.whitespace,
- queryTokenizer: Bloodhound.tokenizers.whitespace,
-
- prefetch: baseurl + '/search.json'
- });
-
- $('#search-box').typeahead({
- minLength: 0,
- highlight: true
- }, {
- name: 'pages',
- display: 'title',
- source: pages
- });
-
- $('#search-box').bind('typeahead:select', function(ev, suggestion) {
- window.location.href = suggestion.url;
- });
-
-
- // Markdown plain out to bootstrap style
- $('#markdown-content-container table').addClass('table');
- $('#markdown-content-container img').addClass('img-responsive');
-
-
-});
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..0f16eb8
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,43 @@
+user nginx;
+worker_processes 1;
+
+
+error_log /dev/stderr warn;
+pid /var/run/nginx.pid;
+
+
+events
+{
+ worker_connections 1024;
+}
+
+
+http
+{
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /dev/stdout;
+
+ sendfile off;
+ # tcp_nopush on;
+
+ keepalive_timeout 65;
+
+ gzip on;
+
+ # serve static files
+ server
+ {
+
+ location /
+ {
+
+ root /usr/share/nginx/html;
+ }
+ }
+}
diff --git a/publish.sh b/publish.sh
index 180bd34..07f14d2 100755
--- a/publish.sh
+++ b/publish.sh
@@ -24,7 +24,7 @@ bundler exec jekyll build -d content
COMMIT_HASH=`git rev-parse HEAD`
git checkout asf-site
-git pull --rebase
+git pull
git add content
echo "Publishing changes from master branch $COMMIT_HASH"
git commit -a -m "Publishing from $COMMIT_HASH"
