Merge remote-tracking branch 'upstream/master' into ref_links

1 files changed, 20 insertions, 3 deletions

diff --git a/theme/templates/site.html b/theme/templates/site.html
index b0a2ba4..6fcbebd 100644
--- a/theme/templates/site.html
+++ b/theme/templates/site.html
@@ -1,7 +1,23 @@
 {% extends "layout.html" %}
 
 {% block htmlTag %}{% if options.cache !== false %}manifest="{{ basePath }}/manifest.appcache"{% endif %}{% endblock %}
-{% block title %}{{ progress.current.title }}{% parent %}{% endblock %}
+
+{% block head %}
+    {% parent %}
+    {% if githubAuthor %}
+    <meta name="author" content="{{ githubAuthor }}">
+    {% endif %}
+    {% if progress.current.next and progress.current.next.path %}
+    <link rel="next" href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" />
+    {% endif %}
+    {% if progress.current.prev and progress.current.prev.path %}
+    <link rel="prev" href="{{ basePath }}/{{ progress.current.prev.path|mdLink }}" />
+    {% endif %}
+{% endblock %}
+
+{% block title %}{{ progress.current.title }} | {{ title }}{% endblock %}
+{% block description %}{% if progress.current.level == "0" %}{{ description }}{% endif %}{% endblock %}
+
 {% block content %}
     <div class="book" {% if githubId %}data-github="{{ githubId }}"{% endif %} data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
     {% include "includes/book/header.html" %}
@@ -38,7 +54,8 @@
 {% endblock %}
 
 {% block javascript %}
-{% parent %}
+<script src="{{ staticBase }}/jsrepl/jsrepl.js" id="jsrepl-script"></script>
+<script src="{{ staticBase }}/app.js"></script>
 {% for resource in plugins.resources.js %}
     {% if resource.url %}
     <script src="{{ resource.url }}"></script>
@@ -55,7 +72,7 @@ require(["gitbook"], function(gitbook) {
 {% endblock %}
 
 {% block style %}
-{% parent %}
+<link rel="stylesheet" href="{{ staticBase }}/style.css">
 {% for resource in plugins.resources.css %}
     {% if resource.url %}
     <link rel="stylesheet" href="{{ resource.url }}">