[jekyll 3] migration

johndba · Sep 1, 2016 · 2faeed4 · 2faeed4
1 parent f7b4f06
commit 2faeed4
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 *.sw*
 _site
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,11 @@
-source 'https://rubygems.org'
-gem 'github-pages'
+#source "https://rubygems.org"
+#ruby RUBY_VERSION
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+# group :jekyll_plugins do
+#   gem "jekyll-github-metadata", "~> 1.0"
+# end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,140 +1,127 @@
 GEM
-  remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.5)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.4)
-      fast-stemmer (~> 1.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorator (0.1)
+    colorator (1.1.0)
     ethon (0.8.1)
       ffi (>= 1.3.0)
     execjs (2.6.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fast-stemmer (1.0.2)
     ffi (1.9.10)
+    forwardable-extended (2.6.0)
     gemoji (2.1.0)
-    github-pages (43)
-      RedCloth (= 4.2.9)
-      github-pages-health-check (= 0.6.0)
-      jekyll (= 2.4.0)
+    github-pages (93)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.2.0)
+      jekyll (= 3.2.1)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.3.1)
+      jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-mentions (= 0.2.1)
+      jekyll-github-metadata (= 2.0.2)
+      jekyll-mentions (= 1.1.3)
       jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.9.1)
+      jekyll-redirect-from (= 0.11.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 0.1.4)
-      jekyll-sitemap (= 0.9.0)
-      jemoji (= 0.5.0)
-      kramdown (= 1.9.0)
-      liquid (= 2.6.2)
-      maruku (= 0.7.0)
+      jekyll-seo-tag (= 2.0.0)
+      jekyll-sitemap (= 0.10.0)
+      jemoji (= 0.7.0)
+      kramdown (= 1.11.1)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
       mercenary (~> 0.3)
-      pygments.rb (= 0.6.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
+      minima (= 1.0.1)
+      rouge (= 1.11.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (0.6.0)
+    github-pages-health-check (1.2.0)
       addressable (~> 2.3)
       net-dns (~> 0.8)
+      octokit (~> 4.0)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (1.9.0)
+    html-pipeline (2.4.2)
       activesupport (>= 2)
-      nokogiri (~> 1.4)
+      nokogiri (>= 1.4)
     i18n (0.7.0)
-    jekyll (2.4.0)
-      classifier-reborn (~> 2.0)
-      colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
+    jekyll (3.2.1)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-feed (0.3.1)
+    jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-mentions (0.2.1)
-      html-pipeline (~> 1.9.0)
-      jekyll (~> 2.0)
+    jekyll-github-metadata (2.0.2)
+      jekyll (~> 3.1)
+      octokit (~> 4.0)
+    jekyll-mentions (1.1.3)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.9.1)
+    jekyll-redirect-from (0.11.0)
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-seo-tag (0.1.4)
-      jekyll (>= 2.0)
-    jekyll-sitemap (0.9.0)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
+    jekyll-sitemap (0.10.0)
     jekyll-watch (1.3.0)
       listen (~> 3.0)
-    jemoji (0.5.0)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
       gemoji (~> 2.0)
-      html-pipeline (~> 1.9)
-      jekyll (>= 2.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
     json (1.8.3)
-    kramdown (1.9.0)
-    liquid (2.6.2)
-    listen (3.0.5)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    maruku (0.7.0)
+      rb-inotify (>= 0.9.7)
     mercenary (0.3.5)
     mini_portile2 (2.0.0)
+    minima (1.0.1)
     minitest (5.8.3)
     multipart-post (2.0.0)
     net-dns (0.8.0)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     octokit (4.2.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
     public_suffix (1.5.3)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.21)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     terminal-table (1.5.2)
     thread_safe (0.3.5)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
@@ -143,4 +130,4 @@ DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   1.10.6
+   1.12.5
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,8 @@
+future: true
 name: BitShares
 description: BitShares 2.0 is an industrial-grade financial smart contract platform.
 url: https://bitshares.org
+repository: bitshares/bitshares.github.io
 
 collections:
     content:
@@ -9,36 +11,23 @@ collections:
         output: true
 
 defaults:
-    - scope:
-          path: content/en
-      values:
-          lang: en
-
-
-
     - scope:
           type: technologies
       values:
           layout: technology
           priority: 100
+          lang: en
 
     - scope:
-          path: technologies/en
+          path: content
       values:
           lang: en
 
-
-
     - scope:
           type: posts
       values:
           layout: post
 
-    - scope:
-          path: _posts/en
-      values:
-          lang: en
-
 
 excerpt_separator: <!--more-->
 

diff --git a/_content/en/blog.html b/_content/en/blog.html
@@ -6,7 +6,7 @@
 <h1>Blog</h1>
 <hr />
 
-{% assign posts = (site.posts | where: 'lang', page.lang) %}
+{% assign posts = (site.posts) %}
 {% for post in posts %}
     <strong><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></strong>
     ({{ post.date | date: "%-m/%-d/%Y" }})<br />

diff --git a/_content/en/deposit.md b/_content/en/deposit.md
@@ -42,7 +42,6 @@ buy/sell order at a desired price.
 - [**CCEDK**<i> - USD, EUR, bitUSD, bitEUR</i>](https://www.ccedk.com/bitusd-usd){:target="_blank"}
 - [BTC38](http://www.btc38.com/trade_en.html){:target="_blank"}
 - [Yunbi](https://yunbi.com/?lang=en){:target="_blank"}
-- [Bter](https://bter.com/){:target="_blank"}
 - [Poloniex](https://www.poloniex.com/){:target="_blank"}
 - [Bittrex](https://bittrex.com/){:target="_blank"}
 - [Bitcoin Indonesia](https://vip.bitcoin.co.id/){:target="_blank"}

diff --git a/_content/en/index.html b/_content/en/index.html
@@ -39,57 +39,45 @@
 ---
 
 <section class="teaser ">
-
-<div class="slogan ">
+ <div class="slogan ">
   <center>
-    <div id="getting-started"></div>
-
-    <h2 class="pitch" style="padding-top:5rem;">
-       BitShares - Your share in the Decentralized Exchange
-    </h2>
+   <div id="getting-started"></div>
+   <h2 class="pitch" style="padding-top:5rem;">
+    BitShares - Your share in the Decentralized Exchange
+   </h2>
    <p class="pitch-sub">
-     Built using the latest in industry research, BitShares 2.0 offers a
-     stack of financial services including exchange and banking on a blockchain.</p>
+   Built using the latest in industry research, BitShares 2.0 offers a
+   stack of financial services including exchange and banking on a blockchain.</p>
    <br />
    <p>
-    <a class="btn btn-lg btn-success" href="https://bitshares.org/download/">Download</a>
-    <span style="font-size: 100%"> &nbsp; OR &nbsp; </span>
-    <a class="btn btn-lg btn-primary" href="https://bitshares.openledger.info">Try Online Wallet </a>
+   <a class="btn btn-lg btn-success" href="https://bitshares.org/download/">Download</a>
+   <span style="font-size: 100%"> &nbsp; OR &nbsp; </span>
+   <a class="btn btn-lg btn-primary" href="https://bitshares.openledger.info">Try Online Wallet </a>
    </p>
   </center>
-
-   </center>
-<div class="row center">
-<div class="container">
-
-</div>
-
+  </center>
+  <div class="row center">
+   <div class="container">
+   </div>
+  </div>
  </div>
-
-</div>
-
 </section>
 
 <section id="features">
-<div class="container">
-
- <center>
-<div class="row row-eq-height">
-  <ul class="features">
-    {% assign technologies = (site.technologies | where: 'lang', page.lang | sort: 'priority') %}
-    {% for technology in technologies  %}
-    <li onclick="location.href='{{ technology.url }}';" class="col-xs-12 col-md-6 col-lg-4 state" >
-    <a href="{{ technology.url }}">
-    <img class="feature-img" src="{{ BASE_PATH }}/{{ technology.image }}" />
-    {{ technology.title }}</a><br>{{ technology.subtitle }}</li>
-    <!-- Add the extra clearfix for only the required viewport -->
-
-    {% endfor %}
-  </ul>
-
-</div>
-</center>
-
-
-
-</div></section>
+ <div class="container">
+  <center>
+   <div class="row row-eq-height">
+    <ul class="features">
+     {% assign technologies = (site.technologies | sort: 'priority') %}
+     {% for technology in technologies  %}
+     <li onclick="location.href='{{ technology.url }}';" class="col-xs-12 col-md-6 col-lg-4 state" >
+      <a href="{{ technology.url }}">
+       <img class="feature-img" src="{{ BASE_PATH }}/{{ technology.image }}" />
+       {{ technology.title }}</a><br>{{ technology.subtitle }}</li>
+     <!-- Add the extra clearfix for only the required viewport -->
+     {% endfor %}
+    </ul>
+   </div>
+  </center>
+ </div>
+</section>
diff --git a/_content/en/technology.md b/_content/en/technology.md
@@ -16,7 +16,7 @@ features which are not found elsewhere within the smart contract industry:
 
 -----
 
-{% assign technologies = (site.technologies | where: 'lang', page.lang | sort: 'priority') %}
+{% assign technologies = (site.technologies | sort: 'priority') %}
 {% for technology in technologies  %}
 <div class="row tech-toc">
 

diff --git a/_technologies/en/decentralized-asset-exchange.md b/_technologies/en/decentralized-asset-exchange.md
@@ -9,6 +9,7 @@ summary: >
     you would expect in a trading platform. It can handle the trading volume of the NASDAQ, while
     settling orders the second you submit them.  With this kind of performance on a decentralized exchange,
     who needs risky centralized exchanges?
+date: 2016-01-01 00:00:00 -0000
 ---
 
 Throughout history, centralized exchanges have repeatedly proven unreliable and