diff --git a/docs/contribute.rst b/docs/contribute.rst
index fcf8d5c0..0090dd07 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -39,6 +39,14 @@ The tests live in "pelican/tests" and you can run them using the
$ unit2 discover
+If you have made changes that affect the output of a pelican generated weblog,
+then you should update the output used by functional tests.
+To do so, you can use the 2 following commands::
+
+ $ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
+ samples/content/
+ $ LC_ALL="C" USER="Dummy Author" pelican -o tests/output/basic/ samples/content/
+
Coding standards
================
diff --git a/docs/faq.rst b/docs/faq.rst
index a3829d65..3eec6e84 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -49,3 +49,14 @@ install it. You can do so by typing::
In case you don't have pip installed, consider installing it via::
$ (sudo) easy_install pip
+
+How do I assign custom templates on a per page basis?
+=====================================================
+
+It's as simple as adding an extra line of metadata to any pages or articles you
+want to have it's own template.
+
+ :template: template_name
+
+Then just make sure to have the template installed in to your theme as
+``template_name.html``.
\ No newline at end of file
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index fadaf258..895802d6 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -133,8 +133,12 @@ Pelican est fournit avec :doc:`pelican-themes`, un script permettant de gérer l
Paramètres divers
=================
-FALLBACK_ON_FS_DATE :
- Si *True*, Pelican se basera sur le *mtime* du fichier s'il n'y a pas de date spécifiée dans le fichier de l'article ;
+DEFAULT_DATE:
+ Date par défaut à utiliser si l'information de date n'est pas spécifiée
+ dans les metadonnées de l'article.
+ Si 'fs', Pelican se basera sur le *mtime* du fichier.
+ Si c'est un tuple, il sera passé au constructeur datetime.datetime pour
+ générer l'objet datetime utilisé par défaut.
KEEP_OUTPUT DIRECTORY :
Ne génère que les fichiers modifiés et n'efface pas le repertoire de sortie ;
diff --git a/docs/settings.rst b/docs/settings.rst
index 3c557e87..0a1af584 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -33,9 +33,13 @@ Setting name (default value) What doe
`DISPLAY_PAGES_ON_MENU` (``True``) Whether to display pages on the menu of the
template. Templates may or not honor this
setting.
-`FALLBACK_ON_FS_DATE` (``True``) If True, Pelican will use the file system
+`DEFAULT_DATE` (``fs``) The default date you want to use.
+ If 'fs', Pelican will use the file system
timestamp information (mtime) if it can't get
date information from the metadata.
+ If tuple object, it will instead generate the
+ default datetime object by passing the tuple to
+ the datetime.datetime constructor.
`JINJA_EXTENSIONS` (``[]``) A list of any Jinja2 extensions you want to use.
`DELETE_OUTPUT_DIRECTORY` (``False``) Delete the content of the output directory before
generating new files.
diff --git a/pelican/contents.py b/pelican/contents.py
index b8bb0993..a5e3be8f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -21,6 +21,7 @@ class Page(object):
:param content: the string to parse, containing the original content.
"""
mandatory_properties = ('title',)
+ default_template = 'page'
def __init__(self, content, metadata=None, settings=None,
filename=None):
@@ -44,6 +45,9 @@ class Page(object):
# also keep track of the metadata attributes available
self.metadata = local_metadata
+ #default template if it's not defined in page
+ self.template = self._get_template()
+
# default author to the one in settings if not defined
if not hasattr(self, 'author'):
if 'AUTHOR' in settings:
@@ -153,9 +157,16 @@ class Page(object):
url = property(functools.partial(get_url_setting, key='url'))
save_as = property(functools.partial(get_url_setting, key='save_as'))
+ def _get_template(self):
+ if hasattr(self, 'template') and self.template is not None:
+ return self.template
+ else:
+ return self.default_template
+
class Article(Page):
mandatory_properties = ('title', 'date', 'category')
+ default_template = 'article'
class Quote(Page):
diff --git a/pelican/generators.py b/pelican/generators.py
index 3706a70c..0258543e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -168,11 +168,9 @@ class ArticlesGenerator(Generator):
def generate_articles(self, write):
"""Generate the articles."""
- article_template = self.get_template('article')
for article in chain(self.translations, self.articles):
- write(article.save_as,
- article_template, self.context, article=article,
- category=article.category)
+ write(article.save_as, self.get_template(article.template),
+ self.context, article=article, category=article.category)
def generate_direct_templates(self, write):
"""Generate direct templates pages"""
@@ -223,10 +221,10 @@ class ArticlesGenerator(Generator):
def generate_drafts(self, write):
"""Generate drafts pages."""
- article_template = self.get_template('article')
for article in self.drafts:
- write('drafts/%s.html' % article.slug, article_template,
- self.context, article=article, category=article.category)
+ write('drafts/%s.html' % article.slug,
+ self.get_template(article.template), self.context,
+ article=article, category=article.category)
def generate_pages(self, writer):
"""Generate the pages on the disk"""
@@ -273,9 +271,13 @@ class ArticlesGenerator(Generator):
if category != '':
metadata['category'] = Category(category, self.settings)
- if 'date' not in metadata and self.settings['FALLBACK_ON_FS_DATE']:
+ if 'date' not in metadata and self.settings['DEFAULT_DATE']:
+ if self.settings['DEFAULT_DATE'] == 'fs':
metadata['date'] = datetime.datetime.fromtimestamp(
- os.stat(f).st_ctime)
+ os.stat(f).st_ctime)
+ else:
+ metadata['date'] = datetime.datetime(
+ *self.settings['DEFAULT_DATE'])
signals.article_generate_context.send(self, metadata=metadata)
article = Article(content, metadata, settings=self.settings,
@@ -415,7 +417,6 @@ class PagesGenerator(Generator):
(repr(unicode.encode(page.status, 'utf-8')),
repr(f)))
-
self.pages, self.translations = process_translations(all_pages)
self.hidden_pages, self.hidden_translations = process_translations(hidden_pages)
@@ -425,7 +426,7 @@ class PagesGenerator(Generator):
def generate_output(self, writer):
for page in chain(self.translations, self.pages,
self.hidden_translations, self.hidden_pages):
- writer.write_file(page.save_as, self.get_template('page'),
+ writer.write_file(page.save_as, self.get_template(page.template),
self.context, page=page,
relative_urls=self.settings.get('RELATIVE_URLS'))
diff --git a/pelican/settings.py b/pelican/settings.py
index 17efea58..41b8baa9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -29,7 +29,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
'DISPLAY_PAGES_ON_MENU': True,
'PDF_GENERATOR': False,
'DEFAULT_CATEGORY': 'misc',
- 'FALLBACK_ON_FS_DATE': True,
+ 'DEFAULT_DATE': 'fs',
'WITH_FUTURE_DATES': True,
'CSS_FILE': 'main.css',
'REVERSE_ARCHIVE_ORDER': False,
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index bffe57f6..e55e0c0b 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -8,8 +8,9 @@ GITHUB_URL = 'http://github.com/ametaireau/'
DISQUS_SITENAME = "blog-notmyidea"
PDF_GENERATOR = False
REVERSE_CATEGORY_ORDER = True
-LOCALE = ""
+LOCALE = "C"
DEFAULT_PAGINATION = 4
+DEFAULT_DATE = (2012, 03, 02, 14, 01, 01)
FEED_RSS = 'feeds/all.rss.xml'
CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
diff --git a/tests/TestPages/hidden_page_with_template.rst b/tests/TestPages/hidden_page_with_template.rst
new file mode 100644
index 00000000..36104a09
--- /dev/null
+++ b/tests/TestPages/hidden_page_with_template.rst
@@ -0,0 +1,11 @@
+This is a test hidden page with a custom template
+#################################################
+
+:status: hidden
+:template: custom
+
+The quick brown fox jumped over the lazy dog's back.
+
+This page is hidden
+
+This page has a custom template to be called when rendered
diff --git a/tests/TestPages/page_with_template.rst b/tests/TestPages/page_with_template.rst
new file mode 100644
index 00000000..9388dc2f
--- /dev/null
+++ b/tests/TestPages/page_with_template.rst
@@ -0,0 +1,8 @@
+This is a test page with a preset template
+##########################################
+
+:template: custom
+
+The quick brown fox jumped over the lazy dog's back.
+
+This article has a custom template to be called when rendered
diff --git a/tests/content/article_with_template.rst b/tests/content/article_with_template.rst
new file mode 100644
index 00000000..eb55738c
--- /dev/null
+++ b/tests/content/article_with_template.rst
@@ -0,0 +1,8 @@
+Article with template
+#####################
+
+:template: custom
+
+This article has a custom template to be called when rendered
+
+This is some content. With some stuff to "typogrify".
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 32a863d6..bfa09fdf 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -31,30 +31,35 @@
-
+
-
+
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index c9fe8270..b532e454 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
-A Pelican Blog../.2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00Zbruno.././second-article.html<p>This is some article, in english</p>
-A markdown powered article2011-04-20T00:00:00Zbruno.././a-markdown-powered-article.html<p>You're mutually oblivious.</p>Article 12011-02-17T00:00:00Zbruno.././article-1.html<p>Article 1</p>
-Article 22011-02-17T00:00:00Zbruno.././article-2.html<p>Article 2</p>
-Article 32011-02-17T00:00:00Zbruno.././article-3.html<p>Article 3</p>
-This is a super article !2010-12-02T10:14:00ZAlexis Métaireau.././this-is-a-super-article.html<p>Some content here !</p>
+A Pelican Blog.././2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00ZDummy Authortag:../.,2012-02-29:second-article.html<p>This is some article, in english</p>
+A markdown powered article2011-04-20T00:00:00ZDummy Authortag:../.,2011-04-20:a-markdown-powered-article.html<p>You're mutually oblivious.</p>Article 12011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-1.html<p>Article 1</p>
+Article 22011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-2.html<p>Article 2</p>
+Article 32011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-3.html<p>Article 3</p>
+This is a super article !2010-12-02T10:14:00ZAlexis Métaireautag:../.,2010-12-02:this-is-a-super-article.html<p>Some content here !</p>
<div class="section" id="this-is-a-simple-title">
<h2>This is a simple title</h2>
<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
@@ -15,11 +15,11 @@
</pre>
<p>→ And now try with some utf8 hell: ééé</p>
</div>
-Oh yeah !2010-10-20T10:14:00ZAlexis Métaireau.././oh-yeah.html<div class="section" id="why-not">
+Oh yeah !2010-10-20T10:14:00ZAlexis Métaireautag:../.,2010-10-20:oh-yeah.html<div class="section" id="why-not">
<h2>Why not ?</h2>
<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
YEAH !</p>
<img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
</div>
-Unbelievable !2010-10-15T20:30:00Zbruno.././unbelievable.html<p>Or completely awesome. Depends the needs.</p>
+Unbelievable !2010-10-15T20:30:00ZDummy Authortag:../.,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 606e5186..274bd548 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
-A Pelican Blog../.2012-03-02T14:01:01ZTrop bien !2012-03-02T14:01:01Zbruno.././oh-yeah-fr.html<p>Et voila du contenu en français</p>
-Deuxième article2012-02-29T00:00:00Zbruno.././second-article-fr.html<p>Ceci est un article, en français.</p>
+A Pelican Blog.././2012-05-19T23:55:50ZTrop bien !2012-05-19T23:55:50ZDummy Authortag:../.,2012-05-19:oh-yeah-fr.html<p>Et voila du contenu en français</p>
+Deuxième article2012-02-29T00:00:00ZDummy Authortag:../.,2012-02-29:second-article-fr.html<p>Ceci est un article, en français.</p>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 3bb7d2fd..a0fb9144 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,9 +1,9 @@
-A Pelican Blog../.2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00Zbruno.././second-article.html<p>This is some article, in english</p>
-A markdown powered article2011-04-20T00:00:00Zbruno.././a-markdown-powered-article.html<p>You're mutually oblivious.</p>Article 12011-02-17T00:00:00Zbruno.././article-1.html<p>Article 1</p>
-Article 22011-02-17T00:00:00Zbruno.././article-2.html<p>Article 2</p>
-Article 32011-02-17T00:00:00Zbruno.././article-3.html<p>Article 3</p>
-This is a super article !2010-12-02T10:14:00ZAlexis Métaireau.././this-is-a-super-article.html<p>Some content here !</p>
+A Pelican Blog.././2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00ZDummy Authortag:../.,2012-02-29:second-article.html<p>This is some article, in english</p>
+A markdown powered article2011-04-20T00:00:00ZDummy Authortag:../.,2011-04-20:a-markdown-powered-article.html<p>You're mutually oblivious.</p>Article 12011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-1.html<p>Article 1</p>
+Article 22011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-2.html<p>Article 2</p>
+Article 32011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-3.html<p>Article 3</p>
+This is a super article !2010-12-02T10:14:00ZAlexis Métaireautag:../.,2010-12-02:this-is-a-super-article.html<p>Some content here !</p>
<div class="section" id="this-is-a-simple-title">
<h2>This is a simple title</h2>
<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
@@ -15,11 +15,11 @@
</pre>
<p>→ And now try with some utf8 hell: ééé</p>
</div>
-Oh yeah !2010-10-20T10:14:00ZAlexis Métaireau.././oh-yeah.html<div class="section" id="why-not">
+Oh yeah !2010-10-20T10:14:00ZAlexis Métaireautag:../.,2010-10-20:oh-yeah.html<div class="section" id="why-not">
<h2>Why not ?</h2>
<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
YEAH !</p>
<img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
</div>
-Unbelievable !2010-10-15T20:30:00Zbruno.././unbelievable.html<p>Or completely awesome. Depends the needs.</p>
+Unbelievable !2010-10-15T20:30:00ZDummy Authortag:../.,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 6ce45518..15708734 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
-A Pelican Blog../.2010-10-20T10:14:00ZOh yeah !2010-10-20T10:14:00ZAlexis Métaireau.././oh-yeah.html<div class="section" id="why-not">
+A Pelican Blog.././2010-10-20T10:14:00ZOh yeah !2010-10-20T10:14:00ZAlexis Métaireautag:../.,2010-10-20:oh-yeah.html<div class="section" id="why-not">
<h2>Why not ?</h2>
<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
YEAH !</p>
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index f66c2e73..383c8ab7 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
-A Pelican Blog../.2011-04-20T00:00:00ZA markdown powered article2011-04-20T00:00:00Zbruno.././a-markdown-powered-article.html<p>You're mutually oblivious.</p>Article 12011-02-17T00:00:00Zbruno.././article-1.html<p>Article 1</p>
-Article 22011-02-17T00:00:00Zbruno.././article-2.html<p>Article 2</p>
-Article 32011-02-17T00:00:00Zbruno.././article-3.html<p>Article 3</p>
+A Pelican Blog.././2011-04-20T00:00:00ZA markdown powered article2011-04-20T00:00:00ZDummy Authortag:../.,2011-04-20:a-markdown-powered-article.html<p>You're mutually oblivious.</p>Article 12011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-1.html<p>Article 1</p>
+Article 22011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-2.html<p>Article 2</p>
+Article 32011-02-17T00:00:00ZDummy Authortag:../.,2011-02-17:article-3.html<p>Article 3</p>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
index 0cf53aa7..1fa740b4 100644
--- a/tests/output/basic/feeds/content.atom.xml
+++ b/tests/output/basic/feeds/content.atom.xml
@@ -1,4 +1,4 @@
-A Pelican Blog../.2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00Zbruno.././second-article.html<p>This is some article, in english</p>
-Unbelievable !2010-10-15T20:30:00Zbruno.././unbelievable.html<p>Or completely awesome. Depends the needs.</p>
+A Pelican Blog.././2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00ZDummy Authortag:../.,2012-02-29:second-article.html<p>This is some article, in english</p>
+Unbelievable !2010-10-15T20:30:00ZDummy Authortag:../.,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
new file mode 100644
index 00000000..db33d39b
--- /dev/null
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -0,0 +1,4 @@
+
+A Pelican Blog.././2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00ZDummy Authortag:../.,2012-02-29:second-article.html<p>This is some article, in english</p>
+Unbelievable !2010-10-15T20:30:00ZDummy Authortag:../.,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p>
+
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index 7fd8e9f2..e9bb26d0 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
-A Pelican Blog../.2010-12-02T10:14:00ZThis is a super article !2010-12-02T10:14:00ZAlexis Métaireau.././this-is-a-super-article.html<p>Some content here !</p>
+A Pelican Blog.././2010-12-02T10:14:00ZThis is a super article !2010-12-02T10:14:00ZAlexis Métaireautag:../.,2010-12-02:this-is-a-super-article.html<p>Some content here !</p>
<div class="section" id="this-is-a-simple-title">
<h2>This is a simple title</h2>
<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 8a2091b9..fe6c2279 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -31,11 +31,11 @@
-