1
0
Fork 0
forked from github/pelican
Commit graph

740 commits

Author SHA1 Message Date
Justin Mayer
7056622322 Fix missing SITEURL and base home link
1. Following up on bbinet's changes in f12a297, ensure that the notmyidea
theme's article.html template includes the SITEURL variable when
constructing URL links.

2. Add missing slash to the base.html template so that clicking on the
site header at top left refers to "/" instead of "" when SITEURL is not
defined. Otherwise, the "" target will cause the browser to load the
current page and not the site's root (as one would expect).
2012-11-27 16:01:05 -08:00
Bruno Binet
fa82e19c1f change default value for DEFAULT_DATE to None
(was 'fs' => guess from file mtime)
2012-11-28 00:29:51 +01:00
Bruno Binet
801bc755b5 Merge branch 'pr/558'
Conflicts:
	docs/settings.rst
	pelican/signals.py
2012-11-23 15:32:17 +01:00
Alexis Métaireau
587184c778 trim the blocks when generating templates. 2012-11-21 16:38:27 +01:00
Alexis Metaireau
6adfec2bd5 Merge pull request #589 from tpievila/translated_pages
List of translations for simple and notmyidea pages
2012-11-21 07:13:26 -08:00
Tomi Pieviläinen
429991c3f9 List of translations for simple and notmyidea pages 2012-11-21 15:45:50 +02:00
Bruno Binet
a9cdf3c5a1 remove old import statement 2012-11-21 14:24:40 +01:00
Simon
f413a8da79 Change webassets configuration for relative urls.
Set the ASSET_URL to be relative to the 'theme/' url, which requires to use
{{ SITEURL }}/{{ ASSET_URL }} in the template and make it works with both
relative and absolute urls.
2012-11-20 23:42:52 +01:00
Simon
00d1ea6157 Use the new generator_init signal for the assets plugin.
This allows to have the assets_environment in all generators.
2012-11-20 23:42:41 +01:00
Simon
09c893f3a3 Add a new signal generator_init, invoked at the end of Generator.__init__. 2012-11-20 23:42:31 +01:00
Erik Hetzner
6d745f32c0 add preread signal 2012-11-14 22:12:46 -08:00
Bruno Binet
c787e02dcc Merge branch 'pr/555'
Conflicts:
	pelican/contents.py
2012-11-13 01:23:31 +01:00
jawher
1b81f8b830 Move SITEURL check for feed generation from generators.py to settings.py 2012-11-12 23:01:17 +01:00
jawher
13f444260c Avoid iterating over all settings keys to detect if a feed is enabled 2012-11-12 23:01:17 +01:00
jawher
8a72b11e3d code style: remove unnecessary trailing \ 2012-11-12 23:01:17 +01:00
jawher
b6db45420c Default to using FEED_ALL_ATOM instead of FEED_ATOM (and likewise for RSS) in the notmyidea theme 2012-11-12 23:01:17 +01:00
jawher
fd18f2efa9 Generate links for FEED_ALL_ATOM and FEED_ALL_RSS in the simple them's head. 2012-11-12 23:01:17 +01:00
jawher
93905e828d Split long if condition in 2 lines 2012-11-12 23:01:17 +01:00
jawher
537e9df3ed Reworked the "unset feed_domain" warning to handle all feed variables 2012-11-12 23:01:16 +01:00
jawher
5593670759 The default settings sets up FEED_ALL_ATOM (instead of FEED_ATOM) to all.atom.xml 2012-11-12 23:01:16 +01:00
jawher
c7d87feec3 Reverted FEED_ATOM and FEED_RSS to their original behaviour and added FEED_ALL_ATOM and FEED_ALL_RSS
FEED_(ATOM|RSS) generated feeds include the version in the default language of a translated article,
whereas FEED_ALL(ATOM|RSS) would include *really* all posts, regardless of their language.
2012-11-12 23:01:16 +01:00
jawher
593acfc37a Remove comment 2012-11-12 23:01:16 +01:00
jawher
721a422e5e The all Atom and RSS feed generators should include all articles, regardless of the article's language or the site's. Fixes #550. 2012-11-12 23:01:16 +01:00
Simon
4cfb0cd24e Move Webassets in a plugin 2012-11-07 00:17:50 +01:00
Bruno Binet
dfa69fd383 Merge branch 'pr/571' (closes #571)
Conflicts:
	docs/changelog.rst
2012-11-06 23:54:08 +01:00
Simon
1b20319074 add a warning for the users of the LESS_GENERATOR setting 2012-11-05 21:56:18 +01:00
Simon
d0f5875f66 remove the LessCSSGenerator and the related config option 2012-11-05 21:51:27 +01:00
David Beitey
1b23a4a8e1 Merge remote-tracking branch 'davidjb/decode-html-wp-titles' into wp-import-improvements
Conflicts:
	docs/changelog.rst
2012-11-04 14:09:25 +10:00
David Beitey
528747684d Split post content on all types of line endings for adding paragraph tags 2012-11-04 14:08:58 +10:00
David Beitey
121bc0ad5e Optimize social icons 2012-11-04 12:49:05 +10:00
David Beitey
9fdd378687 Add Google+ social icon 2012-11-04 12:25:02 +10:00
David Beitey
41d3a1e8dd Merge branch 'github-social-icon' into improved-icons
Conflicts:
	docs/changelog.rst
2012-11-04 12:09:28 +10:00
David Beitey
705ab7b0f8 Improve linkedin icon 2012-11-03 22:27:33 +10:00
David Beitey
4afc32c425 GitHub icon also works for git.io addresses in social 2012-11-03 22:21:02 +10:00
David Beitey
868ef2079c Add GitHub social icon support in default theme
Conflicts:
	docs/changelog.rst
2012-11-03 22:13:26 +10:00
David Beitey
e2c3701757 Decode HTML entities in titles on WP import 2012-11-03 21:55:56 +10:00
Alexis Métaireau
bfc963a065 We pass lists, not dicst! 2012-10-30 18:57:06 +01:00
Alexis Métaireau
ac85e9c819 Merge branch 'pr/223' 2012-10-30 11:18:24 +01:00
Bruno Binet
54eee3f28a update TemplatePagesGenerator:
* bugfix: now supports custom path for path where to find the content files
* TEMPLATE_PAGES settings is now of the form:
    { 'jinja2/src/file.html': 'dest/file.html' }
* update doc
2012-10-30 09:56:10 +01:00
Bruno Binet
e0e1b3eecf rename STATIC_PAGES to TEMPLATE_PAGES 2012-10-30 09:56:10 +01:00
Tarek Ziade
a91f1cab5d activate the static page generator only if the option is used
Conflicts:
	pelican/__init__.py
2012-10-30 09:56:10 +01:00
Tarek Ziade
7127676f71 added a static pages generator
Conflicts:
	pelican/__init__.py
	pelican/generators.py
	pelican/settings.py
2012-10-30 09:56:08 +01:00
Alexis Métaireau
84c708b74b Revert "Get HtmlReader to work again"
This reverts commit 39db9ddcfd.

Conflicts:

	tests/test_readers.py
2012-10-29 00:36:42 +01:00
Alexis Métaireau
92d8208309 Merge branch 'master' of github.com:getpelican/pelican 2012-10-28 23:50:49 +01:00
Martin Brochhaus
47c972e21a Added USE_FOLDER_AS_CATEGORY setting.
This allows users to organize their files in ways where the subfolder name
would not make a good category name (i.e. /2012/09/). Set this to ``False``
and the subfolder will no longer be used as a standard category,
`DEFAULT_CATEGORY` will be used instead.
2012-10-28 20:43:45 +01:00
Brendan Wholihan
f7a2f8ea47 Removed AUTHOR defaulting to OS User /John Doe, so both a blank or undefined (None) author is possible.
Reverted templates back to checking author object, since a None object is possible. Name could be checked for blank if required
ATOM spec states an author element should be provided, so passes a blank name if not specified
Updated unit test
2012-10-26 18:20:05 +01:00
Alexis Métaireau
0ebba1c4ab merge with master 2012-10-25 14:54:19 +02:00
Alexis Métaireau
dd299d272b merge win-encoding 2012-10-25 14:47:57 +02:00
Bruno Binet
324c7c3674 Merge branch 'bstpierre-files-to-copy-missing-dir' 2012-10-25 14:25:03 +02:00
Bruno Binet
b6cc6bd2d4 remove useless try/except clause
exception will be caught and logged later in Pelican stack
2012-10-25 14:24:17 +02:00