make a research page happen

diff --git a/personal/_includes/menu-level.html b/personal/_includes/menu-level.html
index 7e4e5ef38da33c662ca6893bf5de87a4b26c1e83..28b45c79b2eb5233540d20e4e194eb1bef175129 100644 (file)
--- a/personal/_includes/menu-level.html
+++ b/personal/_includes/menu-level.html
@@ -1,5 +1,5 @@
 <ul><!--{% for item in include.menu %}
-    --><li class="{{ item.class }}"><a class="{{ item.class }}" href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a></li><!--
+    --><li class="{{ item.class }}"><a class="{{ item.class }}" href="{{ site.baseurl }}{{ item.url | replace: '/index.html','/' }}">{{ item.title }}</a></li><!--
     {% if item.sub %}
         --><li class="sub">{% include menu-level.html menu=item.sub %}</li><!--
     {% endif %}

diff --git a/personal/_layouts/default.html b/personal/_layouts/default.html
index 797739c84af2e5e1ac636f24d4e8452ea57b3c75..897abcc9100ff63e60fbaade038744b3981cd08e 100644 (file)
--- a/personal/_layouts/default.html
+++ b/personal/_layouts/default.html
@@ -13,7 +13,7 @@
     {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | newline_to_br | replace:'<br />',' ' | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
 
     <link rel="stylesheet" href="{{ site.baseurl }}/style.css">
-    <link rel="canonical" href="{{ site.url }}{{ site.baseurl }}{{ page.url | replace:'index.html','' }}">
+    <link rel="canonical" href="{{ site.url }}{{ site.baseurl }}{{ page.url | replace:'/index.html','/' }}">
     {% if page.rss %}<link rel="alternate" type="application/rss+xml" title="{{ site.blog.title }}" href="{{ site.baseurl }}/blog/feed.xml" />{% endif %}
   </head>
 

diff --git a/personal/_plugins/readmes.rb b/personal/_plugins/readmes.rb
index 4360d767b1a93f3589a7f78e451fdc7dc4e1f3d6..922d3a896566d0ff2441fc15e0f180b20d7011f1 100644 (file)
--- a/personal/_plugins/readmes.rb
+++ b/personal/_plugins/readmes.rb
@@ -28,6 +28,7 @@ module Jekyll
 
     def generate(site)
       readmes = site.config['readmes']
+      return if readmes.nil?
       base = readmes['src_base']
       dir = readmes['out_base']
       idx = 0

diff --git a/personal/index.html b/personal/index.html
index 2723a69e53bdc2dc7bd1cc2b2ea15d4dba2e68c0..e9738c7e113f3d78e70d95d507212d1d17d68be3 100644 (file)
--- a/personal/index.html
+++ b/personal/index.html
@@ -1,5 +1,5 @@
 ---
-title: Ralf Jung
+title: ralfj.de
 ---
 
 <h2>Welcome</h2>

diff --git a/research/_config.yml b/research/_config.yml
new file mode 100644 (file)
index 0000000..868f8be
--- /dev/null
+++ b/research/_config.yml
@@ -0,0 +1,14 @@
+# Site settings
+baseurl: "/~jung"
+url: "https://www.mpi-sws.org"
+timezone: "Europe/Berlin"
+
+defaults:
+  - scope:
+        path: "" # all files in the project
+    values:
+        layout: "default"
+
+# Build settings
+markdown: kramdown
+exclude: ['*.sh']

diff --git a/research/_includes b/research/_includes
new file mode 120000 (symlink)
index 0000000..5b818c7
--- /dev/null
+++ b/research/_includes
@@ -0,0 +1 @@
+../personal/_includes
\ No newline at end of file

diff --git a/research/_layouts b/research/_layouts
new file mode 120000 (symlink)
index 0000000..e779e9d
--- /dev/null
+++ b/research/_layouts
@@ -0,0 +1 @@
+../personal/_layouts
\ No newline at end of file

diff --git a/research/_plugins b/research/_plugins
new file mode 120000 (symlink)
index 0000000..28c4700
--- /dev/null
+++ b/research/_plugins
@@ -0,0 +1 @@
+../personal/_plugins
\ No newline at end of file

diff --git a/research/contact.html b/research/contact.html
new file mode 100644 (file)
index 0000000..e3e0052
--- /dev/null
+++ b/research/contact.html
@@ -0,0 +1,21 @@
+---
+title: Contact
+sort: 2
+---
+
+<h3>E-Mail Address</h3>
+
+<p>jung AT mpi-sws DOT org</p>
+
+<h3>Phone Number</h3>
+
+<p>+49 (681) 9303 8717</p>
+
+<h3>Work Address</h3>
+
+<p>
+Room 438<br/>
+MPI-SWS (Campus E1.5)<br/>
+66123 Saarbr&uuml;cken<br/>
+Germany 
+</p>

diff --git a/research/index.html b/research/index.html
index af9a103ec300fdbb572337ee209b2a088e49b807..fbbc7b37b288a6795d9750b30bf971eec0d23c79 100644 (file)
--- a/research/index.html
+++ b/research/index.html
@@ -1,7 +1,5 @@
 ---
-title: Research
-absolute_urls: true
-hide: true
+title: Ralf Jung
 ---
 
 <div style="float:right; margin-left:0.8em; margin-bottom: 0.3em"><img src="me.jpg"></div>
@@ -16,47 +14,3 @@ hide: true
 This goes hand-in-hand with my pursuit of defending our privacy rights and our freedom in the digital world.
 See my <a href="https://www.ralfj.de">personal website</a> for more information.</p>
 
-<h2 style="clear:both;">Thesis, Publications, Workshop Submissions</h2>
-
-<h4>2015</h4>
-
-<ul><li>
-  <b>Unifying Worlds and Resources</b><br/>
-  Ralf Jung, Derek Dreyer<br>
-  In HOPE 2015: 4th ACM SIGPLAN Workshop on Higher-Order Programming with Effects<br>
-  [<a href="https://www.youtube.com/watch?v=9Dyna88piek&amp;list=PLnqUlCo055hX6SsmMr1AmW6quMjvdMPvK&amp;index=10" target="_blank">talk</a>] [<a href="iris/talk-hope2015.pdf">talk (slides)</a>]
-</li></ul>
-
-<ul><li>
-  <b>Iris: Monoids and Invariants as an Orthogonal Basis for Concurrent Reasoning</b><br/>
-  Ralf Jung, David Swasey, Filip Sieczkowski, Kasper Svendsen, Aaron Turon, Lars Birkedal, Derek Dreyer<br>
-  In POPL 2015: 42nd ACM SIGPLAN-SIGACT Symposium on Principles of Programming Languages<br>
-  [<a href="http://plv.mpi-sws.org/iris/">website</a>] [<a href="http://plv.mpi-sws.org/iris/paper.pdf">paper</a>] [<a href="http://plv.mpi-sws.org/iris/appendix.pdf">appendix</a>] [<a href="http://plv.mpi-sws.org/iris/distrib/iris-20141024.zip">coq</a>] [<a href="iris/talk-popl2015.pdf">talk (slides)</a>]
-</li></ul>
-
-<h4>2013</h4>
-<ul><li>
-  <b>An Intermediate Language To Formally Justify Memory Access Reordering</b> (Bachelor's Thesis)<br/>
-  Ralf Jung, Supervisor: Sebastian Hack, Advisor: Sigurd Schneider<br>
-  [<a href="bachelor/bachelor.pdf">pdf</a>] [<a href="bachelor/bachelor-talk.pdf">slides</a>] [<a href="bachelor/bachelor.zip">coq</a>]
-</li></ul>
-</p>
-
-<h2>Contact</h2>
-
-<h4>E-Mail Address</h4>
-
-<p>jung AT mpi-sws DOT org</p>
-
-<h4>Phone Number</h4>
-
-<p>+49 (681) 9303 8717</p>
-
-<h4>Work Address</h4>
-
-<p>
-Room 438<br/>
-MPI-SWS (Campus E1.5)<br/>
-66123 Saarbr&uuml;cken<br/>
-Germany 
-</p>

diff --git a/research/me.jpg b/research/me.jpg
new file mode 100644 (file)
index 0000000..f9c3fc7
Binary files /dev/null and b/research/me.jpg differ

diff --git a/research/publications.html b/research/publications.html
new file mode 100644 (file)
index 0000000..0bba96c
--- /dev/null
+++ b/research/publications.html
@@ -0,0 +1,28 @@
+---
+title: Thesis, Publications, Workshop Submissions
+slug: Publications
+---
+
+<h3>2015</h3>
+
+<ul><li>
+  <b>Unifying Worlds and Resources</b><br/>
+  Ralf Jung, Derek Dreyer<br>
+  In HOPE 2015: 4th ACM SIGPLAN Workshop on Higher-Order Programming with Effects<br>
+  [<a href="https://www.youtube.com/watch?v=9Dyna88piek&amp;list=PLnqUlCo055hX6SsmMr1AmW6quMjvdMPvK&amp;index=10" target="_blank">talk</a>] [<a href="iris/talk-hope2015.pdf">talk (slides)</a>]
+</li></ul>
+
+<ul><li>
+  <b>Iris: Monoids and Invariants as an Orthogonal Basis for Concurrent Reasoning</b><br/>
+  Ralf Jung, David Swasey, Filip Sieczkowski, Kasper Svendsen, Aaron Turon, Lars Birkedal, Derek Dreyer<br>
+  In POPL 2015: 42nd ACM SIGPLAN-SIGACT Symposium on Principles of Programming Languages<br>
+  [<a href="http://plv.mpi-sws.org/iris/">website</a>] [<a href="http://plv.mpi-sws.org/iris/paper.pdf">paper</a>] [<a href="http://plv.mpi-sws.org/iris/appendix.pdf">appendix</a>] [<a href="http://plv.mpi-sws.org/iris/distrib/iris-20141024.zip">coq</a>] [<a href="iris/talk-popl2015.pdf">talk (slides)</a>]
+</li></ul>
+
+<h3>2013</h3>
+<ul><li>
+  <b>An Intermediate Language To Formally Justify Memory Access Reordering</b> (Bachelor's Thesis)<br/>
+  Ralf Jung, Supervisor: Sebastian Hack, Advisor: Sigurd Schneider<br>
+  [<a href="bachelor/bachelor.pdf">pdf</a>] [<a href="bachelor/bachelor-talk.pdf">slides</a>] [<a href="bachelor/bachelor.zip">coq</a>]
+</li></ul>
+</p>

diff --git a/research/style.scss b/research/style.scss
new file mode 120000 (symlink)
index 0000000..74a641e
--- /dev/null
+++ b/research/style.scss
@@ -0,0 +1 @@
+../personal/style.scss
\ No newline at end of file

diff --git a/research/upload.sh b/research/upload.sh
new file mode 100755 (executable)
index 0000000..3a528b5
--- /dev/null
+++ b/research/upload.sh
@@ -0,0 +1,6 @@
+#/bin/bash
+cd "$(dirname "$0")"
+
+jekyll build
+cd _site
+rsync ./ mpi-contact:public_html/ -aP