Normalize template paths

14 files changed, 14 insertions, 14 deletions

diff --git a/lib/generate/page/index.js b/lib/generate/page/index.js
index 068358c..8e44187 100644
--- a/lib/generate/page/index.js
+++ b/lib/generate/page/index.js
@@ -21,10 +21,10 @@ util.inherits(Generator, BaseGenerator);
 
 Generator.prototype.loadTemplates = function() {
     this.template = swig.compileFile(
-        this.plugins.template("page") || path.resolve(this.options.theme, 'templates/page/page.html')
+        this.plugins.template("ebook:page") || path.resolve(this.options.theme, 'templates/ebook/page.html')
     );
     this.summaryTemplate = swig.compileFile(
-        this.plugins.template("page/sumary") || path.resolve(this.options.theme, 'templates/page/summary.html')
+        this.plugins.template("ebook:sumary") || path.resolve(this.options.theme, 'templates/ebook/summary.html')
     );
 };
 
diff --git a/lib/generate/site/index.js b/lib/generate/site/index.js
index 6d86c7c..a62108b 100644
--- a/lib/generate/site/index.js
+++ b/lib/generate/site/index.js
@@ -36,13 +36,13 @@ Generator.prototype.load = function() {
 // Load all templates
 Generator.prototype.loadTemplates = function() {
     this.template = swig.compileFile(
-        this.plugins.template("site") || path.resolve(this.options.theme, 'templates/site.html')
+        this.plugins.template("site:page") || path.resolve(this.options.theme, 'templates/book/page.html')
     );
     this.langsTemplate = swig.compileFile(
-        this.plugins.template("langs") || path.resolve(this.options.theme, 'templates/langs.html')
+        this.plugins.template("site:langs") || path.resolve(this.options.theme, 'templates/book/langs.html')
     );
     this.glossaryTemplate = swig.compileFile(
-        this.plugins.template("glossary") || path.resolve(this.options.theme, 'templates/glossary.html')
+        this.plugins.template("site:glossary") || path.resolve(this.options.theme, 'templates/book/glossary.html')
     );
 };
 
diff --git a/theme/templates/glossary.html b/theme/templates/book/glossary.html
index 424a920..4d9683f 100644
--- a/theme/templates/glossary.html
+++ b/theme/templates/book/glossary.html
@@ -1,4 +1,4 @@
-{% extends "site.html" %}
+{% extends "page.html" %}
 
 {% block title %}Glossary | {{ title }}{% endblock %}
 
diff --git a/theme/templates/includes/book/exercise.html b/theme/templates/book/includes/exercise.html
index 42b500f..42b500f 100644
--- a/theme/templates/includes/book/exercise.html
+++ b/theme/templates/book/includes/exercise.html
diff --git a/theme/templates/includes/book/font-settings.html b/theme/templates/book/includes/font-settings.html
index 5fa1f3e..5fa1f3e 100644
--- a/theme/templates/includes/book/font-settings.html
+++ b/theme/templates/book/includes/font-settings.html
diff --git a/theme/templates/includes/book/header.html b/theme/templates/book/includes/header.html
index ef2de60..ef2de60 100644
--- a/theme/templates/includes/book/header.html
+++ b/theme/templates/book/includes/header.html
diff --git a/theme/templates/includes/book/quiz.html b/theme/templates/book/includes/quiz.html
index 425fa39..425fa39 100644
--- a/theme/templates/includes/book/quiz.html
+++ b/theme/templates/book/includes/quiz.html
diff --git a/theme/templates/includes/book/summary.html b/theme/templates/book/includes/summary.html
index 8f6e4c8..8f6e4c8 100644
--- a/theme/templates/includes/book/summary.html
+++ b/theme/templates/book/includes/summary.html
diff --git a/theme/templates/langs.html b/theme/templates/book/langs.html
index dd8c96b..49878ae 100755
--- a/theme/templates/langs.html
+++ b/theme/templates/book/langs.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "../layout.html" %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/theme/templates/site.html b/theme/templates/book/page.html
index c0b4183..d1379a2 100644
--- a/theme/templates/site.html
+++ b/theme/templates/book/page.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "../layout.html" %}
 
 {% block head %}
     {% parent %}
@@ -15,10 +15,10 @@
 
 {% block content %}
     <div class="book" data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
-    {% include "includes/book/summary.html" %}
+    {% include "includes/summary.html" %}
     <div class="book-body">
         <div class="body-inner">
-            {% include "includes/book/header.html" %}
+            {% include "includes/header.html" %}
             <div class="page-wrapper" tabindex="-1">
                 <div class="page-inner">
                 {% block page_inner %}
@@ -27,9 +27,9 @@
                     {% if section.type == "normal" %}
                         {% autoescape false %}{{ section.content }}{% endautoescape %}
                     {% elif section.type == "exercise" %}
-                        {% include "./includes/book/exercise.html" with {section: section} %}
+                        {% include "./includes/exercise.html" with {section: section} %}
                     {% elif section.type == "quiz" %}
-                        {% include "./includes/book/quiz.html" with {section: section} %}
+                        {% include "./includes/quiz.html" with {section: section} %}
                     {% endif %}
                     </section>
                 {% endfor %}
diff --git a/theme/templates/includes/page/exercise.html b/theme/templates/ebook/includes/exercise.html
index 96a2c0a..96a2c0a 100644
--- a/theme/templates/includes/page/exercise.html
+++ b/theme/templates/ebook/includes/exercise.html
diff --git a/theme/templates/includes/page/quiz.html b/theme/templates/ebook/includes/quiz.html
index ada363c..ada363c 100644
--- a/theme/templates/includes/page/quiz.html
+++ b/theme/templates/ebook/includes/quiz.html
diff --git a/theme/templates/page/page.html b/theme/templates/ebook/page.html
index dbead6e..417ba0a 100644
--- a/theme/templates/page/page.html
+++ b/theme/templates/ebook/page.html
@@ -21,9 +21,9 @@
         {% if section.type == "normal" %}
             {% autoescape false %}{{ section.content }}{% endautoescape %}
         {% elif section.type == "exercise" %}
-            {% include "./includes/page/exercise.html" with {section: section} %}
+            {% include "./includes/exercise.html" with {section: section} %}
         {% elif section.type == "quiz" %}
-            {% include "./includes/page/quiz.html" with {section: section} %}
+            {% include "./includes/quiz.html" with {section: section} %}
         {% endif %}
         </section>
     {% endfor %}
diff --git a/theme/templates/page/summary.html b/theme/templates/ebook/summary.html
index 8bc4d7d..8bc4d7d 100644
--- a/theme/templates/page/summary.html
+++ b/theme/templates/ebook/summary.html