Skip to content

Commit 2f80f0b

Browse files
KwpolskaKwpolska
committedJul 15, 2015
merge master
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
2 parents 0a7fec4 + 493c495 commit 2f80f0b

File tree

9 files changed

+175
-39
lines changed

9 files changed

+175
-39
lines changed
 

Diff for: ‎conf.py

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
POSTS = (
3131
("posts/*.txt", "blog", "post.tmpl"),
3232
("posts/*.rst", "blog", "post.tmpl"),
33+
("posts/*.md", "blog", "post.tmpl"),
3334
)
3435

3536
PAGES = (

Diff for: ‎listings/conf.py

+7-28
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
BLOG_AUTHOR = "Your Name" # (translatable)
2121
BLOG_TITLE = "Demo Site" # (translatable)
2222
# This is the main URL for your site. It will be used
23-
# in a prominent link
23+
# in a prominent link. Don't forget the protocol (http/https)!
2424
SITE_URL = "https://example.com/"
2525
# This is the URL where Nikola's output will be deployed.
2626
# If not set, defaults to SITE_URL
@@ -293,7 +293,7 @@
293293
# "blogging": "Meta-blog posts about blogging about blogging.",
294294
# "open source": "My contributions to my many, varied, ever-changing, and eternal libre software projects."
295295
# },
296-
#}
296+
# }
297297

298298

299299
# If you do not want to display a tag publicly, you can mark it as hidden.
@@ -319,10 +319,10 @@
319319
# using a forward slash ('/') to separate paths. Use a backslash ('\') to escape
320320
# a forward slash or a backslash (i.e. '\//\\' is a path specifying the
321321
# subcategory called '\' of the top-level category called '/').
322-
# CATEGORY_ALLOW_HIERARCHIES = False
322+
CATEGORY_ALLOW_HIERARCHIES = False
323323
# If CATEGORY_OUTPUT_FLAT_HIERARCHY is set to True, the output written to output
324324
# contains only the name of the leaf category and not the whole path.
325-
# CATEGORY_OUTPUT_FLAT_HIERARCHY = False
325+
CATEGORY_OUTPUT_FLAT_HIERARCHY = False
326326

327327
# If CATEGORY_PAGES_ARE_INDEXES is set to True, each category's page will contain
328328
# the posts themselves. If set to False, it will be just a list of links.
@@ -336,7 +336,7 @@
336336
# "blogging": "Meta-blog posts about blogging about blogging.",
337337
# "open source": "My contributions to my many, varied, ever-changing, and eternal libre software projects."
338338
# },
339-
#}
339+
# }
340340

341341
# If you do not want to display a category publicly, you can mark it as hidden.
342342
# The category will not be displayed on the category list page.
@@ -716,8 +716,7 @@
716716
# (Uses the INDEX_FILE setting, so if that is, say, default.html,
717717
# it will instead /foo/default.html => /foo)
718718
# (Note: This was briefly STRIP_INDEX_HTML in v 5.4.3 and 5.4.4)
719-
# Default = False
720-
# STRIP_INDEXES = False
719+
STRIP_INDEXES = False
721720

722721
# Should the sitemap list directories which only include other directories
723722
# and no files.
@@ -882,7 +881,7 @@
882881
# <input type="text" name="q" maxlength="255" results="0" placeholder="Search"/>
883882
# </form>
884883
# <!-- End of custom search -->
885-
#""" % SITE_URL
884+
# """ % SITE_URL
886885

887886
# Use content distribution networks for jQuery, twitter-bootstrap css and js,
888887
# and html5shiv (for older versions of Internet Explorer)
@@ -987,26 +986,6 @@
987986
# sometimes crash Nikola, your web server, or eat your cat.
988987
# USE_SLUGIFY = True
989988

990-
# You can configure the logging handlers installed as plugins or change the
991-
# log level of the default stderr handler.
992-
# WARNING: The stderr handler allows only the loglevels of 'INFO' and 'DEBUG'.
993-
# This is done for safety reasons, as blocking out anything other
994-
# than 'DEBUG' may hide important information and break the user
995-
# experience!
996-
997-
LOGGING_HANDLERS = {
998-
'stderr': {'loglevel': 'INFO', 'bubble': True},
999-
# 'smtp': {
1000-
# 'from_addr': 'test-errors@example.com',
1001-
# 'recipients': ('test@example.com'),
1002-
# 'credentials':('testusername', 'password'),
1003-
# 'server_addr': ('127.0.0.1', 25),
1004-
# 'secure': (),
1005-
# 'level': 'DEBUG',
1006-
# 'bubble': True
1007-
# }
1008-
}
1009-
1010989
# Templates will use those filters, along with the defaults.
1011990
# Consult your engine's documentation on filters if you need help defining
1012991
# those.

Diff for: ‎posts/nikola-761-is-out.txt

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
.. title: Nikola 7.6.1 is out
2+
.. slug: nikola-761-is-out
3+
.. date: 2015-07-15 15:18:22 UTC
4+
.. tags:
5+
.. category:
6+
.. link:
7+
.. description:
8+
.. type: text
9+
10+
On behalf of the Nikola team, I am pleased to announce the immediate availability of Nikola v7.6.1. It fixes some bugs and adds new features.
11+
12+
What is Nikola?
13+
===============
14+
15+
Nikola is a static site and blog generator, written in Python.
16+
It can use Mako and Jinja2 templates, and input in many popular markup formats, such as reStructuredText and Markdown — and can even turn Jupyter (IPython) Notebooks into blog posts! It also supports image galleries, and is multilingual. Nikola is flexible, and page builds are extremely fast, courtesy of doit (which is rebuilding only what has been changed).
17+
18+
Find out more at the website: https://getnikola.com/
19+
20+
Key Changes since v7.6.0
21+
========================
22+
23+
* Many Wordpress importer improvements
24+
* Modern reST stylesheets, based in part on Bootstrap 3 (Issue #1150)
25+
26+
Downloads
27+
=========
28+
29+
Get it on [GitHub][] and [PyPI][].
30+
31+
[GitHub]: https://github.com/getnikola/nikola/releases/tag/v7.6.1
32+
[PyPI]: https://pypi.python.org/pypi/Nikola/7.6.1
33+
34+
Changes
35+
=======
36+
37+
Features
38+
--------
39+
40+
* Several improvements to WordPress importer (PR #1867):
41+
* Allowing to export categories and category hierarchy with
42+
--export-categories-as-categories
43+
* Allowing to exclude private posts, and allowing to include empty posts
44+
* Allowing to use HTTP authentication for downloads with --download-auth
45+
(PR #1848)
46+
* Allowing to export comments with --export-comments
47+
* Allowing to use WordPress page compiler to directly convert posts
48+
to HTML on import with --transform-to-html
49+
* Allowing to use WordPress page compiler on imported site instead of
50+
converting posts to markdown with --use-wordpress-compiler
51+
* Allowing to automatically install the WordPress page compiler when
52+
needed with --install-wordpress-compiler
53+
* Exporting information on attachments per post as JSON (#1867 and #1888)
54+
* Exporting post status and excerpt
55+
* New ‘pagekind’ variable available to identify different kind of pages from theme templates
56+
* Add ``--no-server`` option to ``nikola auto`` (Issue #1883)
57+
* Always return unicode in slugify (Issue #1885)
58+
* Remove logging handlers (Issue #1797)
59+
* Add ``-d``, ``--detach`` option to ``nikola serve`` (Issue #1871)
60+
* Use provided teaser format (``*_READ_MORE_LINK``) with custom teaser text
61+
(Issue #1879)
62+
* Delete old ``bootstrap`` theme (use ``bootstrap3`` instead)
63+
* Screen reader-friendly navbar collapses and dropdowns (Issue #1863)
64+
* Modern reST stylesheets, based in part on Bootstrap 3 (Issue #1150)
65+
66+
Bugfixes
67+
--------
68+
69+
* Add missing ``xmlns:xhtml`` namespace to sitemaps (Issue #1890)
70+
* Fixed superfluous rebuild problems with Python 3. Note that this will cause
71+
rebuilds for most sites. (Issue #1887)
72+
* Fix links in sample post (Issue #1874)
73+
* Don't use deprecated Yapsy methods (Isue #1868)
74+
* Surpress wincing when auto is aborted during rebuilding
75+
* Show tags only from the current language on tag listing pages (Issue #1856)
76+
* Remove gap between line numbers and code (Issue #1859)
77+
* Fix spurious warnings about posts published in the future (Issue #1850)
78+
79+

Diff for: ‎stories/CHANGES.txt

+45
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
New in v7.6.1
2+
=============
3+
4+
Features
5+
--------
6+
7+
* Several improvements to WordPress importer (PR #1867):
8+
* Allowing to export categories and category hierarchy with
9+
--export-categories-as-categories
10+
* Allowing to exclude private posts, and allowing to include empty posts
11+
* Allowing to use HTTP authentication for downloads with --download-auth
12+
(PR #1848)
13+
* Allowing to export comments with --export-comments
14+
* Allowing to use WordPress page compiler to directly convert posts
15+
to HTML on import with --transform-to-html
16+
* Allowing to use WordPress page compiler on imported site instead of
17+
converting posts to markdown with --use-wordpress-compiler
18+
* Allowing to automatically install the WordPress page compiler when
19+
needed with --install-wordpress-compiler
20+
* Exporting information on attachments per post as JSON (#1867 and #1888)
21+
* Exporting post status and excerpt
22+
* New ‘pagekind’ variable available to identify different kind of pages from theme templates
23+
* Add ``--no-server`` option to ``nikola auto`` (Issue #1883)
24+
* Always return unicode in slugify (Issue #1885)
25+
* Remove logging handlers (Issue #1797)
26+
* Add ``-d``, ``--detach`` option to ``nikola serve`` (Issue #1871)
27+
* Use provided teaser format (``*_READ_MORE_LINK``) with custom teaser text
28+
(Issue #1879)
29+
* Delete old ``bootstrap`` theme (use ``bootstrap3`` instead)
30+
* Screen reader-friendly navbar collapses and dropdowns (Issue #1863)
31+
* Modern reST stylesheets, based in part on Bootstrap 3 (Issue #1150)
32+
33+
Bugfixes
34+
--------
35+
36+
* Add missing ``xmlns:xhtml`` namespace to sitemaps (Issue #1890)
37+
* Fixed superfluous rebuild problems with Python 3. Note that this will cause
38+
rebuilds for most sites. (Issue #1887)
39+
* Fix links in sample post (Issue #1874)
40+
* Don't use deprecated Yapsy methods (Isue #1868)
41+
* Surpress wincing when auto is aborted during rebuilding
42+
* Show tags only from the current language on tag listing pages (Issue #1856)
43+
* Remove gap between line numbers and code (Issue #1859)
44+
* Fix spurious warnings about posts published in the future (Issue #1850)
45+
146
New in v7.6.0
247
=============
348

Diff for: ‎stories/conf.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
.. description: The Nikola configuration file.
55
.. type: text
66

7-
The default config file for Nikola v7.6.0 is reproduced below.
7+
The default config file for Nikola v7.6.1 is reproduced below.
88

99
.. listing:: conf.py python

Diff for: ‎stories/extending.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Extending Nikola
99
================
1010

11-
:Version: 7.6.0
11+
:Version: 7.6.1
1212
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>
1313

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

Diff for: ‎stories/manual.txt

+39-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
The Nikola Handbook
88
===================
99

10-
:Version: 7.6.0
10+
:Version: 7.6.1
1111

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

@@ -1758,15 +1758,47 @@ the following:
17581758

17591759
This is also useful for DISQUS thread migration!
17601760

1761-
* Will try to convert the content of your posts. This is *not* error free, because
1762-
WordPress uses some unholy mix of HTML and strange things. Currently we are treating it
1763-
as markdown, which does a reasonable job of it.
1761+
* Allows you to export your comments with each post
1762+
* Exports information on attachments per post
1763+
* There are different methods to transfer the content of your posts:
17641764

1765-
You will find your old posts in ``new_site/posts/post-title.wp`` in case you need to fix
1766-
any of them.
1765+
- You can convert them to HTML with the WordPress page compiler plugin
1766+
for Nikola. This will format the posts including supported shortcodes
1767+
the same way as WordPress does. Use the ``--transform-to-html`` option
1768+
to convert your posts to HTML.
1769+
1770+
If you use this option, you do not need to install the plugin
1771+
permanently. You can ask Nikola to install the plugin into the subdirectory
1772+
``plugins`` of the current working directory by specifying
1773+
the ``--install-wordpress-compiler`` option.
1774+
1775+
- You can leave the posts the way they are and use the WordPress page
1776+
compiler plugin to render them when building your new blog. This also
1777+
allows you to create new posts using the WordPress syntax, or to manually
1778+
add more shortcode plugins later. Use the ``--use-wordpress-compiler``
1779+
option to not touch your posts.
1780+
1781+
If you want to use this option, you have to install the plugin permanently.
1782+
You can ask Nikola to install the plugin into your new site by specifying
1783+
the ``--install-wordpress-compiler`` option.
1784+
1785+
- You can let Nikola convert your posts to Markdown. This is *not* error
1786+
free, because WordPress uses some unholy mix of HTML and strange things.
1787+
This is the default option and requires no plugins.
1788+
1789+
You will find your old posts in ``new_site/posts/post-title.html`` in the first case,
1790+
``new_site/posts/post-title.wp`` in the second case or ``new_site/posts/post-title.md``
1791+
in the last case if you need to edit or fix any of them.
1792+
1793+
Please note that the page compiler currently only supports the ``[code]`` shortcode,
1794+
but other shortcodes can be supported via plugins.
1795+
1796+
Also note that the WordPress page compiler is licensed under GPL v2 since
1797+
it uses code from WordPress itself, while Nikola is licensed under the more
1798+
liberal MIT license.
17671799

17681800
This feature is a work in progress, and the only way to improve it is to have it used for
1769-
as many sites as possible and make it work better each time, so I am happy to get requests
1801+
as many sites as possible and make it work better each time, so we are happy to get requests
17701802
about it.
17711803

17721804
.. [#] The dump needs to be in 1.2 format. You can check by reading it, it should say

Diff for: ‎stories/social_buttons.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Using Alternative Social Buttons with Nikola
99
============================================
1010

11-
:Version: 7.6.0
11+
:Version: 7.6.1
1212

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

Diff for: ‎stories/theming.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Theming Nikola
99
==============
1010

11-
:Version: 7.6.0
11+
:Version: 7.6.1
1212
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>
1313

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

0 commit comments

Comments
 (0)
Please sign in to comment.