diff --git a/_config.yml b/_config.yml
index f3d2c8e17ef6aee8872307339f2336610a326f43..4ce8f6d0a92bfaa203c08f85c92542be4202911d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,7 @@
title: Reliable Web
+subtitle: a group subtitle goes here
+copyright: Imperial College London
+
baseurl: ""
url: "http://www-rw.doc.ic.ac.uk"
@@ -18,3 +21,9 @@ defaults:
values:
layout: "page"
menu: true
+
+scholar:
+ source: .
+ bibliography: publications.bib
+ details_dir: publications
+ details_layout: publication.html
diff --git a/_data/external_assets.yml b/_data/external_assets.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ec6f6cc7bc68c7deae9b1825f75bb748ed470680
--- /dev/null
+++ b/_data/external_assets.yml
@@ -0,0 +1,26 @@
+# Externally-hosted assets, inserted into template using _includes/external-assets-{filetype}.html
+# Integrity tokens for tamper-resistancy may be generated at https://www.srihash.org/
+
+jquery:
+ uri: "https://ajax.googleapis.com/ajax/libs/jquery/"
+ version: "2.2.0"
+ js:
+ path: "/jquery.min.js"
+ integrity: "sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk"
+
+bootstrap:
+ uri: "https://maxcdn.bootstrapcdn.com/bootstrap/"
+ version: "4.0.0-alpha.2"
+ js:
+ path: "/js/bootstrap.min.js"
+ integrity: "sha384-vZ2WRJMwsjRMW/8U7i6PWi6AlO1L79snBrmgiDpgIWJ82z8eA5lenwvxbMV1PAh7"
+ css:
+ path: "/css/bootstrap.min.css"
+ integrity: "sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd"
+
+mathjax:
+ uri: "http://cdn.mathjax.org/mathjax/"
+ version: "latest"
+ js:
+ path: "/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
+ async: true
diff --git a/_includes/external-assets-css.html b/_includes/external-assets-css.html
new file mode 100644
index 0000000000000000000000000000000000000000..4ab1e9d37d07804ca72a81ee0a398f77ca4f938c
--- /dev/null
+++ b/_includes/external-assets-css.html
@@ -0,0 +1,2 @@
+{% for asset in site.data.external_assets %}{% if asset[1].css %}<link rel="stylesheet" href="{{ asset[1].uri }}{{ asset[1].version }}{{ asset[1].css.path }}" {% if asset[1].css.integrity %}integrity="{{ asset[1].css.integrity }}" {% endif %}crossorigin="anonymous">
+{% endif %}{% endfor %}
diff --git a/_includes/external-assets-js.html b/_includes/external-assets-js.html
new file mode 100644
index 0000000000000000000000000000000000000000..171bad750670ffa9356d6571967a6a76c03ce917
--- /dev/null
+++ b/_includes/external-assets-js.html
@@ -0,0 +1,2 @@
+{% for asset in site.data.external_assets %}{% if asset[1].js %}<script src="{{ asset[1].uri }}{{ asset[1].version }}{{ asset[1].js.path }}"{% if asset[1].js.integrity %} integrity="{{ asset[1].js.integrity }}"{% endif %} crossorigin="anonymous"{% if asset[1].js.async %} async{% endif %}></script>
+{% endif %}{% endfor %}
diff --git a/_includes/footer.html b/_includes/footer.html
index de401025ac6c33140c8603b387902fd4ff441940..e827cba99e81edf9ad5fa754f7b862320d4e7b9c 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,38 +1,3 @@
<footer class="site-footer">
-{% comment %}
- <div class="wrapper">
-
- <h2 class="footer-heading">{{ site.title }}</h2>
-
- <div class="footer-col-wrapper">
- <div class="footer-col footer-col-1">
- <ul class="contact-list">
- <li>{{ site.title }}</li>
- <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
- </ul>
- </div>
-
- <div class="footer-col footer-col-2">
- <ul class="social-media-list">
- {% if site.github_username %}
- <li>
- {% include icon-github.html username=site.github_username %}
- </li>
- {% endif %}
-
- {% if site.twitter_username %}
- <li>
- {% include icon-twitter.html username=site.twitter_username %}
- </li>
- {% endif %}
- </ul>
- </div>
-
- <div class="footer-col footer-col-3">
- <p>{{ site.description }}</p>
- </div>
- </div>
-
- </div>
-{% endcomment %}
+ <p>© {{ site.time | date: "%Y" }} {{ site.copyright }}</p>
</footer>
diff --git a/_includes/head.html b/_includes/head.html
index 86c016361fd95ea33fc428a303be0552afad5a85..eb17d8125c7c3fae475ddcbf35899f4d28f1cd43 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,14 +1,14 @@
<head>
<meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
- <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="shortcut icon" href="favicon.ico">
- <script src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
+ {% include external-assets-css.html %}
+ <link rel="stylesheet" href="{{ "/css/blog.css" | prepend: site.baseurl }}">
</head>
diff --git a/_includes/header.html b/_includes/header.html
index 91485fb23bed0897a4eb9dfeec85646d2d6aaa0a..aa6a76eec3be9b79583fac39b929ef1434f888d8 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,19 +1,24 @@
-<header class="site-header">
-
- <div class="wrapper">
-
- <a href="http://www.imperial.ac.uk/" id="logo"><img src="http://www3.imperial.ac.uk/2007templates/images/logo_imperial_college_london.png" alt="Imperial College London"/></a>
- <a href="{{ site.baseurl }}/"><img id="header" src="images/wrs.png" alt="{{ site.title }}"/></a>
+<header>
+ <div class="site-masthead">
+ <div class="container">
+ <nav class="nav">
+ {% assign menu_items = site.pages | where:"menu",true %}
+ {% if menu_items.size > 1 %}
+ {% for item in menu_items %}
+ {% if item.title %}
+ <a class="nav-link {% if item.url == page.url %}active{% endif %}" href="{{ item.url | prepend: site.baseurl
+ }}">{{ item.title }}</a>
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ </nav>
+ </div>
+ </div>
- <nav>{%
- assign menu_items = site.pages | where:"menu",true %}{%
- if menu_items.size > 1 %}{%
- for item in menu_items %}{%
- if item.title %}
- <span><a class="navi" href="{{ item.url | prepend: site.baseurl }}">{{ item.title }}</a></span>
- {% endif %}{%
- endfor %}{%
- endif %}
- </nav>
+ <div class="site-header">
+ <div class="container">
+ <h1 class="site-title">{{ site.title }}</h1>
+ <p class="lead site-description">{{ site.subtitle }}</p>
+ </div>
</div>
</header>
diff --git a/_layouts/default.html b/_layouts/default.html
index 32cf6aeae05cadfab05c7d53d62c6b2ed8cbaf65..a2b09f968d81499ffd1a314f2469bce50d861b3d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,24 +1,12 @@
<!DOCTYPE html>
-<html>
-
+<html lang="en">
{% include head.html %}
-
<body>
-
- <div id="main">
-
- {% include header.html %}
-
- <div class="page-content" id="content">
- <div class="wrapper">
- {{ content }}
- </div>
- </div>
-
+ {% include header.html %}
+ <div class="container">
+ {{ content }}
</div>
-
{% include footer.html %}
-
+ {% include external-assets-js.html %}
</body>
-
</html>
diff --git a/_layouts/page.html b/_layouts/page.html
index ce233ad75bfb7966cc211c065626d880aa46ef95..87185eaf16096202ee987cabb52928f161e52ae7 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -2,9 +2,8 @@
layout: default
---
<article class="post">
-
<header class="post-header">
- <h1 class="post-title">{{ page.title }}</h1>
+ <h2 class="post-title">{{ page.title }}</h1>
</header>
<div class="post-content">
diff --git a/_layouts/publication.html b/_layouts/publication.html
new file mode 100644
index 0000000000000000000000000000000000000000..883c9bf95d0d4657e5f1eae63cdd4dab26178c92
--- /dev/null
+++ b/_layouts/publication.html
@@ -0,0 +1,11 @@
+---
+layout: page
+menu: false
+---
+<table>
+ <tr><td>Venue</td><td>{{ page.entry.booktitle }}</td></tr>
+ <tr><td>Date</td><td>{{ page.entry.year }}-{{ page.entry.month_numeric }}</td></tr>
+ <tr><td>Authors</td><td>{{ page.entry.author }}</td></tr>
+</table>
+
+{{ page.entry.abstract }}
diff --git a/css/blog.css b/css/blog.css
new file mode 100644
index 0000000000000000000000000000000000000000..5d65c2bd0d87d86c7ec2512b5abcf00d5ffc0973
--- /dev/null
+++ b/css/blog.css
@@ -0,0 +1,196 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2011-2016 Twitter, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Originally sourced from: https://raw.githubusercontent.com/twbs/bootstrap/20261385eacd6e86a362a08d56b4b4241ef248df/docs/examples/blog/blog.css
+*/
+
+/*
+ * Globals
+ */
+
+@media (min-width: 48em) {
+ html {
+ font-size: 18px;
+ }
+}
+
+body {
+ font-family: Georgia, "Times New Roman", Times, serif;
+ color: #555;
+}
+
+h1, .h1,
+h2, .h2,
+h3, .h3,
+h4, .h4,
+h5, .h5,
+h6, .h6 {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-weight: normal;
+ color: #333;
+}
+
+
+/*
+ * Override Bootstrap's default container.
+ */
+
+.container {
+ max-width: 60rem;
+}
+
+
+/*
+ * Masthead for nav
+ */
+
+.site-masthead {
+ margin-bottom: 3rem;
+ background-color: #428bca;
+ -webkit-box-shadow: inset 0 -.1rem .25rem rgba(0,0,0,.2);
+ box-shadow: inset 0 -.1rem .25rem rgba(0,0,0,.2);
+}
+
+/* Nav links */
+.nav-link {
+ position: relative;
+ padding: 1rem;
+ font-weight: 500;
+ color: #cdddeb;
+}
+.nav-link:hover,
+.nav-link:focus {
+ color: #fff;
+ background-color: transparent;
+}
+
+/* Active state gets a caret at the bottom */
+.nav-link.active {
+ color: #fff;
+}
+.nav-link.active:after {
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ width: 0;
+ height: 0;
+ margin-left: -.3rem;
+ vertical-align: middle;
+ content: "";
+ border-right: .3rem solid transparent;
+ border-bottom: .3rem solid;
+ border-left: .3rem solid transparent;
+}
+
+
+/*
+ * Blog name and description
+ */
+
+.site-header {
+ padding-bottom: 1.25rem;
+ margin-bottom: 2rem;
+ border-bottom: .05rem solid #eee;
+}
+.site-title {
+ margin-bottom: 0;
+ font-size: 2rem;
+ font-weight: normal;
+}
+.site-description {
+ font-size: 1.1rem;
+ color: #999;
+}
+
+@media (min-width: 40em) {
+ .site-title {
+ font-size: 3.5rem;
+ }
+}
+
+
+/*
+ * Main column and sidebar layout
+ */
+
+/* Sidebar modules for boxing content */
+.sidebar-module {
+ padding: 1rem;
+ /*margin: 0 -1rem 1rem;*/
+}
+.sidebar-module-inset {
+ padding: 1rem;
+ background-color: #f5f5f5;
+ border-radius: .25rem;
+}
+.sidebar-module-inset p:last-child,
+.sidebar-module-inset ul:last-child,
+.sidebar-module-inset ol:last-child {
+ margin-bottom: 0;
+}
+
+
+/* Pagination */
+.pager {
+ margin-bottom: 4rem;
+ text-align: left;
+}
+.pager > li > a {
+ width: 8rem;
+ padding: .75rem 1.25rem;
+ text-align: center;
+ border-radius: 2rem;
+}
+
+
+/*
+ * Blog posts
+ */
+
+.post {
+ margin-bottom: 4rem;
+}
+.post-title {
+ margin-bottom: .25rem;
+ font-size: 2.5rem;
+}
+.post-meta {
+ margin-bottom: 1.25rem;
+ color: #999;
+}
+
+
+/*
+ * Footer
+ */
+
+.site-footer {
+ padding: 2.5rem 0;
+ color: #999;
+ text-align: center;
+ background-color: #f9f9f9;
+ border-top: .05rem solid #e5e5e5;
+}
+.site-footer :last-child {
+ margin-bottom: 0;
+}
diff --git a/css/main.css b/css/main.css
deleted file mode 100644
index 4878b7c5d4f7619ccbee4ca126c9abf3e34d3824..0000000000000000000000000000000000000000
--- a/css/main.css
+++ /dev/null
@@ -1,67 +0,0 @@
-img {
- border-style : none
-}
-body {
- background-color : #D0D0F5 ;
- font-family : "Verdana", "Franklin Gothic Book", "Trebuchet MS", "Helvetica", "Arial", sans-serif;
- font-size : medium;
-
-}
-a:link {color:#00015F;} /* unvisited link */
-a:visited {color:#1416CC;} /* visited link */
-a:hover {color:#CC2991;} /* mouse over link */
-a:active {color:#8C3B1C;} /* selected link */
-
-td, th {
- padding:0.5em
-}
-
-h1 {color:#00015F;}
-
-#main {
- width : 800px;
- min-height : 600px;
- background-color : #FFFFFF;
- margin-left : auto;
- margin-right : auto;
-}
-
-nav {
- list-style-type:none;
- margin-top : 0.1em;
- margin-left : 2em;
- color : #D0D0F5
-}
-
-nav span::before {
- content: "[";
-}
-
-nav span::after {
- content: "]";
-}
-
-nav span a {
- width : 6em;
- padding: 0.5em;
- border-color : #D0E0E5;
-}
-
-#content {
- padding-left : 1em;
- padding-right : 1em;
- padding-bottom : 2em;
-}
-
-#logo {
- display: block;
- margin: 1.4em 0em 0em 1.7em;
- width: 16.8em;
- height: 4.4em;
- float: left
-}
-#header {
- margin-left:3em;
- margin-right:200px;
-}
-
diff --git a/papers.bib b/publications.bib
similarity index 99%
rename from papers.bib
rename to publications.bib
index ab7544c11ff8fe126430dd9fd0e9ac278e8a00ae..c7e4cc28a4fefad2b64923b567492add48d0ed7f 100644
--- a/papers.bib
+++ b/publications.bib
@@ -1,5 +1,5 @@
---
-title: Papers
+title: Publications
---
@InProceedings{Bodin2014Trusted,