Skip to content
Permalink
Browse files
merged master
  • Loading branch information
ralsina committed Jun 8, 2015
2 parents 1503aaf + c7d4ebd commit b8349d09c25e57d776782d072f1a03ae8957ff32
Showing with 355 additions and 108 deletions.
  1. +9 −0 CHANGES.txt
  2. +1 −1 docs/extending.txt
  3. +1 −1 docs/getting-help.txt
  4. BIN docs/man/nikola.1.gz
  5. +53 −19 docs/manual.txt
  6. +1 −1 docs/social_buttons.txt
  7. +2 −2 docs/sphinx/conf.py
  8. +1 −1 docs/theming.txt
  9. +1 −1 nikola/__init__.py
  10. +10 −8 nikola/data/samplesite/posts/1.rst
  11. +2 −2 nikola/data/themes/base-jinja/templates/base_header.tmpl
  12. +1 −0 nikola/data/themes/base/messages/messages_ar.py
  13. +1 −0 nikola/data/themes/base/messages/messages_az.py
  14. +1 −0 nikola/data/themes/base/messages/messages_bg.py
  15. +1 −0 nikola/data/themes/base/messages/messages_ca.py
  16. +1 −0 nikola/data/themes/base/messages/messages_cs.py
  17. +1 −0 nikola/data/themes/base/messages/messages_da.py
  18. +1 −0 nikola/data/themes/base/messages/messages_de.py
  19. +1 −0 nikola/data/themes/base/messages/messages_el.py
  20. +1 −0 nikola/data/themes/base/messages/messages_en.py
  21. +1 −0 nikola/data/themes/base/messages/messages_eo.py
  22. +1 −0 nikola/data/themes/base/messages/messages_es.py
  23. +1 −0 nikola/data/themes/base/messages/messages_et.py
  24. +1 −0 nikola/data/themes/base/messages/messages_eu.py
  25. +1 −0 nikola/data/themes/base/messages/messages_fa.py
  26. +1 −0 nikola/data/themes/base/messages/messages_fi.py
  27. +1 −0 nikola/data/themes/base/messages/messages_fil.py
  28. +2 −1 nikola/data/themes/base/messages/messages_fr.py
  29. +1 −0 nikola/data/themes/base/messages/messages_gl.py
  30. +1 −0 nikola/data/themes/base/messages/messages_hi.py
  31. +1 −0 nikola/data/themes/base/messages/messages_hr.py
  32. +1 −0 nikola/data/themes/base/messages/messages_id.py
  33. +1 −0 nikola/data/themes/base/messages/messages_it.py
  34. +1 −0 nikola/data/themes/base/messages/messages_ja.py
  35. +1 −0 nikola/data/themes/base/messages/messages_ko.py
  36. +1 −0 nikola/data/themes/base/messages/messages_nb.py
  37. +3 −2 nikola/data/themes/base/messages/messages_nl.py
  38. +1 −0 nikola/data/themes/base/messages/messages_pl.py
  39. +1 −0 nikola/data/themes/base/messages/messages_pt.py
  40. +1 −0 nikola/data/themes/base/messages/messages_pt_br.py
  41. +1 −0 nikola/data/themes/base/messages/messages_ru.py
  42. +1 −0 nikola/data/themes/base/messages/messages_si_lk.py
  43. +1 −0 nikola/data/themes/base/messages/messages_sk.py
  44. +1 −0 nikola/data/themes/base/messages/messages_sl.py
  45. +1 −0 nikola/data/themes/base/messages/messages_sr.py
  46. +1 −0 nikola/data/themes/base/messages/messages_sv.py
  47. +1 −0 nikola/data/themes/base/messages/messages_tl.py
  48. +1 −0 nikola/data/themes/base/messages/messages_tr.py
  49. +1 −0 nikola/data/themes/base/messages/messages_uk.py
  50. +2 −1 nikola/data/themes/base/messages/messages_ur.py
  51. +1 −0 nikola/data/themes/base/messages/messages_zh_cn.py
  52. +1 −0 nikola/data/themes/base/messages/messages_zh_tw.py
  53. +2 −2 nikola/data/themes/base/templates/base_header.tmpl
  54. +2 −2 nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
  55. +2 −2 nikola/data/themes/bootstrap/templates/base_helper.tmpl
  56. +3 −3 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  57. +3 −3 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
  58. +3 −6 nikola/nikola.py
  59. +1 −1 nikola/post.py
  60. +1 −1 setup.py
  61. +2 −2 tests/test_rst_compiler.py
  62. +5 −1 translations/nikola.messages/ar.po
  63. +5 −1 translations/nikola.messages/az.po
  64. +5 −1 translations/nikola.messages/bg.po
  65. +5 −1 translations/nikola.messages/ca.po
  66. +5 −1 translations/nikola.messages/cs.po
  67. +5 −1 translations/nikola.messages/da.po
  68. +5 −1 translations/nikola.messages/de.po
  69. +5 −1 translations/nikola.messages/el.po
  70. +4 −0 translations/nikola.messages/en.po
  71. +5 −1 translations/nikola.messages/eo.po
  72. +6 −2 translations/nikola.messages/es.po
  73. +5 −1 translations/nikola.messages/et.po
  74. +5 −1 translations/nikola.messages/eu.po
  75. +5 −1 translations/nikola.messages/fa.po
  76. +5 −1 translations/nikola.messages/fi.po
  77. +5 −1 translations/nikola.messages/fil.po
  78. +6 −2 translations/nikola.messages/fr.po
  79. +5 −1 translations/nikola.messages/gl.po
  80. +5 −1 translations/nikola.messages/hi.po
  81. +5 −1 translations/nikola.messages/hr.po
  82. +5 −1 translations/nikola.messages/id.po
  83. +5 −1 translations/nikola.messages/it.po
  84. +5 −1 translations/nikola.messages/ja.po
  85. +5 −1 translations/nikola.messages/ko.po
  86. +5 −1 translations/nikola.messages/nb.po
  87. +7 −3 translations/nikola.messages/nl.po
  88. +5 −1 translations/nikola.messages/pl.po
  89. +5 −1 translations/nikola.messages/pt.po
  90. +5 −1 translations/nikola.messages/pt_BR.po
  91. +5 −1 translations/nikola.messages/ru.po
  92. +5 −1 translations/nikola.messages/si_LK.po
  93. +5 −1 translations/nikola.messages/sk.po
  94. +5 −1 translations/nikola.messages/sl.po
  95. +5 −1 translations/nikola.messages/sr.po
  96. +6 −2 translations/nikola.messages/sv.po
  97. +5 −1 translations/nikola.messages/tl.po
  98. +5 −1 translations/nikola.messages/tr.po
  99. +5 −1 translations/nikola.messages/uk.po
  100. +6 −2 translations/nikola.messages/ur.po
  101. +5 −1 translations/nikola.messages/zh_CN.po
  102. +5 −1 translations/nikola.messages/zh_TW.po
@@ -5,6 +5,14 @@ Features
--------

* New ``nikola version --check`` option (Issue #1767)

New in v7.5.0
=============

Features
--------

* Make default themes more accessible (Issue #377)
* Add ipython support to the default themes (Issue #1782)
* Automatically mark ipynb posts/pages as requiring mathjax (Issue #1782)
* New --get-path option for ``nikola install_theme`` (Issue #1762)
@@ -18,6 +26,7 @@ Features
Bugfixes
--------

* Dropped empty languages (fil, tl, zh_TW)
* Extract ``nikola check`` target list from actual task list instead of parsing (Issue #1758)
* Treat special-purpose “draft” tag case-insensitive
* Avoid some rebuild loops (Issue #1747)
@@ -8,7 +8,7 @@
Extending Nikola
================

:Version: 7.4.1
:Version: 7.5.0
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>

.. class:: alert alert-info pull-right
@@ -3,7 +3,7 @@
.. date: 1970-01-01 15:00:00
.. description: Get help using Nikola, or contact us.

:Version: 7.4.1
:Version: 7.5.0

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

BIN +28 Bytes (100%) docs/man/nikola.1.gz
Binary file not shown.
@@ -1,14 +1,13 @@
.. title: The Nikola Handbook
.. slug: handbook
.. date: 2012-03-30 23:00:00 UTC-03:00
.. tags: mathjax
.. link:
.. description:

The Nikola Handbook
===================

:Version: 7.4.1
:Version: 7.5.0

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

@@ -1413,42 +1412,77 @@ different ones, or about other web servers, please share!
#. The USE_CDN option offloads standard JavaScript and CSS files to a CDN so they are not
downloaded from your server.

reStructuredText Extensions
---------------------------
Math
----

Nikola supports math input via MathJax. It is activated via the math roles and
directives of reStructuredText and the usual LaTeX delimiters (``\(inline\)``
and ``\[display\]``) for other input formats.

We **DO NOT** support the old, deprecated and error-prone ``$inline$``
delimiters by default. If you want to use them, please add them manually,
like this:

.. code:: python

"""
MATHJAX_CONFIG = """
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {
inlineMath: [ ['$','$'], ["\\\(","\\\)"] ],
displayMath: [ ['$$','$$'], ["\\\[","\\\]"] ],
processEscapes: true
},
displayAlign: 'left', // Change this to 'center' to center equations.
"HTML-CSS": {
styles: {'.MathJax_Display': {"margin": 0}}
}
});
</script>
"""

Nikola includes support for a few directives and roles that are not part of docutils, but which
we think are handy for website development.
Inline mathematics are produced using the reST `math` **role** or the ``\(…\)`` delimiters:

MathJax
~~~~~~~

Nikola supports math input via MathJax. It uses the usual math roles and
directives of reStructuredText.
Euler’s formula: :math:`e^{ix} = \cos x + i\sin x`

In order to use them in your posts, you **must** add the special ``mathjax`` tag.
In reST:

Inline mathematics (equivalent to single dollar signs or backslash-parentheses
in LaTeX) are produced using the `math` **role**:
.. code:: restructuredtext

Euler’s formula: :math:`e^{ix} = \cos x + i\sin x`
Euler’s formula: :math:`e^{ix} = \cos x + i\sin x`

::
In other input formats::

Euler’s formula: :math:`e^{ix} = \cos x + i\sin x`
Euler’s formula: \(e^{ix} = \cos x + i\sin x\)

Display mathematics (equivalent to double dollar signs or backslash-brackets in
LaTeX) are produced using the `math` **directive**:
Display mathematics are produced using the reST `math` **directive** or the ``\[…\]`` delimiters:

.. math::

\int \frac{dx}{1+ax}=\frac{1}{a}\ln(1+ax)+C


In reST:

::

.. math::

\int \frac{dx}{1+ax}=\frac{1}{a}\ln(1+ax)+C

In other input formats:

::

\[\int \frac{dx}{1+ax}=\frac{1}{a}\ln(1+ax)+C\]

reStructuredText Extensions
---------------------------

Nikola includes support for a few directives and roles that are not part of docutils, but which
we think are handy for website development.

Media
~~~~~

@@ -8,7 +8,7 @@
Using Alternative Social Buttons with Nikola
============================================

:Version: 7.4.1
:Version: 7.5.0

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

@@ -54,9 +54,9 @@
# built documents.
#
# The short X.Y version.
version = '7.4.1'
version = '7.5.0'
# The full version, including alpha/beta/rc tags.
release = '7.4.1'
release = '7.5.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -8,7 +8,7 @@
Theming Nikola
==============

:Version: 7.4.1
:Version: 7.5.0
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>

.. class:: alert alert-info pull-right
@@ -27,7 +27,7 @@
from __future__ import absolute_import
import os

__version__ = "7.4.1"
__version__ = "7.5.0"
DEBUG = bool(os.getenv('NIKOLA_DEBUG'))

from .nikola import Nikola # NOQA
@@ -12,14 +12,16 @@
:class: thumbnail
:alt: Nikola Tesla Corner by nicwest, on Flickr

If you can see this in a web browser, it means you have managed to install Nikola,
If you can see this in a web browser, it means you managed to install Nikola,
and build a site using it. Congratulations!

* You can read the manual `here </stories/handbook.html>`__
* You can learn more about Nikola at https://getnikola.com/
* You can see a demo photo gallery `here </galleries/demo/index.html>`__
* Demo usage of listings `here </stories/listings-demo.html>`__
* Demo of slideshows `here </stories/slides-demo.html>`__
* Demo of Bootstrap `here </stories/bootstrap-demo.html>`__
Next steps:

Send feedback to ralsina@netmanagers.com.ar!
* `Read the manual </stories/handbook.html>`__
* `Visit the Nikola website to learn more <https://getnikola.com>`__
* `See a demo photo gallery </galleries/demo/index.html>`__
* `See a demo listing </stories/listings-demo.html>`__
* `See a demo slideshow </stories/slides-demo.html>`__
* `See a demo of the Bootstrap theme </stories/bootstrap-demo.html>`__

Send feedback to info@getnikola.com!
@@ -36,15 +36,15 @@
<ul>
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text }}</a></li>
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a></li>
{% else %}
<li><a href="{{ suburl }}">{{ text }}</a></li>
{% endif %}
{% endfor %}
</ul>
{% else %}
{% if rel_link(permalink, url) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text }}</a></li>
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a></li>
{% else %}
<li><a href="{{ url }}">{{ text }}</a></li>
{% endif %}
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "أيضا متوفر في:",
"Archive": "الأرشيف",
"Categories": "فئات",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d dəqiqəlik oxuma",
"(active)": "",
"Also available in:": "Həmçinin mövcuddur:",
"Archive": "Arxiv",
"Categories": "Kateqoriyalar",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "Също достъпно в:",
"Archive": "Архив",
"Categories": "Категории",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "% min recordar per a llegir",
"(active)": "",
"Also available in:": "També disponibles en:",
"Archive": "Arxiu",
"Categories": "Categories",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d min zbývajících",
"(active)": "",
"Also available in:": "Dostupné také v",
"Archive": "Archiv",
"Categories": "Kategorie",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d min. tilbage at læse",
"(active)": "",
"Also available in:": "Fås også i:",
"Archive": "Arkiv",
"Categories": "Kategorier",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d min verbleiben zum Lesen",
"(active)": "",
"Also available in:": "Auch verfügbar in:",
"Archive": "Archiv",
"Categories": "Kategorien",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "Διαθέσιμο και στα:",
"Archive": "Αρχείο",
"Categories": "Κατηγορίες",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d min remaining to read",
"(active)": "(active)",
"Also available in:": "Also available in:",
"Archive": "Archive",
"Categories": "Categories",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "Ankaŭ disponebla en:",
"Archive": "Arĥivo",
"Categories": "Kategorioj",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "quedan %d minutos de lectura",
"(active)": "",
"Also available in:": "También disponible en:",
"Archive": "Archivo",
"Categories": "Categorías",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "Saadaval ka:",
"Archive": "Arhiiv",
"Categories": "Kategooriad",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "Eskuragarria hemen ere:",
"Archive": "Artxiboa",
"Categories": "Kategoriak",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d دقیقه برای خواندن باقی مانده",
"(active)": "",
"Also available in:": "همچنین قابل دسترس از:",
"Archive": "آرشیو",
"Categories": "دسته‌ها",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "%d minuuttia lukuaikaa",
"(active)": "",
"Also available in:": "Saatavilla myös:",
"Archive": "Arkisto",
"Categories": "Kategoriat",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "",
"Archive": "",
"Categories": "",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "Il reste encore %d min. de lecture",
"(active)": "",
"Also available in:": "Également disponible en:",
"Archive": "Archives",
"Categories": "Catégories",
@@ -28,7 +29,7 @@
"Read more": "Lire la suite",
"Skip to main content": "Aller au contenu principal",
"Source": "Source",
"Subcategories:": "",
"Subcategories:": "Sous-catégories",
"Tags and Categories": "Étiquettes et catégories",
"Tags": "Étiquettes",
"old posts, page %d": "anciens articles, page %d",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "",
"(active)": "",
"Also available in:": "",
"Archive": "",
"Categories": "",
@@ -3,6 +3,7 @@

MESSAGES = {
"%d min remaining to read": "पढ़ने में %d मिनट बाकी",
"(active)": "",
"Also available in:": "उपलब्ध भाषाएँ:",
"Archive": "आर्काइव",
"Categories": "श्रेणियाँ",

0 comments on commit b8349d0

Please sign in to comment.