merged master

getnikola · Jun 8, 2015 · b8349d0 · b8349d0
2 parents 1503aaf + c7d4ebd
commit b8349d0
Show file tree

Hide file tree

Showing 102 changed files with 355 additions and 108 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -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)

diff --git a/docs/extending.txt b/docs/extending.txt
@@ -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

diff --git a/docs/getting-help.txt b/docs/getting-help.txt
@@ -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
 

diff --git a/docs/man/nikola.1.gz b/docs/man/nikola.1.gz
diff --git a/docs/manual.txt b/docs/manual.txt
@@ -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
 ~~~~~
 

diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt
@@ -8,7 +8,7 @@
 Using Alternative Social Buttons with Nikola
 ============================================
 
-:Version: 7.4.1
+:Version: 7.5.0
 
 .. class:: alert alert-info pull-right
 

diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -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.

diff --git a/docs/theming.txt b/docs/theming.txt
@@ -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

diff --git a/nikola/__init__.py b/nikola/__init__.py
@@ -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

diff --git a/nikola/data/samplesite/posts/1.rst b/nikola/data/samplesite/posts/1.rst
@@ -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!
diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl
@@ -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 %}

diff --git a/nikola/data/themes/base/messages/messages_ar.py b/nikola/data/themes/base/messages/messages_ar.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "أيضا متوفر في:",
     "Archive": "الأرشيف",
     "Categories": "فئات",

diff --git a/nikola/data/themes/base/messages/messages_az.py b/nikola/data/themes/base/messages/messages_az.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_bg.py b/nikola/data/themes/base/messages/messages_bg.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "Също достъпно в:",
     "Archive": "Архив",
     "Categories": "Категории",

diff --git a/nikola/data/themes/base/messages/messages_ca.py b/nikola/data/themes/base/messages/messages_ca.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_cs.py b/nikola/data/themes/base/messages/messages_cs.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_da.py b/nikola/data/themes/base/messages/messages_da.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_de.py b/nikola/data/themes/base/messages/messages_de.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_el.py b/nikola/data/themes/base/messages/messages_el.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "Διαθέσιμο και στα:",
     "Archive": "Αρχείο",
     "Categories": "Κατηγορίες",

diff --git a/nikola/data/themes/base/messages/messages_en.py b/nikola/data/themes/base/messages/messages_en.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_eo.py b/nikola/data/themes/base/messages/messages_eo.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "Ankaŭ disponebla en:",
     "Archive": "Arĥivo",
     "Categories": "Kategorioj",

diff --git a/nikola/data/themes/base/messages/messages_es.py b/nikola/data/themes/base/messages/messages_es.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_et.py b/nikola/data/themes/base/messages/messages_et.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "Saadaval ka:",
     "Archive": "Arhiiv",
     "Categories": "Kategooriad",

diff --git a/nikola/data/themes/base/messages/messages_eu.py b/nikola/data/themes/base/messages/messages_eu.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "Eskuragarria hemen ere:",
     "Archive": "Artxiboa",
     "Categories": "Kategoriak",

diff --git a/nikola/data/themes/base/messages/messages_fa.py b/nikola/data/themes/base/messages/messages_fa.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "%d دقیقه برای خواندن باقی مانده",
+    "(active)": "",
     "Also available in:": "همچنین قابل دسترس از:",
     "Archive": "آرشیو",
     "Categories": "دسته‌ها",

diff --git a/nikola/data/themes/base/messages/messages_fi.py b/nikola/data/themes/base/messages/messages_fi.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "%d minuuttia lukuaikaa",
+    "(active)": "",
     "Also available in:": "Saatavilla myös:",
     "Archive": "Arkisto",
     "Categories": "Kategoriat",

diff --git a/nikola/data/themes/base/messages/messages_fil.py b/nikola/data/themes/base/messages/messages_fil.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "",
     "Archive": "",
     "Categories": "",

diff --git a/nikola/data/themes/base/messages/messages_fr.py b/nikola/data/themes/base/messages/messages_fr.py
@@ -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",

diff --git a/nikola/data/themes/base/messages/messages_gl.py b/nikola/data/themes/base/messages/messages_gl.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "",
+    "(active)": "",
     "Also available in:": "",
     "Archive": "",
     "Categories": "",

diff --git a/nikola/data/themes/base/messages/messages_hi.py b/nikola/data/themes/base/messages/messages_hi.py
@@ -3,6 +3,7 @@
 
 MESSAGES = {
     "%d min remaining to read": "पढ़ने में %d मिनट बाकी",
+    "(active)": "",
     "Also available in:": "उपलब्ध भाषाएँ:",
     "Archive": "आर्काइव",
     "Categories": "श्रेणियाँ",