Skip to content
Permalink
Browse files
Merge branch 'master' into fix-2993
  • Loading branch information
ralsina committed Mar 20, 2018
2 parents 3f70110 + 76ff6bf commit a7d40b1c2ce8cda4aa760284f3e0bc4ffd023e17
Showing 773 changed files with 67,697 additions and 34,455 deletions.
@@ -4,10 +4,15 @@ New in master
Features
--------

* 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
preserved when copying images.
* Use baguetteJS in bootstrap theme (part of Issue #2777)
* Use baguetteBox in Bootstrap theme (part of Issue #2777)
* New default-config command to generate a clean configuration.
* New ``thumbnail`` shortcode similar to the reStructuredText
``thumbnail`` directive (via Issue #2809)
@@ -33,7 +38,11 @@ Features
Bugfixes
--------

* Handle '/' and other absolute paths better in POSTS / PAGES
* 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)
* Use npm for asset management instead of bower, which was deprecated
(Issue #2790)
@@ -68,6 +77,7 @@ Bugfixes
Removed features
----------------

* Removed Colorbox (Issue #2777)
* Removed ``googleplus`` comments (no longer supported) (Issue #635)
* Removed the slides directive for docutils, it will now be a separate plugin.
* Dropped Python 2 and Python 3.3 support (oldest supported version is 3.4)
@@ -79,6 +89,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
=============

@@ -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
File renamed without changes.
@@ -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::

File renamed without changes.
@@ -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
File renamed without changes.
@@ -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::

@@ -34,7 +34,7 @@
templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.txt'
source_suffix = '.rst'

# The encoding of source files.
# source_encoding = 'utf-8-sig'

This file was deleted.

This file was deleted.

This file was deleted.

File renamed without changes.

This file was deleted.

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

This file was deleted.

This file was deleted.

File renamed without changes.

This file was deleted.

@@ -6,7 +6,7 @@
:Version: 7.8.8

.. class:: alert alert-info pull-right
.. class:: alert alert-info float-md-right

.. contents::

@@ -46,7 +46,6 @@ Name Type Descript
``blog_title`` TranslatableSetting<str> ``BLOG_TITLE`` setting
``blog_url`` str ``SITE_URL`` setting
``body_end`` TranslatableSetting<str> ``BODY_END`` setting
``colorbox_locales`` defaultdict<str, str> dictionary of available Colorbox locales
``colorize_str_from_base_color`` function ``utils.colorize_str_from_base_color`` function
``color_hsl_adjust_hex`` function ``utils.color_hsl_adjust_hex`` function
``comment_system_id`` str ``COMMENT_SYSTEM_ID`` setting
@@ -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::

@@ -36,9 +36,9 @@ assets
references to them. The default subdirectories are ``css``, ``js``, ``xml``
and ``fonts`` (Bootstrap).

The included themes use `Bootstrap <https://getbootstrap.com/>`_, `Colorbox
<http://www.jacklmoore.com/colorbox>`_, `Flowr.js
<https://github.com/kalyan02/flowr-js>`_ and `Moment.js
The included themes use `Bootstrap <https://getbootstrap.com/>`_,
`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.
@@ -78,7 +78,7 @@ bundles

.. code:: text

assets/css/all.css=bootstrap.css,rst_base.css,nikola_rst.css,code.css,colorbox.css,custom.css
assets/css/all.css=bootstrap.min.css,rst_base.css,nikola_rst.css,code.css,baguetteBox.min.css,theme.css,custom.css

This creates a file called "assets/css/all.css" in your output that is the
combination of all the other file paths, relative to the output file.
@@ -158,9 +158,6 @@ The following keys are currently supported:
defaults to False)
* ``ignored_assets`` — comma-separated list of assets to ignore (relative to
the ``assets/`` directory, eg. ``css/theme.css``)
* ``ignore_colorbox_i18n`` — prevent copying Colorbox locales. Accepted
values: ``all`` (all ignored), ``unused`` (used locales copied),
``none`` (all copied)

Templates
---------
@@ -241,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``
@@ -259,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``,
@@ -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,
@@ -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>
File renamed without changes.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,49 +1,34 @@
docs/sphinx/creating-a-site.txt
docs/sphinx/creating-a-theme.txt
docs/sphinx/extending.txt
docs/sphinx/internals.txt
docs/sphinx/manual.txt
docs/sphinx/path_handlers.txt
docs/sphinx/social_buttons.txt
docs/sphinx/template-variables.txt
docs/sphinx/theming.txt
docs/sphinx/creating-a-site.rst
docs/sphinx/creating-a-theme.rst
docs/sphinx/extending.rst
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
nikola/data/samplesite/pages/extending.txt
nikola/data/samplesite/pages/internals.txt
nikola/data/samplesite/pages/extending.rst
nikola/data/samplesite/pages/internals.rst
nikola/data/samplesite/pages/manual.rst
nikola/data/samplesite/pages/path_handlers.txt
nikola/data/samplesite/pages/social_buttons.txt
nikola/data/samplesite/pages/path_handlers.rst
nikola/data/samplesite/pages/social_buttons.rst
nikola/data/samplesite/pages/theming.rst
nikola/data/symlink-test-link.txt
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

This file was deleted.

@@ -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 %}

0 comments on commit a7d40b1

Please sign in to comment.