Revert "Merge branch 'master' of...

Revert "Merge branch 'master' of https://gitlab.doc.ic.ac.uk/resource-reasoning/www-rw.doc.ic.ac.uk"

This reverts commit a9cf459f5da4fdccf215f3501dd04726cd796070, reversing
changes made to e6f81b0023b73c2e3556f761cc87fe4d6f53cf8b.

Gemfile

@@ -4,8 +4,7 @@ gem 'rake'
 gem 'jekyll'
 
 group :default, :jekyll_plugins do
-#  gem 'jekyll-scholar'
-  gem 'jekyll-scholar', :git => 'https://github.com/edgemaster/jekyll-scholar.git', :branch => 'master'
+  gem 'jekyll-scholar'
 end
 
 group :test do

Gemfile.lock

-GIT
-  remote: https://github.com/edgemaster/jekyll-scholar.git
-  revision: 867c1f71c4a0f76e08cceb2b2a012243c83ecceb
-  branch: master
-  specs:
-    jekyll-scholar (5.7.0)
-      bibtex-ruby (~> 4.0, >= 4.0.13)
-      citeproc-ruby (~> 1.0)
-      csl-styles (~> 1.0)
-      jekyll (~> 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -56,6 +45,11 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
+    jekyll-scholar (5.7.1)
+      bibtex-ruby (~> 4.0, >= 4.0.13)
+      citeproc-ruby (~> 1.0)
+      csl-styles (~> 1.0)
+      jekyll (~> 3.0)
     jekyll-watch (1.3.1)
       listen (~> 3.0)
     json (1.8.3)
@@ -63,9 +57,9 @@ GEM
     latex-decode (0.2.2)
       unicode (~> 0.4)
     liquid (3.0.6)
-    listen (3.0.5)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
     mercenary (0.3.5)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
@@ -75,7 +69,7 @@ GEM
     parallel (1.6.1)
     rake (10.5.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
@@ -94,7 +88,7 @@ PLATFORMS
 DEPENDENCIES
   html-proofer
   jekyll
-  jekyll-scholar!
+  jekyll-scholar
   rake
 
 BUNDLED WITH

_config.yml

@@ -18,13 +18,15 @@ exclude:
 collections:
   people:
     output: true
+  research:
+    output: true
 
 defaults:
   -
     scope:
       path: ""
     values:
-      layout: "page"
+      layout: page
       menu: false
       menu_order: 9
   -
@@ -33,6 +35,12 @@ defaults:
       type: people
     values:
       layout: person
+  -
+    scope:
+      path: ""
+      type: research
+    values:
+      layout: research
 
 scholar:
   source: publications

_layouts/home.html

+---
+layout: default
+---
+<div class="jumbotron">
+  <div class="lead">
+    {{ content }}
+  </div>
+  <a class="btn btn-primary btn-lg" href="{{ site.pages | where:'title','Research' | map:'url' }}">Our Research</a>
+</div>
+
+
+<div class="row">
+  <div class="col-sm-6">
+    <h2>News</h2>
+      {% for post in site.posts %}
+      <h3 class="blog-post-title"><a href="{{ post.url }}">{{ post.title }}</a></h3>
+      <p class="blog-post-meta">{{ post.date | date: "%b %-d, %Y" }}</p>
+      {{ post.excerpt}}
+      {% endfor %}
+    </div>
+
+  <div class="col-sm-6">
+    <h2>Recent Publications</h2>
+    {% bibliography --max 5 %}
+  </div>
+</div>
+

advert.md → _posts/2016-02-18-advert.md

 ---
-title: Job Announcements
-menu: true
-menu_order: 10
+title: Two new postdoc positions at Imperial College!
 ---
-
-<h4> Two new postdoc positions at Imperial College! </h4> 
-
 We are seeking two outstanding postdocs (one dominantly theoretical, one 
 dominantly practical) with strong interests in the formal specification and 
 verification of concurrent and distributed systems to join the Program 

_research/concurrency.md

@@ -7,7 +7,7 @@ Concurrent programs and libraries are ubiquitous in today's world of multi-core
 and the need for reasoning about concurrent programs and verifying their correctness grows 
 increasingly more important. These research problems are still considered difficult for a variety of reasons,
 such as the fact that we need to consider and reach conclusions about a shared state 
-affected by multiple threads, or that we require effective abstractions for describing the complex behaviour created by multiple threads.
+affected by multiple threads.
 
 Our research agenda is to develop formal reasoning methods about concurrency with a focus on concurrent program logics.
 Recently, various logics based on separation logic were introduced with the aim of verifying functional correctness of fine-grained concurrent programs.

_research/javascript.md

+---
+title: JavaScript
+project_id: javascript
+---
+

index.md

 ---
+layout: home
 title: Home
 menu: true
 menu_order: 1
 ---
+One paragraph about the group and its research, about 4 lines of text would be good here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ante enim, bibendum vitae vestibulum in, luctus et diam. Quisque pulvinar accumsan nisl, et lobortis enim euismod quis. Praesent pulvinar nulla justo, ut vulputate leo blandit sit amet. Mauris fringilla sodales nulla at porta. Vivamus ligula leo, ultrices ut quam sit amet, ullamcorper volutpat magna. Quisque consequat, sem in lobortis scelerisque, quam turpis ornare odio, auctor congue nisi velit in dolor. Curabitur auctor fermentum eros at dictum.
 
-Concurrent programs and libraries are ubiquitous in today's world of multi-core processor architectures, 
-and the need for reasoning about concurrent programs and verifying their correctness grows 
-increasingly more important. These research problems are still considered difficult for a variety of reasons,
-such as the fact that we need to consider and reach conclusions about a shared state 
-affected by multiple threads, or [another reason].
-
-Our research agenda is to develop formal reasoning methods about concurrency with a focus on concurrent program logics.
-Recently, various logics based on separation logic were introduced with the aim of verifying functional correctness of fine-grained concurrent programs.
-We have played a significant role in the development of {% cite_details Dinsdale-Young2010Concurrent --text Concurrent Abstract Predicates %}, {% cite_details Dinsdale-Young2013Views --text Views %}, {% cite_details daRochaPinto2014TaDA --text TaDA %}, {% cite_details Raad2015CoLoSL --text CoLoSL %}, {% cite_details Ntzik2015Fault --text Fault-tolerant Concurrent Separation Logic %} and {% cite_details daRochaPinto2016Modular --text Total-TaDA %}.
-These logics have tackled a range of problems, including data abstraction, atomicity abstraction, fault-tolerance, terminal, while introducing more modular and compositional ways to reason about concurrent programs.
-We have applied these logics to the verification of large problems, such as data structures used in databases and java.util.concurrent, as well as the specification of file systems.
-
-Our mission is to continually challenge and improve the state-of-the-art, targeting progress properties, specification of concurrency in POSIX filesystems, refinement of our logics so that we are able to deal with more advanced algorithms, and the development of automated reasoning tools based on these logics.

people.html

 ---
 title: People
 menu: true
-menu_order: 2
-permalink: /people/
+menu_order: 3
 ---
 {% include person-cards.html people=site.people %}

research.md

+---
+title: Research
+menu: true
+menu_order: 2
+---
+
+Details about the group's research, more than on the homepage. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ante enim, bibendum vitae vestibulum in, luctus et diam. Quisque pulvinar accumsan nisl, et lobortis enim euismod quis. Praesent pulvinar nulla justo, ut vulputate leo blandit sit amet. Mauris fringilla sodales nulla at porta. Vivamus ligula leo, ultrices ut quam sit amet, ullamcorper volutpat magna. Quisque consequat, sem in lobortis scelerisque, quam turpis ornare odio, auctor congue nisi velit in dolor. Curabitur auctor fermentum eros at dictum.
+
+{% for item in site.research %}
+<h3><a href="{{ item.url }}">{{ item.title }}</a></h3>
+{{ item.excerpt }}
+<p><a href="{{ item.url }}">Read more...</a></p>
+{% endfor %}
+