+ + {% with place='top' %} + {% include "subchapter.html" %} + {% endwith %} + {% if dynamic_pages == 'True' %} {% raw %} @@ -314,12 +316,12 @@ {% block body %} {% endblock %} -
- You have attempted of activities on this page
+
+ You have attempted of activities on this page
- {% block nextprevious %} - {% include "subchapter.html" %} - {% endblock %} + {% with place='bottom'%} + {% include "subchapter.html" %} + {% endwith %}
{%- endblock %} @@ -341,9 +343,9 @@

{%- if show_copyright %} {%- if hasdoc('copyright') %} - {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {% trans path=pathto('copyright'), copyright=copyright %}© Copyright {{ copyright }}.{% endtrans %} {%- else %} - {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {% trans copyright=copyright %}© Copyright {{ copyright }}.{% endtrans %} {%- endif %} {%- endif %} {%- if last_updated %} @@ -360,13 +362,13 @@ {% if dynamic_pages == 'True' %} {% raw %} {{ if request.application == 'runestone':}} - + + {% endif %} {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/_templates/plugin_layouts/sphinx_bootstrap/progress.html b/_templates/plugin_layouts/sphinx_bootstrap/progress.html index e55fbff1ca..503cbbd3b3 100644 --- a/_templates/plugin_layouts/sphinx_bootstrap/progress.html +++ b/_templates/plugin_layouts/sphinx_bootstrap/progress.html @@ -65,7 +65,7 @@ document.getElementById("progressBar").style.width = book.curChapterPercent-1 + "%"; } } - document.addEventListener('DOMContentLoaded', function() { + window.addEventListener('load', function() { loadProgressBar(); }, false); diff --git a/_templates/plugin_layouts/sphinx_bootstrap/relations.html b/_templates/plugin_layouts/sphinx_bootstrap/relations.html index b01d533747..e141fc5ffa 100644 --- a/_templates/plugin_layouts/sphinx_bootstrap/relations.html +++ b/_templates/plugin_layouts/sphinx_bootstrap/relations.html @@ -19,12 +19,14 @@

  • {%- endif %} - diff --git a/_templates/plugin_layouts/sphinx_bootstrap/static/bootstrap-sphinx.js b/_templates/plugin_layouts/sphinx_bootstrap/static/bootstrap-sphinx.js index 5323140326..e5e452176b 100644 --- a/_templates/plugin_layouts/sphinx_bootstrap/static/bootstrap-sphinx.js +++ b/_templates/plugin_layouts/sphinx_bootstrap/static/bootstrap-sphinx.js @@ -51,7 +51,7 @@ .attr("border", 0); }; - $(document).ready(function () { +$(function () { /* * Scroll the window to avoid the topnav bar diff --git a/_templates/plugin_layouts/sphinx_bootstrap/subchapter.html b/_templates/plugin_layouts/sphinx_bootstrap/subchapter.html index 3cf7462d0d..c1d321d51f 100644 --- a/_templates/plugin_layouts/sphinx_bootstrap/subchapter.html +++ b/_templates/plugin_layouts/sphinx_bootstrap/subchapter.html @@ -1,49 +1,24 @@ + diff --git a/conf.py b/conf.py index 8a72371499..004186beca 100644 --- a/conf.py +++ b/conf.py @@ -33,7 +33,7 @@ # ,'runestone.video','runestone.reveal','runestone.poll','runestone.tabbedStuff','runestone.disqus','runestone.codelens','runestone.activecode', 'runestone.assess', 'runestone.animation','runestone.meta', 'runestone.parsons', 'runestone.blockly', 'runestone.livecode','runestone.accessibility'] # Add any paths that contain templates here, relative to this directory. -templates_path = [pkg_resources.resource_filename("runestone", "common/project_template/_templates")] +templates_path = ["./_templates"] print(templates_path) @@ -227,7 +227,7 @@ # html_style = "style.css" # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = [pkg_resources.resource_filename("runestone", "common/project_template/_templates/plugin_layouts")] +html_theme_path = ["./_templates/plugin_layouts"] print(html_theme_path)