From 661165baeb50b16cfd11176f39ad4c885ab8c629 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood09@imperial.ac.uk>
Date: Fri, 19 Feb 2016 14:09:20 +0000
Subject: [PATCH] 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 | 3 +--
Gemfile.lock | 24 ++++++++------------
_config.yml | 10 ++++++++-
_layouts/home.html | 27 +++++++++++++++++++++++
advert.md => _posts/2016-02-18-advert.md | 7 +-----
_research/concurrency.md | 2 +-
_research/javascript.md | 5 +++++
favicon.ico | Bin 1718 -> 16958 bytes
index.md | 15 ++-----------
people.html | 3 +--
research.md | 14 ++++++++++++
11 files changed, 70 insertions(+), 40 deletions(-)
create mode 100644 _layouts/home.html
rename advert.md => _posts/2016-02-18-advert.md (93%)
create mode 100644 _research/javascript.md
create mode 100644 research.md
diff --git a/Gemfile b/Gemfile
index 9d11303..656941c 100644
--- a/Gemfile
+++ b/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
diff --git a/Gemfile.lock b/Gemfile.lock
index e19d688..6699a3f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,3 @@
-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
diff --git a/_config.yml b/_config.yml
index 26b1b41..93fa063 100644
--- a/_config.yml
+++ b/_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
diff --git a/_layouts/home.html b/_layouts/home.html
new file mode 100644
index 0000000..befaf29
--- /dev/null
+++ b/_layouts/home.html
@@ -0,0 +1,27 @@
+---
+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>
+
diff --git a/advert.md b/_posts/2016-02-18-advert.md
similarity index 93%
rename from advert.md
rename to _posts/2016-02-18-advert.md
index 1c92ffd..b9ebef5 100644
--- a/advert.md
+++ b/_posts/2016-02-18-advert.md
@@ -1,11 +1,6 @@
---
-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
diff --git a/_research/concurrency.md b/_research/concurrency.md
index 1ee85df..0df63bb 100644
--- a/_research/concurrency.md
+++ b/_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.
diff --git a/_research/javascript.md b/_research/javascript.md
new file mode 100644
index 0000000..f8273dc
--- /dev/null
+++ b/_research/javascript.md
@@ -0,0 +1,5 @@
+---
+title: JavaScript
+project_id: javascript
+---
+
diff --git a/favicon.ico b/favicon.ico
index c0a2c269f1b819799237c166b307f0af962a6067..1e4580ad1e0f2050475dd8f6829697af2eea2d42 100644
GIT binary patch
literal 16958
zcmeHN$!Zi)6n$~P36q@&4vE7ef6>9M1ENtx6x^8zenavN(Jyesji>~5Wn4IbOL5p3
z*Sb(!h_TT&<vFo0UY@VJ@{(7#0=_H9`}z&{oO`>vD)p+I>%+g15r_YW-0%VCwmIj9
z0d%=Zfc@EW1#$&)1#$&)1#$&)1#$(FR$vpN9S5d>8DJLp3j73$4&b6p*0r&UvEBoZ
zfy=-NU^B29>;go521IW+AFH)n9O?gpfEQzfCZ0crc%rAw$5NNYlkxG`z=`JfBhDNk
zI?8-3ZCN}S|AxQ=vB49}KaUuqLHlX+9|3j)JTI)&HX^_-;1F;Z&|K2yacFH<K`8v<
znS0e1ssXiF+e;8i-r^4%h~RM`eB!Ca+CG9%_{H-$t=h;TeBwV;O&W+lAJD<yYSqSb
zisUVx=Rj){Ztbl!XijNcaSM;|YA<6|d(A2BsyY4m!mGVMr>f7IQ`%K=b&D&!+IO3q
zx?gijJ2gjHJmJ;8Y)z_h%_;3vv6m9350ivf`=zW+F-LPso0_a_D~N<w{0}Q~@aX$$
z;ooA&zdw*a??<hy2_nf`{9Y?^@NoY@c*R@(4f-m;KWdnN=pN*nA^-J2{<n?z&jq-7
z3~>L;%J^N&ai{&6!~%Fu<++Z(_mjXqK=Voa1^U+jRz@yz3cvPu(9inp1E_tu*99H3
zSNl0Qwgc8i&SyX`ZF($LpI+;?TL|_LI0dYY4V-X3xp`dP2fhQoPW>6fQKr}WZC-z$
z0^9@J5EV7;WO7r(6Cm_Afz}<%tk?Ex^I9|%8$7{$UhiK6y|n4E<xuk6!N05a07rov
zzyhG-vdtQ-1FUR4h~5Ie4r;pzQ0ovt?aU#iac}n*;B%i&Nm3H)Y=EDdsLjH--|FYj
zx?9;T5c&L9tjNK0Fu>2>fR()gk)J;`S=mky`TV>mu`)gn_4#*Lk%K3+2g~b^mGPOd
zpTEW4v(C@w=VvRclUs7EQ$wBHIsZQusPj9hlRJO^`TJ)D<^lgWw73TGy(gcyj_03s
zJ^$u=C4T;OJpT^8|6p<dK@LBE%e`mNFIwmxi2E>A+cXIL{Hev-xbNcY;O7T`+<)`8
zx>92d9`k&+CX_ol#{g^V2jLtLszInPR$nMasE-=zc>j(0bUOw@I;+ZmJT`FR`Q-lu
zgmTt>v9x+^sJ$BAf0dkgKYR?B0v-YH0P5p2VbP9el*u~A;NHS4FaulyMu8OP7KF)`
zE08OYE08OYE08OYEAW3+ph#wujdmY{xklT;EznOCMVr1s&ms7MqG<N=gGJHec!_Uu
zd<kfB&H&`lyNQk#Xqxz|aZzhyQLD@=I_rwoU~ir>o&SuN<u7&W)J^IrbuA`4buN<F
EZyw9$mjD0&
literal 1718
zcmb7^JxE+Z5Xb)p16P<kZG___9~MFDErJjT2q_IVRw?Y3bb&NB0beCn5(o$jDJ+se
ziZnK9uSyXY?6isS#KMb&Q#&Ex<~Q@ykaXF*{h0sG&ivl&yOTzAOXK6?l14Q%B0Xf~
zrdoP&TY82zV;cQFeFQ&im5<F}d)Av)HJerCJ~pzXSL*lsxD@}Y6kE~xm}G<0s%_M;
z8dNq(b*pi&weEZCs4Uh8=Gs|TJ*aE7hiAh9iCSvcRhua43@Z+HI`t*8+NWx(#vTqj
z*aJ>(Y!I6iV)oXNE?1@Vd(!Sp>B%c;^|ADBPC9xj9o`}Fb9ztu@d)h;=jnGjx4H}C
z>A!U%zcuQ2(`<cXR}=-iqCPg+hlSOs|GlrXZyz-}I;vKyrLnOwO-xK^a&l5rQ&XCr
zp4RN_td^FRw6L(C`T2Rx&CRKLU9`AZ^j3Q+KeN8>ooes+SZ_XkCPSb{dZOpX3}^u@
zpas*o19OS!kwrw0=n>tHCG>=zFcNw~XHrJb=ovjDWb}evuuJyLfiVy~5GZgcaPOX;
zA;1t|2rvW~90`U1Lx3T`5MXdj7y=9dh5$o=!O>v|Fa#I^3;~8v(BKGg1moZxgUTr)
zV}vEb5@GR2h9#0bk|+{1!s2CMGqQ-VL|D8ma6~vF91)HPhnEVD2t$M+!eFI~a6}j)
z4B6lK+?0?!%?I1dYt?~@+zCG~HMtW^iKK}H38qBu#AYIQB6lLUUx(*LCx0S;BEMZx
zB7dSb35Eniq7HU#RK=ejg_+T=ks4(3W!N$tnS6e=#z74-9N9Q{Fu!gNWmqyS8Hh|m
ze+6L49LzXngbWK`I&rv@3`@3pIE%dvb_-}Q6c`E&1%?7cfx%xV7%~h6h5|!|fiQIZ
zVJI*Z7zzx8rlZ49U??yY01Ejt!3qZpPLUW9JHk;sw)sRo&<8CqFKcCGMQdwo+T7gK
z&d!dux3{&wzpsOX105Y5>Ez@@=jZ3TxVX^SucG%`Tl|hIs%yUin~3L@#Wm9`Z{6<o
zin)u`?egd1t=VGVg=<Ii@0r`*UMS{91lwqKdp32|Gk5dunm~LU8@uszC*No2nRm0z
oi2oncj@pUqZQ@;RTC^syX(rzIuxf16uA1-v@Bi%KKmW780a!ifs{jB1
diff --git a/index.md b/index.md
index a6bd718..b2054a0 100644
--- a/index.md
+++ b/index.md
@@ -1,19 +1,8 @@
---
+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.
diff --git a/people.html b/people.html
index 991455d..f85c8eb 100644
--- a/people.html
+++ b/people.html
@@ -1,7 +1,6 @@
---
title: People
menu: true
-menu_order: 2
-permalink: /people/
+menu_order: 3
---
{% include person-cards.html people=site.people %}
diff --git a/research.md b/research.md
new file mode 100644
index 0000000..cbdd8a7
--- /dev/null
+++ b/research.md
@@ -0,0 +1,14 @@
+---
+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 %}
+
--
GitLab