Merge branch 'master' of https://github.com/academicpages/academicpages.github.io

Author: staeiou

_includes/archive-single.html

@@ -39,19 +39,19 @@ <h2 class="archive__item-title" itemprop="headline">
     {% endif %}
 
     {% if post.venue %}
-      <p>Published in <i>{{ post.venue }}</i>, {{ post.date | date '%Y' }} </p>
-    {% endif %}
-
-    {% if post.paperurl %}
-      <p>Download <a href=" {{ post.paperurl }} "><u>here</u></a></p>
+      <p>Published in <i>{{ post.venue }}</i>, {{ post.date | date: "%Y" }} </p>
     {% endif %}
 
     {% if post.excerpt %}
-    <p class="archive__item-excerpt" itemprop="description">Description: {{ post.excerpt | markdownify }}</p>
+    <p class="archive__item-excerpt" itemprop="description">{{ post.excerpt | markdownify }}</p>
     {% endif %}
 
-    {% if post.citation %}
-      <p>Recommended citation: {{ post.citation }}</p>
+    {% if post.citation and post.paperurl %}
+      <p>Recommended citation: {{ post.citation }} <a href="{{ post.paperurl }}"><u>{{ post.paperurl }}</u></a></p>
+    {% elsif post.citation %}
+      <p>Recommended citation: {{ post.citation }} </p>
+    {% elsif post.paperurl %}
+      <p>Download <a href=" {{ post.paperurl }} "><u>here</u></a></p>
     {% endif %}
 
   </article>

_includes/footer.html

@@ -21,4 +21,4 @@
   </ul>
 </div>
 
-<div class="page__footer-copyright">&copy; {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by | default: "Powered by" }} <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
+<div class="page__footer-copyright">&copy; {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by | default: "Powered by" }} <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://github.com/academicpages/academicpages.github.io">AcademicPages</a>, a fork of <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>

_pages/about.md

@@ -10,4 +10,8 @@ redirect_from:
 
 This is the front page of your Github pages website!
 
-You can use all kinds of markdown. See [the markdown guide](/markdown/).
+You can use all kinds of markdown. See [the guide](/markdown/).
+
+## Images
+![alt text](/images/500x300.png "Logo Title Text 1")
+

_pages/markdown.md

@@ -7,13 +7,22 @@ redirect_from:
   - /markdown.html
 ---
 
-# Jekyll / theme guide
+## Locations of key files/directories
 
 * Basic config options: _config.yml
 * Top navigation bar config: _data/navigation.yml
-*
-
-# Tips and hints
+* Single pages: _pages/
+* Collections of pages are .md or .html files in:
+  * _publications/
+  * _portfolio/
+  * _posts/
+  * _teaching/
+  * _talks/
+* Footer: _includes/footer.html
+* Static files (like PDFs): /files/
+* Profile image (can set in _config.yml): images/profile.png
+
+## Tips and hints
 
 * Name a file ".md" to have it render in markdown, name it ".html" to render in HTML.
 * Go to the [commit list](https://github.com/academicpages/academicpages.github.io/commits/master) (on your repo) to find the last version Github built with Jekyll. 
@@ -22,10 +31,10 @@ redirect_from:
   * Red X: error
   * No icon: not built
 
+## Resources
+ * [Liquid syntax guide](https://shopify.github.io/liquid/tags/control-flow/)
 
-# Markdown guide
-
-## Header two
+## Markdown guide
 
 ### Header three
 

_publications/2009-10-01-paper-title-number-1.md

@@ -6,5 +6,5 @@ venue: "Journal 1"
 excerpt: 'This paper is about the number 1. The number 2 is left for future work.'
 date: 2009-10-01
 paperurl: http://academicpages.github.io/files/paper1.pdf
-citation: 'Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). http://academicpages.github.io/files/paper1.pdf'
+citation: 'Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1).'
 ---

_publications/2010-10-01-paper-title-number-2.md

@@ -6,7 +6,7 @@ venue: "Journal 1"
 excerpt: 'This paper is about the number 2. The number 3 is left for future work.'
 date: 2010-10-01
 paperurl: http://academicpages.github.io/files/paper2.pdf
-citation: 'Your Name, You. (2010). "Paper Title Number 2." <i>Journal 1</i>. 1(2). http://academicpages.github.io/files/paper2.pdf'
+citation: 'Your Name, You. (2010). "Paper Title Number 2." <i>Journal 1</i>. 1(2).'
 ---
 
 This is where you put in an abstract, the full text of the paper, or both! This text will appear below some of the metadata. You can use markdown in this, like any posts.

_publications/2015-10-01-paper-title-number-3.md

@@ -6,7 +6,7 @@ venue: "Journal 1"
 excerpt: 'This paper is about the number 3. The number 4 is left for future work.'
 date: 2015-10-01
 paperurl: http://academicpages.github.io/files/paper3.pdf
-citation: 'Your Name, You. (2015). "Paper Title Number 3." <i>Journal 1</i>. 1(3). http://academicpages.github.io/files/paper3.pdf'
+citation: 'Your Name, You. (2015). "Paper Title Number 3." <i>Journal 1</i>. 1(3).'
 ---
 
 This is where you put in an abstract, the full text of the paper, or both! This text will appear below some of the metadata. You can use markdown in this, like any posts.