Merge branch 'www/template' of vimuser/libreboot into master

10 files changed, 106 insertions, 21 deletions

diff --git a/www/amd-libre.md b/www/amd-libre.md
index 62302eb9..13c3b90f 100644
--- a/www/amd-libre.md
+++ b/www/amd-libre.md
@@ -128,4 +128,3 @@ companies that care about software freedom.
 We in the Libreboot project are available to contact, using the details
 on the homepage. We look forward to working with AMD :)
 
-
diff --git a/www/contrib.md b/www/contrib.md
index 84ac12ac..e473f330 100644
--- a/www/contrib.md
+++ b/www/contrib.md
@@ -2,7 +2,6 @@
 title: Contributors
 ...
 
-
 If we forgot to mention you here, let us know and we'll add you. (or if
 you don't want to be mentioned, let us know and we'll remove your
 entry)
diff --git a/www/faq.md b/www/faq.md
index b2a9f239..b460f908 100644
--- a/www/faq.md
+++ b/www/faq.md
@@ -838,7 +838,6 @@ many HDDs (a few high-end ones can use more bandwidth than USB 2.0 is
 capable of), but for SSDs it might be problematic (unless you're using
 USB 3.0, which is not yet usable in freedom. See
 
-
 Use of USB is also not an absolute guarantee of safety, so do beware.
 The attack surface becomes much smaller, but a malicious drive could
 still attempt a "fuzzing" attack (e.g. sending malformed USB
diff --git a/www/git.md b/www/git.md
index ba368f8b..a5f81dbb 100644
--- a/www/git.md
+++ b/www/git.md
@@ -125,7 +125,6 @@ information on which commits in what branch contain your changes.
 **Check [\#githosting](#githosting), for a list of Git hosting providers
 that we recommend.**
 
-
 List of recommended Git hosting providers 
 -----------------------------------------
 
diff --git a/www/gpg.md b/www/gpg.md
index 34453364..9e2a30d6 100644
--- a/www/gpg.md
+++ b/www/gpg.md
@@ -4,11 +4,9 @@ title: GPG
 
     $ gpg --recv-keys
 
-
 The GPG key can also be downloaded with this exported dump of the
 pubkey: [lbkey.asc](lbkey.asc).
 
-
     $ sha512sum -c sha512sum.txt
     $ gpg --verify sha512sum.txt.sig
 
diff --git a/www/license.md b/www/license.md
index 2c904c10..eecf1c2f 100644
--- a/www/license.md
+++ b/www/license.md
@@ -1,3 +1,4 @@
+Website:
 
 Copyright 2015-2017 Leah Rowe <info@minifree.org>       \
 Copyright 2017 Alyssa Rosenzweig <alyssa@rosenzweig.io> 
@@ -9,3 +10,36 @@ can be found at "cc-by-sa-4.txt".
 This document is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See cc-by-sa-4.txt for more information.
+
+Template:
+
+Copyright (c) 2014--2017, John MacFarlane
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+Neither the name of John MacFarlane nor the names of other
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/www/lists.md b/www/lists.md
index 3c25c6fd..adb9c2a6 100644
--- a/www/lists.md
+++ b/www/lists.md
@@ -31,4 +31,3 @@ Backup of old Libreboot mailing lists
 -   [Developer mailing list (mbox
     format)](old/libreboot-dev/mbox/lists.gnu.org/libreboot-dev/)
 
-
diff --git a/www/logo-info.md b/www/logo-info.md
index 1cc9c8a9..30f80250 100644
--- a/www/logo-info.md
+++ b/www/logo-info.md
@@ -2,7 +2,6 @@
 title: Logo Info
 ...
 
-
 ![Standard Logo](logo/logo.png) The Libreboot logo is available as a
 [bitmap](logo/logo.png), a [vector](logo/logo.svg), or a [greyscale
 vector](logo/logo_grey.svg).
diff --git a/www/publish.sh b/www/publish.sh
index dadb83e0..f1858fe1 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -3,22 +3,13 @@
 echo $1
 FILE=${1%.md}
 
-# get title block
-head -n 4 $FILE.md > temp.md
-
 # if not homepage, add a link back to the homepage
 if [ "${FILE}" != "./index" ]; then
-	printf "[Go back to homepage](/index.md)\n\n" >> temp.md
+        RETURN="<p><a href='/index.md'>Go back to homepage</a></p>"
 fi
 
-# read rest of file
-tail -n +5 $FILE.md >> temp.md
-
-# add license notice where applicable
-# TODO: make this less intrusive
-#if [[ ${FILE} != "docs*" ]] ; then
-#    cat license.md >> temp.md
-#fi
+cat $1 > temp.md
+echo "[License](license.md)" >> temp.md
 
 # change out .md -> .html
 sed temp.md -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g'
@@ -30,4 +21,5 @@ TOC=$(grep -q "^x-toc-enable: true$" temp.md && echo "--toc")
 SMART=$(pandoc -v | grep -q '2\.0' || echo "--smart")
 
 # chuck through pandoc
-pandoc $SMART temp.md -s --css /global.css --section-divs -T Libreboot $TOC > $FILE.html
+pandoc $SMART temp.md -s --css /global.css --section-divs -T Libreboot $TOC \
+       --template=template.html --metadata "return=$RETURN" > $FILE.html
diff --git a/www/template.html b/www/template.html
new file mode 100644
index 00000000..2fc9b28d
--- /dev/null
+++ b/www/template.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
+<head>
+  <meta charset="utf-8">
+  <meta name="generator" content="pandoc">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+$for(author-meta)$
+  <meta name="author" content="$author-meta$">
+$endfor$
+$if(date-meta)$
+  <meta name="dcterms.date" content="$date-meta$">
+$endif$
+$if(keywords)$
+  <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
+$endif$
+  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
+  <style type="text/css">code{white-space: pre;}</style>
+$if(quotes)$
+  <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
+$endif$
+$if(highlighting-css)$
+  <style type="text/css">
+$highlighting-css$
+  </style>
+$endif$
+$for(css)$
+  <link rel="stylesheet" href="$css$">
+$endfor$
+$if(math)$
+  $math$
+$endif$
+$for(header-includes)$
+  $header-includes$
+$endfor$
+</head>
+<body>
+$for(include-before)$
+$include-before$
+$endfor$
+$if(title)$
+<header>
+<h1 class="title">$title$</h1>
+$if(subtitle)$
+<p class="subtitle">$subtitle$</p>
+$endif$
+$for(author)$
+<p class="author">$author$</p>
+$endfor$
+$if(date)$
+<p class="date">$date$</p>
+$endif$
+</header>
+$endif$
+$if(return)$
+$return$
+$endif$
+$if(toc)$
+<nav id="$idprefix$TOC">
+$toc$
+</nav>
+$endif$
+$body$
+$for(include-after)$
+$include-after$
+$endfor$
+</body>
+</html>