Skip to content
Permalink
Browse files

merged master

  • Loading branch information
ralsina committed Jun 23, 2017
2 parents a7f1fb6 + f9f3c54 commit f56350144fc9d50de5e6606747bc764ebb0dec57
Showing with 776 additions and 1,620 deletions.
  1. +0 −1 .travis.yml
  2. +25 −0 CHANGES.txt
  3. +46 −0 CODE_OF_CONDUCT.md
  4. +1 −1 README.rst
  5. +0 −1 appveyor.yml
  6. +12 −11 docs/creating-a-theme.txt
  7. +13 −28 docs/manual.txt
  8. +0 −1 docs/sphinx/requirements-docs.txt
  9. +1 −2 docs/template-variables.rst
  10. +2 −5 docs/theming.txt
  11. +5 −2 nikola/__init__.py
  12. +4 −14 nikola/__main__.py
  13. +3 −29 nikola/conf.py.in
  14. +13 −13 nikola/data/samplesite/pages/quickstart.rst
  15. +9 −3 nikola/data/themes/base-jinja/templates/archiveindex.tmpl
  16. +2 −4 nikola/data/themes/base-jinja/templates/author.tmpl
  17. +14 −1 nikola/data/themes/base-jinja/templates/authorindex.tmpl
  18. +8 −0 nikola/data/themes/base-jinja/templates/authors.tmpl
  19. +4 −3 nikola/data/themes/base-jinja/templates/base_helper.tmpl
  20. +93 −60 nikola/data/themes/base-jinja/templates/feeds_translations_helper.tmpl
  21. +1 −1 nikola/data/themes/base-jinja/templates/index.tmpl
  22. +5 −1 nikola/data/themes/base-jinja/templates/list.tmpl
  23. +5 −1 nikola/data/themes/base-jinja/templates/list_post.tmpl
  24. +2 −2 nikola/data/themes/base-jinja/templates/math_helper.tmpl
  25. +5 −2 nikola/data/themes/base-jinja/templates/sectionindex.tmpl
  26. +3 −5 nikola/data/themes/base-jinja/templates/tag.tmpl
  27. +5 −2 nikola/data/themes/base-jinja/templates/tagindex.tmpl
  28. +8 −0 nikola/data/themes/base-jinja/templates/tags.tmpl
  29. +1 −1 nikola/data/themes/base/assets/css/ipython.min.css
  30. +0 −63 nikola/data/themes/base/assets/css/nikola_ipython.css
  31. +1 −3 nikola/data/themes/base/messages/messages_ar.py
  32. +1 −3 nikola/data/themes/base/messages/messages_az.py
  33. +1 −3 nikola/data/themes/base/messages/messages_bg.py
  34. +1 −3 nikola/data/themes/base/messages/messages_bs.py
  35. +1 −3 nikola/data/themes/base/messages/messages_ca.py
  36. +1 −3 nikola/data/themes/base/messages/messages_cs.py
  37. +1 −3 nikola/data/themes/base/messages/messages_da.py
  38. +1 −3 nikola/data/themes/base/messages/messages_de.py
  39. +1 −3 nikola/data/themes/base/messages/messages_el.py
  40. +1 −3 nikola/data/themes/base/messages/messages_en.py
  41. +1 −3 nikola/data/themes/base/messages/messages_eo.py
  42. +1 −3 nikola/data/themes/base/messages/messages_es.py
  43. +1 −3 nikola/data/themes/base/messages/messages_et.py
  44. +1 −3 nikola/data/themes/base/messages/messages_eu.py
  45. +1 −3 nikola/data/themes/base/messages/messages_fa.py
  46. +1 −3 nikola/data/themes/base/messages/messages_fi.py
  47. +1 −3 nikola/data/themes/base/messages/messages_fil.py
  48. +1 −3 nikola/data/themes/base/messages/messages_fr.py
  49. +1 −3 nikola/data/themes/base/messages/messages_gl.py
  50. +1 −3 nikola/data/themes/base/messages/messages_he.py
  51. +1 −3 nikola/data/themes/base/messages/messages_hi.py
  52. +1 −3 nikola/data/themes/base/messages/messages_hr.py
  53. +1 −3 nikola/data/themes/base/messages/messages_hu.py
  54. +1 −3 nikola/data/themes/base/messages/messages_id.py
  55. +1 −3 nikola/data/themes/base/messages/messages_it.py
  56. +1 −3 nikola/data/themes/base/messages/messages_ja.py
  57. +1 −3 nikola/data/themes/base/messages/messages_ko.py
  58. +1 −3 nikola/data/themes/base/messages/messages_lt.py
  59. +1 −3 nikola/data/themes/base/messages/messages_nb.py
  60. +1 −3 nikola/data/themes/base/messages/messages_nl.py
  61. +1 −3 nikola/data/themes/base/messages/messages_pa.py
  62. +1 −3 nikola/data/themes/base/messages/messages_pl.py
  63. +1 −3 nikola/data/themes/base/messages/messages_pt.py
  64. +1 −3 nikola/data/themes/base/messages/messages_pt_br.py
  65. +1 −3 nikola/data/themes/base/messages/messages_ru.py
  66. +1 −3 nikola/data/themes/base/messages/messages_si_lk.py
  67. +1 −3 nikola/data/themes/base/messages/messages_sk.py
  68. +1 −3 nikola/data/themes/base/messages/messages_sl.py
  69. +1 −3 nikola/data/themes/base/messages/messages_sq.py
  70. +1 −3 nikola/data/themes/base/messages/messages_sr.py
  71. +1 −3 nikola/data/themes/base/messages/messages_sr_latin.py
  72. +1 −3 nikola/data/themes/base/messages/messages_sv.py
  73. +1 −3 nikola/data/themes/base/messages/messages_te.py
  74. +1 −3 nikola/data/themes/base/messages/messages_tl.py
  75. +1 −3 nikola/data/themes/base/messages/messages_tr.py
  76. +1 −3 nikola/data/themes/base/messages/messages_uk.py
  77. +1 −3 nikola/data/themes/base/messages/messages_ur.py
  78. +1 −3 nikola/data/themes/base/messages/messages_zh_cn.py
  79. +1 −3 nikola/data/themes/base/messages/messages_zh_tw.py
  80. +9 −3 nikola/data/themes/base/templates/archiveindex.tmpl
  81. +2 −4 nikola/data/themes/base/templates/author.tmpl
  82. +14 −1 nikola/data/themes/base/templates/authorindex.tmpl
  83. +8 −0 nikola/data/themes/base/templates/authors.tmpl
  84. +4 −3 nikola/data/themes/base/templates/base_helper.tmpl
  85. +97 −64 nikola/data/themes/base/templates/feeds_translations_helper.tmpl
  86. +1 −1 nikola/data/themes/base/templates/index.tmpl
  87. +5 −1 nikola/data/themes/base/templates/list.tmpl
  88. +5 −1 nikola/data/themes/base/templates/list_post.tmpl
  89. +2 −2 nikola/data/themes/base/templates/math_helper.tmpl
  90. +5 −2 nikola/data/themes/base/templates/sectionindex.tmpl
  91. +3 −5 nikola/data/themes/base/templates/tag.tmpl
  92. +5 −2 nikola/data/themes/base/templates/tagindex.tmpl
  93. +8 −0 nikola/data/themes/base/templates/tags.tmpl
  94. +8 −0 nikola/data/themes/bootstrap3-jinja/templates/authors.tmpl
  95. +0 −5 nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
  96. +2 −7 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  97. +8 −0 nikola/data/themes/bootstrap3-jinja/templates/tags.tmpl
  98. +8 −0 nikola/data/themes/bootstrap3/templates/authors.tmpl
  99. +0 −5 nikola/data/themes/bootstrap3/templates/base.tmpl
  100. +2 −7 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
  101. +8 −0 nikola/data/themes/bootstrap3/templates/tags.tmpl
  102. +0 −1 nikola/hierarchy_utils.py
  103. +0 −1 nikola/image_processing.py
  104. +20 −181 nikola/nikola.py
  105. +2 −18 nikola/plugin_categories.py
  106. +0 −2 nikola/plugins/__init__.py
  107. +1 −3 nikola/plugins/basic_import.py
  108. +3 −10 nikola/plugins/command/auto/__init__.py
  109. +1 −2 nikola/plugins/command/bootswatch_theme.py
  110. +3 −4 nikola/plugins/command/check.py
  111. +2 −3 nikola/plugins/command/console.py
  112. +2 −3 nikola/plugins/command/deploy.py
  113. +12 −8 nikola/plugins/command/github_deploy.py
  114. +2 −12 nikola/plugins/command/import_wordpress.py
  115. +5 −8 nikola/plugins/command/init.py
  116. +0 −13 nikola/plugins/command/install_theme.plugin
  117. +0 −91 nikola/plugins/command/install_theme.py
  118. +0 −1 nikola/plugins/command/new_page.py
  119. +10 −5 nikola/plugins/command/new_post.py
  120. +0 −1 nikola/plugins/command/orphans.py
  121. +1 −2 nikola/plugins/command/plugin.py
  122. +1 −2 nikola/plugins/command/rst2html/__init__.py
  123. +3 −5 nikola/plugins/command/serve.py
  124. +0 −1 nikola/plugins/command/status.py
  125. +1 −2 nikola/plugins/command/theme.py
  126. +0 −1 nikola/plugins/command/version.py
  127. +9 −3 nikola/plugins/compile/html.py
  128. +2 −2 nikola/plugins/compile/ipynb.plugin
  129. +21 −38 nikola/plugins/compile/ipynb.py
  130. +1 −2 nikola/plugins/compile/markdown/__init__.py
  131. +2 −3 nikola/plugins/compile/markdown/mdx_gist.py
  132. +0 −1 nikola/plugins/compile/markdown/mdx_nikola.py
  133. +0 −1 nikola/plugins/compile/markdown/mdx_podcast.py
  134. +0 −1 nikola/plugins/compile/pandoc.py
  135. +1 −2 nikola/plugins/compile/php.py
  136. +2 −9 nikola/plugins/compile/rest/__init__.py
  137. +0 −1 nikola/plugins/compile/rest/listing.py
  138. +4 −22 nikola/plugins/compile/rest/post_list.py
  139. +0 −1 nikola/plugins/compile/rest/slides.py
  140. +0 −12 nikola/plugins/misc/post_encryption.plugin
  141. +0 −118 nikola/plugins/misc/post_encryption.py
  142. +1 −2 nikola/plugins/misc/scan_posts.py
  143. +1 −2 nikola/plugins/misc/taxonomies_classifier.py
  144. +1 −1 nikola/plugins/shortcode/emoji/__init__.py
  145. +1 −2 nikola/plugins/task/archive.py
  146. +0 −6 nikola/plugins/task/authors.py
  147. +1 −2 nikola/plugins/task/bundles.py
  148. +0 −10 nikola/plugins/task/categories.py
  149. +1 −2 nikola/plugins/task/copy_assets.py
  150. +1 −2 nikola/plugins/task/galleries.py
  151. +0 −2 nikola/plugins/task/indexes.py
  152. +0 −1 nikola/plugins/task/listings.py
  153. +3 −2 nikola/plugins/task/page_index.py
  154. +0 −1 nikola/plugins/task/pages.py
  155. +0 −13 nikola/plugins/task/py3_switch.plugin
  156. +0 −103 nikola/plugins/task/py3_switch.py
  157. +0 −1 nikola/plugins/task/redirect.py
  158. +0 −1 nikola/plugins/task/robots.py
  159. +1 −1 nikola/plugins/task/scale_images.py
  160. +0 −2 nikola/plugins/task/sections.py
  161. +8 −13 nikola/plugins/task/sitemap/__init__.py
  162. +0 −1 nikola/plugins/task/tagcloud.py
  163. +0 −10 nikola/plugins/task/tags.py
  164. +15 −3 nikola/plugins/task/taxonomies.py
  165. +0 −1 nikola/plugins/template/jinja.py
  166. +2 −12 nikola/plugins/template/mako.py
  167. +0 −8 nikola/post.py
  168. +0 −84 nikola/rc4.py
  169. +5 −7 nikola/shortcodes.py
  170. +2 −7 nikola/state.py
  171. +18 −64 nikola/utils.py
  172. +0 −1 nikola/winutils.py
  173. +1 −0 requirements.txt
  174. +2 −2 scripts/baseline.sh
  175. +1 −2 scripts/document_path_handlers.py
  176. +2 −5 scripts/import_po.py
  177. +10 −7 scripts/jinjify.py
  178. +0 −3 setup.cfg
  179. +4 −11 setup.py
  180. +1 −11 tests/base.py
  181. +0 −23 tests/data/translated_titles/conf.py
  182. +0 −1 tests/import_wordpress_and_build_workflow.py
  183. +0 −1 tests/test_command_import_wordpress.py
  184. +0 −1 tests/test_command_init.py
  185. +0 −1 tests/test_commands.py
  186. +0 −1 tests/test_compile_markdown.py
  187. +12 −12 tests/test_integration.py
  188. +2 −7 tests/test_locale.py
  189. +0 −1 tests/test_plugin_importing.py
  190. +0 −1 tests/test_rss_feeds.py
  191. +0 −3 tests/test_rst_compiler.py
  192. +0 −1 tests/test_scheduling.py
  193. +15 −26 tests/test_shortcodes.py
  194. +0 −1 tests/test_slugify.py
  195. +9 −16 tests/test_template_shortcodes.py
  196. +2 −3 tests/test_utils.py
@@ -11,7 +11,6 @@ addons:
- language-pack-en-base
- language-pack-pl-base
python:
- '2.7'
- '3.3'
- '3.4'
- '3.5'
@@ -5,7 +5,32 @@ Features
--------

* Add support for extended metadata in galleries
* Use ``PRETTY_URLS`` by default on all sites (Issue #1838)
* Feed link generation is completely refactored (Issue #2844)

Bugfixes
--------

* Fix crash when compiling empty ``.html`` posts (Issue #2851)
* Make failures to get source commit hash non-fatal in
``github_deploy`` (Issue #2847)
* Less cryptic error when guessing format from extension in ``new_post``
fails
* Use Jupyter name more consistently in docs
* Support CODE_COLOR_SCHEME in Jupyter notebooks (Issue #2093)
* Language was not passed to title and link generation for page indexes

Removed features
----------------

* Drop Python 2 support
* Remove ``nikola install_theme`` — use ``nikola theme`` instead
* Drop insecure post encryption feature
* Stop supporting all deprecated config options
* Drop annotations support (annotateit.org closed down in March 2017)
* Remove taxonomy option ``also_create_classifications_from_other_languages``
(Issue #2785)
>>>>>>> master

New in v7.8.8
=============
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@getnikola.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
@@ -43,7 +43,7 @@ It has many features, but here are some of the nicer ones:
* Syntax highlighting for almost any programming language or markup
* Multilingual sites, `translated to 50 languages.`__
* Doesn't reinvent wheels, leverages existing tools.
* Python 2.7, 3.3, 3.4, 3.5 and 3.6 compatible.
* Python 3.3+ compatible.

.. _Nikola Handbook: https://getnikola.com/handbook.html#why-static
__ https://users.getnikola.com/
@@ -2,7 +2,6 @@
build: false
environment:
matrix:
- PYTHON: "C:/Python27"
- PYTHON: "C:/Python36"
init:
- "ECHO %PYTHON%"
@@ -17,7 +17,7 @@ create themes. Since I **suck** at designing websites, I asked for opinions on t
and got some feedback. Since this is **Not So Hard™**, I will try to make time to port a few
and see what happens.

If you are looking for a reference, check out `Theming reference <theming.html>`_ and `Template variables <https://getnikola.com/template-variables.html>`_.
If you are looking for a reference, check out :doc:`Theming reference <theming>` and `Template variables <https://getnikola.com/template-variables.html>`_.

Today’s theme is `Lanyon <https://github.com/poole/lanyon>`__ which is written by `@mdo <https://twitter.com/mdo>`__
and released under a MIT license, which is liberal enough.
@@ -176,7 +176,7 @@ see something fairly similar:
<meta name="viewport" content="width=device-width">
<title>My Nikola Site | My Nikola Site</title>

<link href="assets/css/rst.css" rel="stylesheet" type="text/css">
<link href="assets/css/html4css1.css" rel="stylesheet" type="text/css">
<link href="assets/css/code.css" rel="stylesheet" type="text/css">
<link href="assets/css/theme.css" rel="stylesheet" type="text/css">

@@ -199,10 +199,11 @@ in a particular way, using a setting called ``CODE_COLOR_SCHEME`` where you can
what color scheme the syntax highlighter uses. You can use your own ``assets/css/code.css`` if you
don’t like the provided ones.

Nikola **requires** ``assets/css/rst.css`` and ``assets/css/code.css`` to function properly.
We will also add themes for IPython Notebook (``assets/css/ipython.min.css``
Nikola **requires** ``assets/css/html4css1.css`` and ``assets/css/code.css`` to function properly.
We will also add themes for Jupyter (``assets/css/ipython.min.css``
and ``assets/css/nikola_ipython.css``) into the template; note that they are
activated only if you configured your ``POSTS``/``PAGES`` with ipynb support.
There’s also ``assets/css/nikola_rst.css``, which adds Bootstrap 3-style reST notes etc.

But how do I tell **our** lanyon theme to use those CSS files instead of whatever it’s using now?
By giving our theme its own base_helper.tmpl.
@@ -226,7 +227,8 @@ The part we want to change is this:
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
%endif
%else:
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/html4css1.css" rel="stylesheet" type="text/css">
<link href="/assets/css/nikola_rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
<link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
%if has_custom_css:
@@ -247,7 +249,8 @@ And we will change it so it uses the lanyon styles instead of theme.css (again,
%if use_bundles:
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
%else:
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/html4css1.css" rel="stylesheet" type="text/css">
<link href="/assets/css/nikola_rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/poole.css" rel="stylesheet" type="text/css">
<link href="/assets/css/lanyon.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
@@ -326,7 +329,6 @@ all the interesting stuff:
<%namespace name="base" file="base_helper.tmpl" import="*"/>
<%namespace name="header" file="base_header.tmpl" import="*"/>
<%namespace name="footer" file="base_footer.tmpl" import="*"/>
<%namespace name="annotations" file="annotation_helper.tmpl"/>
${set_locale(lang)}
${base.html_headstart()}
<%block name="extra_head">
@@ -362,7 +364,6 @@ So, first, lets change that base template to be more lanyon-like:
<%namespace name="base" file="base_helper.tmpl" import="*"/>
<%namespace name="header" file="base_header.tmpl" import="*"/>
<%namespace name="footer" file="base_footer.tmpl" import="*"/>
<%namespace name="annotations" file="annotation_helper.tmpl"/>
${set_locale(lang)}
${base.html_headstart()}
<%block name="extra_head">
@@ -401,7 +402,7 @@ So, first, lets change that base template to be more lanyon-like:
And that’s after I exposed the sidebar by clicking on an invisible widget!

One problem, which causes that yellow color in the sidebar is a CSS conflict.
We are loading ``rst.css`` which specifies
We are loading ``html4css1.css`` which specifies
the background color of ``div.sidebar`` which is more specific than
``lanyon.css``, which specifies for ``.sidebar`` alone.

@@ -505,7 +506,7 @@ and at the bottom a label for the sidebar toggle. Easy to do in ``base.tmpl``

Getting there!

The sidebar looks bad because of yet more CSS conflicts with ``rst.css``. By
The sidebar looks bad because of yet more CSS conflicts with ``html4css1.css``. By
adding some extra styling in ``lanyon.css``, it will look better.

.. code:: css
@@ -815,7 +816,7 @@ which makes sites load faster. To do that, your theme needs a ``bundles`` file w

For the Lanyon theme, it should be like this::

assets/css/all.css=rst.css,code.css,poole.css,lanyon.css,custom.css
assets/css/all.css=html4css1.css,nikola_rst.css,code.css,poole.css,lanyon.css,custom.css

**Note:** Some themes also support the ``USE_CDN`` option meaning that in some cases it will load one bundle with all CSS and in other will load some CSS files
from a CDN and others from a bundle. This is complicated and probably not worth the effort.
@@ -78,7 +78,7 @@ Nikola can't do:
* Twitter
* Facebook
* An Issue tracker
* Anything with forms, really (except for `comments <#comments-and-annotations>`_!)
* Anything with forms, really (except for `comments`_!)

Keep in mind that "static" doesn't mean **boring**. You can have animations, slides
or whatever fancy CSS3/HTML5 thingie you like. It only means all that HTML is
@@ -136,7 +136,7 @@ Obsolescence
You may say those are long term issues, or that they won't matter for years. Well,
I believe things should work forever, or as close to it as we can make them.
Nikola's static output and its input files will work as long as you can install
a Python 2.7/3.3 or newer under Linux, Windows, or OS X and can find a server
Python 3.3 or newer under Linux, Windows, or OS X and can find a server
that sends files over HTTP. That's probably 10 or 15 years at least.

Also, static sites are easily handled by the Internet Archive.
@@ -227,7 +227,7 @@ easier to keep it in a single location.
The contents of your post have to be written (by default) in `reStructuredText <http://docutils.sf.net>`__
but you can use a lot of different markups using the ``-f`` option.

Currently, Nikola supports reStructuredText, Markdown, Jupyter (IPython) Notebooks, HTML as input,
Currently, Nikola supports reStructuredText, Markdown, Jupyter Notebooks, HTML as input,
can also use Pandoc for conversion, and has support for BBCode, CreoleWiki, txt2tags, Textile
and more via plugins — for more details, read the `input format documentation
<#multiple-input-formats>`__.
@@ -326,9 +326,6 @@ author
Author of the post, will be used in the RSS feed and possibly in the post
display (theme-dependent)

annotations / noannotations
Override the value of the ``ANNOTATIONS`` option for this specific post or page.

enclosure
Add an enclosure to this post when it's used in RSS. See `more information about enclosures <http://en.wikipedia.org/wiki/RSS_enclosure>`__

@@ -1035,7 +1032,7 @@ Nikola supports multiple input formats. Out of the box, we have compilers avail

* reStructuredText (default and pre-configured)
* `Markdown`_
* `Jupyter/IPython Notebook`_
* `Jupyter Notebook`_
* `HTML`_
* `PHP`_
* anything `Pandoc`_ supports (including Textile, DocBook, LaTeX, MediaWiki,
@@ -1093,12 +1090,12 @@ config option:
Nikola comes with some Markdown Extensions built-in and enabled by default,
namely a gist directive, a podcast directive, and ``~~strikethrough~~`` support.

Jupyter/IPython Notebook
````````````````````````
Jupyter Notebook
````````````````

To use Jupyter Notebooks (previously known as IPython Notebooks) as posts/pages,
make sure ``ipynb`` is in your ``COMPILERS`` and that the ``.ipynb`` extension
is defined in ``POSTS`` and ``PAGES``.
To use Jupyter Notebooks as posts/pages, make sure ``ipynb`` is in your
``COMPILERS`` and that the ``.ipynb`` extension is defined in ``POSTS`` and
``PAGES``.

The ``-f`` argument to ``new_post`` should be used in the ``ipynb@KERNEL`` format.
It defaults to Python in the version used by Nikola if not specified.
@@ -1411,7 +1408,7 @@ CSS tweaking
for minimal disruption of the provided CSS files.

If you feel tempted to touch other files in assets, you probably will be better off
with a `custom theme <theming.html>`__.
with a :doc:`custom theme <theming>`.

If you want to use LESS_ or Sass_ for your custom CSS, or the theme you use
contains LESS or Sass code that you want to override, you will need to install
@@ -1425,7 +1422,7 @@ CSS tweaking

Template tweaking and creating themes
If you really want to change the pages radically, you will want to do a
`custom theme <theming.html>`__.
:doc:`custom theme <theming>`.

Navigation Links
The ``NAVIGATION_LINKS`` option lets you define what links go in a sidebar or menu
@@ -1718,8 +1715,8 @@ GitLab also offers rebuild automation if you want to use Nikola with GitLab
Pages. Check out the example `Nikola site on GitLab
<https://gitlab.com/pages/nikola>`_.

Comments and Annotations
------------------------
Comments
--------

While Nikola creates static sites, there is a minimum level of user interaction you
are probably expecting: comments.
@@ -1799,18 +1796,6 @@ You can disable comments for a post by adding a "nocomments" metadata field to i
You need jQuery, but not because Facebook wants it (see Issue
#639).

An alternative or complement to comments are annotations. Nikola integrates
the annotation service provided by `AnnotateIt. <http://annotateit.org/>`_
To use it, set the ``ANNOTATIONS`` option to True. This is specially useful
if you want feedback on specific parts of your writing.

You can enable or disable annotations for specific posts or pages using the
``annotations`` and ``noannotations`` metadata.

Annotations require jQuery and are therefore not supported in the base theme.
You can check bootstrap theme's ``base.html`` for details on how to handle them in
custom themes.

Images and Galleries
--------------------

@@ -1,3 +1,2 @@
-r ../../requirements-extras.txt
doit
pyparsing>=2.0.2
@@ -39,7 +39,6 @@ Name Type Descript
================================== ================================== ================================================================================
``_link`` function ``Nikola.link`` function
``abs_link`` function ``Nikola.abs_link`` function
``annotations`` bool ``ANNOTATIONS`` setting
``author_pages_generated`` bool False
``blog_author`` TranslatableSetting<str> ``BLOG_AUTHOR`` setting
``blog_description`` TranslatableSetting<str> ``BLOG_DESCRIPTION`` setting
@@ -78,7 +77,7 @@ Name Type Descript
``meta_generator_tag`` bool ``META_GENERATOR_TAG`` setting
``momentjs_locales`` defaultdict<str, str> dictionary of available Moment.js locales
``navigation_links`` TranslatableSetting ``NAVIGATION_LINKS`` setting
``needs_ipython_css`` bool whether or not IPython CSS is needed by this site
``needs_ipython_css`` bool whether or not Jupyter CSS is needed by this site
``posts_sections`` bool ``POSTS_SECTIONS`` setting
``posts_section_are_indexes`` bool ``POSTS_SECTIONS_ARE_INDEXES`` setting
``posts_sections_are_indexes`` bool ``POSTS_SECTIONS_ARE_INDEXES`` setting
@@ -19,7 +19,7 @@ Theming Nikola
.. class:: lead

This document is a reference about themes. If you want a tutorial, please read
`Creating a Theme <creating-a-theme.html>`_. If you’re looking for a ready-made
:doc:`Creating a Theme <creating-a-theme>`. If you’re looking for a ready-made
theme for your site, check out the `Themes Index <https://themes.getnikola.com/>`_.

The Structure
@@ -78,7 +78,7 @@ bundles

.. code:: text

assets/css/all.css=bootstrap.css,rst.css,code.css,colorbox.css,custom.css
assets/css/all.css=bootstrap.css,html4css1.css,nikola_rst.css,code.css,colorbox.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.
@@ -195,9 +195,6 @@ These are the templates that come with the included themes:
Template used to render the multipost indexes. The posts are in a ``posts`` variable.
Some functionality is in the ``index_helper.tmpl`` helper template.

``annotation_helper.tmpl`` (internal)
Code for the optional annotations feature.

``archive_navigation_helper.tmpl``
Code that implements archive navigation (previous/up/next). Included by
archive templates.
@@ -26,11 +26,14 @@

"""Nikola -- a modular, fast, simple, static website generator."""

from __future__ import absolute_import
import os
import sys

__version__ = '7.8.8'
__version__ = '8.0.0.dev0'
DEBUG = bool(os.getenv('NIKOLA_DEBUG'))

if sys.version_info[0] == 2:
raise Exception("Nikola does not support Python 2.")

from .nikola import Nikola # NOQA
from . import plugins # NOQA

0 comments on commit f563501

Please sign in to comment.
You can’t perform that action at this time.