From 33e32b20d997d688ebb231b92b4e7e1423c2aeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samy=20Pess=C3=A9?= Date: Tue, 20 Jan 2015 11:32:11 +0100 Subject: [PATCH] Use latest version fo theme --- theme/templates/ebook/glossary.html | 2 +- theme/templates/ebook/page.html | 19 ++++++++++------- theme/templates/ebook/summary.html | 13 +----------- .../templates/{book => website}/glossary.html | 0 .../{book => website}/includes/exercise.html | 0 .../includes/font-settings.html | 0 .../{book => website}/includes/header.html | 0 .../{book => website}/includes/quiz.html | 0 .../{book => website}/includes/summary.html | 2 +- theme/templates/{book => website}/langs.html | 2 +- theme/templates/{ => website}/layout.html | 0 theme/templates/{book => website}/page.html | 21 +++++++++++-------- 12 files changed, 27 insertions(+), 32 deletions(-) rename theme/templates/{book => website}/glossary.html (100%) rename theme/templates/{book => website}/includes/exercise.html (100%) rename theme/templates/{book => website}/includes/font-settings.html (100%) rename theme/templates/{book => website}/includes/header.html (100%) rename theme/templates/{book => website}/includes/quiz.html (100%) rename theme/templates/{book => website}/includes/summary.html (95%) rename theme/templates/{book => website}/langs.html (94%) rename theme/templates/{ => website}/layout.html (100%) mode change 100755 => 100644 rename theme/templates/{book => website}/page.html (86%) diff --git a/theme/templates/ebook/glossary.html b/theme/templates/ebook/glossary.html index 8076c4d8c..ce10c637f 100644 --- a/theme/templates/ebook/glossary.html +++ b/theme/templates/ebook/glossary.html @@ -1,4 +1,4 @@ -{% extends "./layout.html" %} +{% extends "./page.html" %} {% block title %}Glossary | {{ title }}{% endblock %} diff --git a/theme/templates/ebook/page.html b/theme/templates/ebook/page.html index 9ce7c1b54..3af7970cb 100644 --- a/theme/templates/ebook/page.html +++ b/theme/templates/ebook/page.html @@ -3,14 +3,17 @@ {% block title %}{{ progress.current.title }} | {{ title }}{% endblock %} {% block style %} - -{% for resource in plugins.resources.css %} - {% if resource.url %} - - {% else %} - - {% endif %} -{% endfor %} + + {% for resource in plugins.resources.css %} + {% if resource.url %} + + {% else %} + + {% endif %} + {% endfor %} + {% for style in styles %} + + {% endfor %} {% endblock %} {% block content %} diff --git a/theme/templates/ebook/summary.html b/theme/templates/ebook/summary.html index dfbba2cdc..ab4b78fb1 100644 --- a/theme/templates/ebook/summary.html +++ b/theme/templates/ebook/summary.html @@ -1,18 +1,7 @@ -{% extends "./layout.html" %} +{% extends "./page.html" %} {% block title %}Table of Contents | {{ title }}{% endblock %} -{% block style %} - -{% for resource in plugins.resources.css %} - {% if resource.url %} - - {% else %} - - {% endif %} -{% endfor %} -{% endblock %} - {% macro articles(_articles) %} {% for item in _articles %} {% set externalLink = item.path|isExternalLink %} diff --git a/theme/templates/book/glossary.html b/theme/templates/website/glossary.html similarity index 100% rename from theme/templates/book/glossary.html rename to theme/templates/website/glossary.html diff --git a/theme/templates/book/includes/exercise.html b/theme/templates/website/includes/exercise.html similarity index 100% rename from theme/templates/book/includes/exercise.html rename to theme/templates/website/includes/exercise.html diff --git a/theme/templates/book/includes/font-settings.html b/theme/templates/website/includes/font-settings.html similarity index 100% rename from theme/templates/book/includes/font-settings.html rename to theme/templates/website/includes/font-settings.html diff --git a/theme/templates/book/includes/header.html b/theme/templates/website/includes/header.html similarity index 100% rename from theme/templates/book/includes/header.html rename to theme/templates/website/includes/header.html diff --git a/theme/templates/book/includes/quiz.html b/theme/templates/website/includes/quiz.html similarity index 100% rename from theme/templates/book/includes/quiz.html rename to theme/templates/website/includes/quiz.html diff --git a/theme/templates/book/includes/summary.html b/theme/templates/website/includes/summary.html similarity index 95% rename from theme/templates/book/includes/summary.html rename to theme/templates/website/includes/summary.html index 8f6e4c855..3fff7fe6e 100644 --- a/theme/templates/book/includes/summary.html +++ b/theme/templates/website/includes/summary.html @@ -56,7 +56,7 @@ {% if options.links.gitbook !== false %}
  • - Published using GitBook + Published using GitBook
    • {% endif %} diff --git a/theme/templates/book/langs.html b/theme/templates/website/langs.html similarity index 94% rename from theme/templates/book/langs.html rename to theme/templates/website/langs.html index 49878ae4f..7b47fc509 100755 --- a/theme/templates/book/langs.html +++ b/theme/templates/website/langs.html @@ -1,4 +1,4 @@ -{% extends "../layout.html" %} +{% extends "./layout.html" %} {% block title %}{{ title }}{% endblock %} diff --git a/theme/templates/layout.html b/theme/templates/website/layout.html old mode 100755 new mode 100644 similarity index 100% rename from theme/templates/layout.html rename to theme/templates/website/layout.html diff --git a/theme/templates/book/page.html b/theme/templates/website/page.html similarity index 86% rename from theme/templates/book/page.html rename to theme/templates/website/page.html index d1379a2e9..91f2162dd 100644 --- a/theme/templates/book/page.html +++ b/theme/templates/website/page.html @@ -1,4 +1,4 @@ -{% extends "../layout.html" %} +{% extends "./layout.html" %} {% block head %} {% parent %} @@ -66,12 +66,15 @@ require(["gitbook"], function(gitbook) { {% endblock %} {% block style %} - -{% for resource in plugins.resources.css %} - {% if resource.url %} - - {% else %} - - {% endif %} -{% endfor %} + + {% for resource in plugins.resources.css %} + {% if resource.url %} + + {% else %} + + {% endif %} + {% endfor %} + {% for style in styles %} + + {% endfor %} {% endblock %}