Merge branch 'gh-pages' of github.com:swcarpentry/lesson-template int…

…o gh-pages

.mailmap

@@ -0,0 +1,6 @@
+Andy Boughton <[email protected]> <[email protected]>
+Greg Wilson <[email protected]> <[email protected]>
+Abigail Cabunoc <[email protected]> <[email protected]>
+Francois Michonneau <[email protected]> <[email protected]>
+Raniere Silva <[email protected]> <[email protected]>
+Michael Jackson <[email protected]>

.update-copyright.conf

@@ -0,0 +1,6 @@
+[project]
+vcs: Git
+
+[files]
+authors: yes
+files: no

AUTHORS

@@ -0,0 +1,17 @@
+lesson-template was written by:
+Aaron O'Leary <[email protected]>
+Abigail Cabunoc <[email protected]>
+Andy Boughton <[email protected]>
+Bill Mills <[email protected]>
+Francois Michonneau <[email protected]>
+Greg Wilson <[email protected]>
+James Allen <[email protected]>
+John Blischak <[email protected]>
+Jon Pipitone <[email protected]>
+Michael Hansen <[email protected]>
+Piotr Banaszkiewicz <[email protected]>
+Raniere Silva <[email protected]>
+Rémi Emonet <[email protected]>
+Timothée Poisot <[email protected]>
+Trevor Bekolay <[email protected]>
+W. Trevor King <[email protected]>

Makefile

@@ -44,25 +44,20 @@ clean :
 ## preview  : Build website locally for checking.
 preview : $(DST_ALL)
 
-# Pattern for slides (different parameters and template).
-motivation.html : motivation.md _layouts/slides.revealjs Makefile
-	${PANDOC} -s -t revealjs --slide-level 2 \
-	    ${PANDOC_FLAGS} \
-	    --template=_layouts/slides \
-	    -o $@ $<
-
 # Pattern to build a generic page.
 %.html : %.md _layouts/page.html $(FILTERS)
 	${PANDOC} -s -t html \
 	    ${PANDOC_FLAGS} \
+	    --mathjax \
 	    --template=_layouts/page \
 	    --filter=tools/filters/blockquote2div.py \
 	    --filter=tools/filters/id4glossary.py \
 	    $(INCLUDES) \
 	    -o $@ $<
 
 # Pattern to convert R Markdown to Markdown.
-%.md: %.Rmd $(R_CHUNK_OPTS)
+%.md: %.Rmd $(R_CHUNK_OPTS) tools/check_knitr_version.R
+	Rscript -e "source('tools/check_knitr_version.R')"
 	Rscript -e "knitr::knit('$$(basename $<)', output = '$$(basename $@)')"
 
 ## commands : Display available commands.

_includes/javascript.html

@@ -1,3 +1,14 @@
 <!-- Javascript placed at the end of the document so the pages load faster -->
 <script src="http://software-carpentry.org/v5/js/jquery-1.9.1.min.js"></script>
 <script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>
+<script src='https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-37305346-2', 'auto');
+  ga('send', 'pageview');
+
+</script>

_layouts/page.html

@@ -12,8 +12,12 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
+          $if(subtitle)$
+          <a href="index.html"><h1 class="title">$title$</h1></a>
+          <h2 class="subtitle">$subtitle$</h2>
+          $else$
           <h1 class="title">$title$</h1>
-          $if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$
+          $endif$
 $body$
         </div>
       </div>