Merge branch 'master' into pymarkdown_options

getnikola · Apr 5, 2018 · ef882d9 · ef882d9
2 parents 3b695e5 + e86cb9e
commit ef882d9
Show file tree

Hide file tree

Showing 730 changed files with 67,197 additions and 34,337 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ env:
   global:
     secure: GqUDW0j4Ay8pS9tS/g5JBYGtgBG0g0oD2g4X9JXgVchiFj3GIRL+dwiXpgx3LELy7nCWF3EzClFxxMdVqqxizQ/I8xqiA0XL/rf5z/y+9d9nmKOxV8SV73n0eCgsHWkbdSLJ6MKs6s0Trlz9jLu/P+Bhfu2ttqkOH8WttfEf3VE=
 install:
-- if [[ $NMODE == 'nikola' ]]; then pip install -r requirements-tests.txt; if [[ "$?" == '1' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi
+- if [[ $NMODE == 'nikola' ]]; then pip install -Ur requirements-tests.txt; if [[ "$?" == '1' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi
 - if [[ $NMODE == 'nikola' ]]; then pip install .; fi
 - if [[ $NMODE == 'flake8' ]]; then pip install flake8 pydocstyle; fi
 script:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,10 @@ Features
 --------
 
 * New MARKDOWN_EXTENSION_CONFIGS setting (Issue #2970)
+* Replace ``flowr.js`` with ``justified-layout.js`` by Flickr
+  (does not require jQuery!)
+* ``bootblog4`` is the new default theme (Issue #2964)
+* New ``bootstrap4`` and ``bootblog4`` themes (Issue #2964)
 * New Thai translation by Narumol Hankrotha and Jean Jordaan
 * Support for Commento comment system (Issue #2773)
 * New PRESERVE_ICC_PROFILES option to control whether ICC profiles are
@@ -35,7 +39,13 @@ Features
 Bugfixes
 --------
 
-* Handle '/' and other absolute paths better in POSTS / PAGES / TRANSLATIONS 
+* Use documented dateutil API for time zone list (Issue #3006)
+* Handle trailing slash redirects with query strings correctly in
+  ``nikola serve`` (Issue #3000)
+* Fix w3c validation errors for itemscope entries in default themes
+* Hide “Incomplete language” message for overrides of complete
+  languages
+* Handle '/' and other absolute paths better in POSTS / PAGES / TRANSLATIONS
   (Issue #2982)
 * Fix loading non-default languages
 * Support KaTeX for reST display math (Issue #2888)
@@ -84,6 +94,12 @@ Removed features
   (Issue #2785)
 * Removed old 7-line metadata format (Issue #2839)
 
+Other changes
+-------------
+
+* Rename ``crumbs.tmpl`` to ``ui_helper.tmpl`` and the breadcrumbs
+  function to ``breadcrumbs``
+
 New in v7.8.8
 =============
 

diff --git a/docs/creating-a-site.rst b/docs/creating-a-site.rst
@@ -119,7 +119,7 @@ people might find it a bit too limiting — if that is the case, try using HTML
 for your pages (Nikola does this on the index page, for example).
 
 So, let's give the page a nicer title, and some fake content. Since the default
-Nikola theme (called ``bootstrap3``) is based on `Bootstrap <http://getbootstrap.com/>`_
+Nikola theme (called ``bootblog4``) is based on `Bootstrap <http://getbootstrap.com/>`_
 you can use anything you like from it:
 
 .. code:: rest

diff --git a/docs/extending.rst b/docs/extending.rst
@@ -12,7 +12,7 @@ Extending Nikola
 :Version: 7.8.8
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
-.. class:: alert alert-info pull-right
+.. class:: alert alert-info float-md-right
 
 .. contents::
 

diff --git a/docs/manual.rst b/docs/manual.rst
@@ -11,7 +11,7 @@ The Nikola Handbook
 
 :Version: 7.8.8
 
-.. class:: alert alert-info pull-right
+.. class:: alert alert-info float-md-right
 
 .. contents::
 
@@ -1475,9 +1475,9 @@ Navigation Links
        1. Support for submenus is theme-dependent.  Only one level of
           submenus is supported.
 
-       2. Some themes, including the default Bootstrap 3 theme, may
-          present issues if the menu is too large.  (in ``bootstrap3``, the
-          navbar can grow too large and cover contents.)
+       2. Some themes, including the default Bootstrap theme, may
+          present issues if the menu is too large.  (in Bootstrap, the navbar
+          can grow too large and cover contents.)
 
        3. If you link to directories, make sure to follow ``STRIP_INDEXES``.  If
           it’s set to ``True``, end your links with a ``/``, otherwise end them

diff --git a/docs/social_buttons.rst b/docs/social_buttons.rst
@@ -11,7 +11,7 @@ Using Alternative Social Buttons with Nikola
 
 :Version: 7.8.8
 
-.. class:: alert alert-info pull-right
+.. class:: alert alert-info float-md-right
 
 .. contents::
 

diff --git a/docs/sphinx/modules.txt → docs/sphinx/modules.rst b/docs/sphinx/modules.txt → docs/sphinx/modules.rst
diff --git a/docs/sphinx/nikola.packages.datecond.txt → docs/sphinx/nikola.packages.datecond.rst b/docs/sphinx/nikola.packages.datecond.txt → docs/sphinx/nikola.packages.datecond.rst
diff --git a/docs/sphinx/nikola.packages.txt → docs/sphinx/nikola.packages.rst b/docs/sphinx/nikola.packages.txt → docs/sphinx/nikola.packages.rst
diff --git a/docs/sphinx/nikola.packages.tzlocal.txt → docs/sphinx/nikola.packages.tzlocal.rst b/docs/sphinx/nikola.packages.tzlocal.txt → docs/sphinx/nikola.packages.tzlocal.rst
diff --git a/docs/sphinx/nikola.plugins.command.auto.txt → docs/sphinx/nikola.plugins.command.auto.rst b/docs/sphinx/nikola.plugins.command.auto.txt → docs/sphinx/nikola.plugins.command.auto.rst
diff --git a/docs/sphinx/nikola.plugins.command.txt → docs/sphinx/nikola.plugins.command.rst b/docs/sphinx/nikola.plugins.command.txt → docs/sphinx/nikola.plugins.command.rst
diff --git a/...phinx/nikola.plugins.command.rst2html.txt → ...phinx/nikola.plugins.command.rst2html.rst b/...phinx/nikola.plugins.command.rst2html.txt → ...phinx/nikola.plugins.command.rst2html.rst
diff --git a/...phinx/nikola.plugins.compile.markdown.txt → ...phinx/nikola.plugins.compile.markdown.rst b/...phinx/nikola.plugins.compile.markdown.txt → ...phinx/nikola.plugins.compile.markdown.rst
diff --git a/docs/sphinx/nikola.plugins.compile.rest.txt → docs/sphinx/nikola.plugins.compile.rest.rst b/docs/sphinx/nikola.plugins.compile.rest.txt → docs/sphinx/nikola.plugins.compile.rest.rst
diff --git a/docs/sphinx/nikola.plugins.compile.txt → docs/sphinx/nikola.plugins.compile.rst b/docs/sphinx/nikola.plugins.compile.txt → docs/sphinx/nikola.plugins.compile.rst
diff --git a/docs/sphinx/nikola.plugins.misc.txt → docs/sphinx/nikola.plugins.misc.rst b/docs/sphinx/nikola.plugins.misc.txt → docs/sphinx/nikola.plugins.misc.rst
diff --git a/docs/sphinx/nikola.plugins.txt → docs/sphinx/nikola.plugins.rst b/docs/sphinx/nikola.plugins.txt → docs/sphinx/nikola.plugins.rst
diff --git a/docs/sphinx/nikola.plugins.task.txt → docs/sphinx/nikola.plugins.task.rst b/docs/sphinx/nikola.plugins.task.txt → docs/sphinx/nikola.plugins.task.rst
diff --git a/docs/sphinx/nikola.plugins.task.sitemap.txt → docs/sphinx/nikola.plugins.task.sitemap.rst b/docs/sphinx/nikola.plugins.task.sitemap.txt → docs/sphinx/nikola.plugins.task.sitemap.rst
diff --git a/docs/sphinx/nikola.plugins.template.txt → docs/sphinx/nikola.plugins.template.rst b/docs/sphinx/nikola.plugins.template.txt → docs/sphinx/nikola.plugins.template.rst
diff --git a/docs/sphinx/nikola.txt → docs/sphinx/nikola.rst b/docs/sphinx/nikola.txt → docs/sphinx/nikola.rst
diff --git a/docs/sphinx/template-variables.txt b/docs/sphinx/template-variables.txt
diff --git a/docs/support.rst b/docs/support.rst
@@ -6,7 +6,7 @@
 
 :Version: 7.8.8
 
-.. class:: alert alert-info pull-right
+.. class:: alert alert-info float-md-right
 
 .. contents::
 

diff --git a/docs/theming.rst b/docs/theming.rst
@@ -12,7 +12,7 @@ Theming Nikola
 :Version: 7.8.8
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
-.. class:: alert alert-info pull-right
+.. class:: alert alert-info float-md-right
 
 .. contents::
 
@@ -37,8 +37,8 @@ assets
     and ``fonts`` (Bootstrap).
 
     The included themes use `Bootstrap <https://getbootstrap.com/>`_,
-    `baguetteBox <https://feimosi.github.io/baguetteBox.js/>`_, `Flowr.js
-    <https://github.com/kalyan02/flowr-js>`_ and `Moment.js
+    `baguetteBox <https://feimosi.github.io/baguetteBox.js/>`_, `Justified Layout by Flickr
+    <http://flickr.github.io/justified-layout/>`_ and `Moment.js
     <https://momentjs.com/>`_, so they are in assets, along with CSS files for
     syntax highlighting, reStructuredText and Jupyter, as well as a minified
     copy of jQuery.
@@ -238,7 +238,7 @@ These are the templates that come with the included themes:
     It uses a bunch of helper templates, one for each supported comment system
     (all of which start with ``comments_helper``)
 
-``crumbs.tmpl``, ``pagination_helper.tmpl``
+``ui_helper.tmpl``, ``pagination_helper.tmpl``
     These templates help render specific UI items, and can be tweaked as needed.
 
 ``gallery.tmpl``
@@ -256,7 +256,8 @@ These are the templates that come with the included themes:
       + ``title``: The title of the image.
       + ``size``: A dict containing ``w`` and ``h``, the real size of the thumbnail.
 
-    * ``photo_array_json``: a JSON dump of photo_array, used in the bootstrap theme by flowr.js
+    * ``photo_array_json``: a JSON dump of photo_array, used by the
+      ``justified-layout`` script
 
 ``list.tmpl``
     Template used to display generic lists of links, which it gets in ``items``,

diff --git a/nikola/conf.py.in b/nikola/conf.py.in
@@ -77,7 +77,7 @@ TRANSLATIONS_PATTERN = '{path}.{lang}.{ext}'
 #          Only one level of submenus is supported.
 # WARNING: Some themes, including the default Bootstrap 3 theme,
 #          may present issues if the menu is too large.
-#          (in bootstrap3, the navbar can grow too large and cover contents.)
+#          (in Bootstrap, the navbar can grow too large and cover contents.)
 # WARNING: If you link to directories, make sure to follow
 #          ``STRIP_INDEXES``.  If it’s set to ``True``, end your links
 #          with a ``/``, otherwise end them with ``/index.html`` — or
@@ -162,7 +162,7 @@ TIMEZONE = ${TIMEZONE}
 # 1 = using JS_DATE_FORMAT and local user time (via moment.js)
 # 2 = using a string like “2 days ago”
 #
-# Your theme must support it, bootstrap and bootstrap3 already do.
+# Your theme must support it, Bootstrap already does.
 # DATE_FANCINESS = 0
 
 # While Nikola can select a sensible locale for each language,

diff --git a/nikola/data/samplesite/pages/bootstrap-demo.rst b/nikola/data/samplesite/pages/bootstrap-demo.rst
@@ -357,7 +357,7 @@
             </blockquote>
           </div>
           <div class="col-lg-6">
-            <blockquote class="pull-right">
+            <blockquote class="float-md-right">
               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
               <small>Someone famous in <cite title="Source Title">Source Title</cite></small>
             </blockquote>

diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt
@@ -5,6 +5,7 @@ docs/sphinx/internals.rst
 docs/sphinx/manual.rst
 docs/sphinx/path_handlers.rst
 docs/sphinx/social_buttons.rst
+docs/sphinx/support.rst
 docs/sphinx/template-variables.rst
 docs/sphinx/theming.rst
 nikola/data/samplesite/pages/creating-a-theme.rst
@@ -19,31 +20,15 @@ nikola/data/themes/base/assets/css/baguetteBox.min.css
 nikola/data/themes/base/assets/js/baguetteBox.min.js
 nikola/data/themes/base/assets/js/html5.js
 nikola/data/themes/base/assets/js/html5shiv-printshiv.min.js
+nikola/data/themes/base/assets/js/justified-layout.min.js
 nikola/data/themes/base/assets/js/moment-with-locales.min.js
 nikola/data/themes/base/messages/messages_cz.py
-nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.min.css
-nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.min.css.map
-nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.min.css
-nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.min.css.map
-nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.eot
-nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.svg
-nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.ttf
-nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.woff
-nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.woff2
-nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.min.js
-nikola/data/themes/bootstrap3-jinja/assets/js/jquery.min.js
-nikola/data/themes/bootstrap3-jinja/assets/js/jquery.min.map
-nikola/data/themes/bootstrap3-jinja/bundles
-nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css
-nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css.map
-nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css
-nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css.map
-nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.eot
-nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.svg
-nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.ttf
-nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff
-nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff2
-nikola/data/themes/bootstrap3/assets/js/bootstrap.min.js
-nikola/data/themes/bootstrap3/assets/js/jquery.min.js
-nikola/data/themes/bootstrap3/assets/js/jquery.min.map
+nikola/data/themes/bootstrap4-jinja/assets/css/bootstrap.min.css
+nikola/data/themes/bootstrap4-jinja/assets/js/bootstrap.min.js
+nikola/data/themes/bootstrap4-jinja/assets/js/jquery.min.js
+nikola/data/themes/bootstrap4-jinja/assets/js/popper.min.js
+nikola/data/themes/bootstrap4/assets/css/bootstrap.min.css
+nikola/data/themes/bootstrap4/assets/js/bootstrap.min.js
+nikola/data/themes/bootstrap4/assets/js/jquery.min.js
+nikola/data/themes/bootstrap4/assets/js/popper.min.js
 nikola/plugins/command/auto/livereload.js
diff --git a/nikola/data/themes/base-jinja/AUTHORS.txt b/nikola/data/themes/base-jinja/AUTHORS.txt
diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl
@@ -22,14 +22,11 @@
     {{ base.late_load_js() }}
     {% block extra_js %}{% endblock %}
     <script>
-    baguetteBox.run('a.reference:not(.islink)', {
+    baguetteBox.run('div#content', {
+        ignoreClass: 'islink',
         captions: function(element) {
             return element.getElementsByTagName('img')[0].alt;
     }});
-    baguetteBox.run('img:not(.islink)', {
-        captions: function(element) {
-            return element.alt;
-    }});
     </script>
     {{ body_end }}
     {{ template_hooks['body_end']() }}

diff --git a/nikola/data/themes/base-jinja/templates/comments_helper.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper.tmpl
@@ -6,6 +6,7 @@
 {% import 'comments_helper_muut.tmpl' as muut with context %}
 {% import 'comments_helper_facebook.tmpl' as facebook with context %}
 {% import 'comments_helper_isso.tmpl' as isso with context %}
+{% import 'comments_helper_commento.tmpl' as commento with context %}
 
 {% macro comment_form(url, title, identifier) %}
     {% if comment_system == 'disqus' %}
@@ -20,6 +21,8 @@
         {{ facebook.comment_form(url, title, identifier) }}
     {% elif comment_system == 'isso' %}
         {{ isso.comment_form(url, title, identifier) }}
+    {% elif comment_system == 'commento' %}
+        {{ commento.comment_form(url, title, identifier) }}
     {% endif %}
 {% endmacro %}
 
@@ -36,6 +39,8 @@
         {{ facebook.comment_link(link, identifier) }}
     {% elif comment_system == 'isso' %}
         {{ isso.comment_link(link, identifier) }}
+    {% elif comment_system == 'commento' %}
+        {{ commento.comment_link(link, identifier) }}
     {% endif %}
 {% endmacro %}
 
@@ -52,5 +57,7 @@
         {{ facebook.comment_link_script() }}
     {% elif comment_system == 'isso' %}
         {{ isso.comment_link_script() }}
+    {% elif comment_system == 'commento' %}
+        {{ commento.comment_link_script() }}
     {% endif %}
 {% endmacro %}
diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_commento.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_commento.tmpl
@@ -0,0 +1,19 @@
+{#  -*- coding: utf-8 -*- #}
+{% macro comment_form(url, title, identifier) %}
+    <div id="commento"></div>
+{% endmacro %}
+
+{% macro comment_link(link, identifier) %}
+{% endmacro %}
+
+
+{% macro comment_link_script() %}
+<script src="{{ comment_system_id }}/assets/js/commento.min.js"></script>
+<script>
+window.onload = function() {
+    Commento.init({
+        serverUrl: "{{ comment_system_id }}",
+    });
+}
+</script>
+{% endmacro %}