diff options
| author | Alexis Métaireau <alexis@notmyidea.org> | 2013-07-05 01:08:45 +0200 |
|---|---|---|
| committer | Alexis Métaireau <alexis@notmyidea.org> | 2013-07-05 01:08:45 +0200 |
| commit | 0550c6ef29b2129efe1fbd061669f2909f464559 (patch) | |
| tree | 352cde8243600fe4fc48c863f4229ae0019cb156 | |
| parent | 7ec4d5faa25040f6cabcf2ddbab58b19c4b77a2c (diff) | |
| download | pelican-multiple-authors.tar.gz | |
add multiple authorsmultiple-authors
51 files changed, 154 insertions, 175 deletions
diff --git a/pelican/contents.py b/pelican/contents.py index 1b604f19..b5da4342 100644 --- a/pelican/contents.py +++ b/pelican/contents.py @@ -68,10 +68,16 @@ class Content(object): #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: - self.author = Author(settings['AUTHOR'], settings) + # First, read the authors from "authors", if not, fallback to "author" + # and if not use the settings defined one, if any. + if not hasattr(self, 'author') and 'AUTHOR' in settings: + self.author = Author(settings['AUTHOR'], settings) + + if not hasattr(self, 'authors') and hasattr(self, 'author'): + setattr(self, 'authors', [self.author]) + + if hasattr(self, 'authors') and not hasattr(self, 'author'): + setattr(self, 'author', self.authors[0]) # XXX Split all the following code into pieces, there is too much here. diff --git a/pelican/generators.py b/pelican/generators.py index 0dc3667f..f8b7ede7 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -22,7 +22,6 @@ from pelican.contents import Article, Page, Static, is_valid_content from pelican.readers import read_file from pelican.utils import copy, process_translations, mkdir_p, DateFormatter from pelican import signals -import pelican.utils logger = logging.getLogger(__name__) @@ -286,16 +285,16 @@ class ArticlesGenerator(Generator): dates=archive, blog=True) period_save_as = { - 'year' : self.settings['YEAR_ARCHIVE_SAVE_AS'], - 'month': self.settings['MONTH_ARCHIVE_SAVE_AS'], - 'day' : self.settings['DAY_ARCHIVE_SAVE_AS'], - } + 'year': self.settings['YEAR_ARCHIVE_SAVE_AS'], + 'month': self.settings['MONTH_ARCHIVE_SAVE_AS'], + 'day': self.settings['DAY_ARCHIVE_SAVE_AS'], + } period_date_key = { - 'year' : attrgetter('date.year'), - 'month': attrgetter('date.year', 'date.month'), - 'day' : attrgetter('date.year', 'date.month', 'date.day') - } + 'year': attrgetter('date.year'), + 'month': attrgetter('date.year', 'date.month'), + 'day': attrgetter('date.year', 'date.month', 'date.day') + } for period in 'year', 'month', 'day': save_as = period_save_as[period] @@ -418,9 +417,10 @@ class ArticlesGenerator(Generator): for tag in article.tags: self.tags[tag].append(article) # ignore blank authors as well as undefined - if hasattr(article, 'author') and article.author.name != '': - self.authors[article.author].append(article) - + if hasattr(article, 'authors'): + for author in article.authors: + if author.name != '': + self.authors[author].append(article) # sort the articles by date self.articles.sort(key=attrgetter('date'), reverse=True) diff --git a/pelican/readers.py b/pelican/readers.py index bd9f5914..f6140525 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -27,7 +27,7 @@ except ImportError: try: from html import escape except ImportError: - from cgi import escape + from cgi import escape # NOQA try: from html.parser import HTMLParser except ImportError: @@ -45,6 +45,7 @@ METADATA_PROCESSORS = { 'status': lambda x, y: x.strip(), 'category': Category, 'author': Author, + 'authors': lambda x, y: [Author(name, y) for name in x.split(',')], } @@ -449,13 +450,13 @@ def parse_path_metadata(source_path, settings=None, process=None): subdir = os.path.basename(dirname) if settings: checks = [] - for key,data in [('FILENAME_METADATA', base), - ('PATH_METADATA', source_path), - ]: + for key, data in [('FILENAME_METADATA', base), + ('PATH_METADATA', source_path), + ]: checks.append((settings.get(key, None), data)) if settings.get('USE_FOLDER_AS_CATEGORY', None): checks.insert(0, ('(?P<category>.*)', subdir)) - for regexp,data in checks: + for regexp, data in checks: if regexp and data: match = re.match(regexp, data) if match: diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html index 7f7a8c6b..4c0321ad 100644 --- a/pelican/tests/output/basic/author/alexis-metaireau.html +++ b/pelican/tests/output/basic/author/alexis-metaireau.html @@ -35,8 +35,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --><div class="section" id="why-not"> @@ -67,8 +66,7 @@ YEAH !</p> </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html index 9e3b52f1..6414bf7b 100644 --- a/pelican/tests/output/basic/category/bar.html +++ b/pelican/tests/output/basic/category/bar.html @@ -35,8 +35,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --><div class="section" id="why-not"> diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html index af223812..c0722292 100644 --- a/pelican/tests/output/basic/category/misc.html +++ b/pelican/tests/output/basic/category/misc.html @@ -58,6 +58,10 @@ Wed 29 February 2012 </abbr> + <address class="vcard author"> + By <a class="url fn" href="/author/babar-celestine.html">babar + +celestine</a> </address> <p>In <a href="/category/misc.html">misc</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: <a href="/second-article-fr.html">fr</a> diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html index f401e3d2..3e61d850 100644 --- a/pelican/tests/output/basic/category/yeah.html +++ b/pelican/tests/output/basic/category/yeah.html @@ -35,8 +35,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --><p>Some content here !</p> diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml index 54c87905..d4be1694 100644 --- a/pelican/tests/output/basic/feeds/all-en.atom.xml +++ b/pelican/tests/output/basic/feeds/all-en.atom.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html"><p>Some cool stuff!</p> -</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html"><p>This is some article, in english</p> +</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>babar + +celestine</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html"><p>This is some article, in english</p> </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html"><p>You're mutually oblivious.</p> <p><a href="/unbelievable.html">a root-relative link to unbelievable</a> <a href="/unbelievable.html">a file-relative link to unbelievable</a></p></summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html"><p>Article 1</p> diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml index 3081adc6..b3bbd8d8 100644 --- a/pelican/tests/output/basic/feeds/all.atom.xml +++ b/pelican/tests/output/basic/feeds/all.atom.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html"><p>Some cool stuff!</p> -</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html"><p>This is some article, in english</p> +</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>babar + +celestine</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html"><p>This is some article, in english</p> </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html"><p>Ceci est un article, en français.</p> </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html"><p>You're mutually oblivious.</p> <p><a href="/unbelievable.html">a root-relative link to unbelievable</a> diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml index e71bd151..0c0044f6 100644 --- a/pelican/tests/output/basic/feeds/misc.atom.xml +++ b/pelican/tests/output/basic/feeds/misc.atom.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html"><p>Some cool stuff!</p> -</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html"><p>This is some article, in english</p> +</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>babar + +celestine</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html"><p>This is some article, in english</p> </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html"><p>Or completely awesome. Depends the needs.</p> <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a> <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html index c5b9fec3..cbc3597f 100644 --- a/pelican/tests/output/basic/index.html +++ b/pelican/tests/output/basic/index.html @@ -58,6 +58,10 @@ Wed 29 February 2012 </abbr> + <address class="vcard author"> + By <a class="url fn" href="/author/babar-celestine.html">babar + +celestine</a> </address> <p>In <a href="/category/misc.html">misc</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: <a href="/second-article-fr.html">fr</a> @@ -172,8 +176,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported @@ -198,8 +201,7 @@ as well as <strong>inline markup</strong>.</p> </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --> <div class="section" id="why-not"> diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html index 62834917..9c2ca876 100644 --- a/pelican/tests/output/basic/oh-yeah.html +++ b/pelican/tests/output/basic/oh-yeah.html @@ -38,8 +38,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --> <div class="section" id="why-not"> diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html index 6cc42c66..8f04a4e5 100644 --- a/pelican/tests/output/basic/second-article.html +++ b/pelican/tests/output/basic/second-article.html @@ -37,6 +37,10 @@ Wed 29 February 2012 </abbr> + <address class="vcard author"> + By <a class="url fn" href="/author/babar-celestine.html">babar + +celestine</a> </address> <p>In <a href="/category/misc.html">misc</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: <a href="/second-article-fr.html">fr</a> diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html index 20824993..f0179152 100644 --- a/pelican/tests/output/basic/tag/bar.html +++ b/pelican/tests/output/basic/tag/bar.html @@ -34,6 +34,10 @@ Wed 29 February 2012 </abbr> + <address class="vcard author"> + By <a class="url fn" href="/author/babar-celestine.html">babar + +celestine</a> </address> <p>In <a href="/category/misc.html">misc</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: <a href="/second-article-fr.html">fr</a> @@ -61,8 +65,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported @@ -87,8 +90,7 @@ as well as <strong>inline markup</strong>.</p> </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --> <div class="section" id="why-not"> diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html index 65632313..912f0d97 100644 --- a/pelican/tests/output/basic/tag/baz.html +++ b/pelican/tests/output/basic/tag/baz.html @@ -34,6 +34,10 @@ Wed 29 February 2012 </abbr> + <address class="vcard author"> + By <a class="url fn" href="/author/babar-celestine.html">babar + +celestine</a> </address> <p>In <a href="/category/misc.html">misc</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: <a href="/second-article-fr.html">fr</a> diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html index 05a02a5f..f1aa7fb1 100644 --- a/pelican/tests/output/basic/tag/foo.html +++ b/pelican/tests/output/basic/tag/foo.html @@ -34,6 +34,10 @@ Wed 29 February 2012 </abbr> + <address class="vcard author"> + By <a class="url fn" href="/author/babar-celestine.html">babar + +celestine</a> </address> <p>In <a href="/category/misc.html">misc</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: <a href="/second-article-fr.html">fr</a> @@ -61,8 +65,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html index c683f1a1..24d5e21d 100644 --- a/pelican/tests/output/basic/tag/foobar.html +++ b/pelican/tests/output/basic/tag/foobar.html @@ -35,8 +35,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --><p>Some content here !</p> diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html index 610a7aa3..e4da0f93 100644 --- a/pelican/tests/output/basic/tag/oh.html +++ b/pelican/tests/output/basic/tag/oh.html @@ -35,8 +35,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --><div class="section" id="why-not"> diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html index 2afb8bd3..e3c3a1c6 100644 --- a/pelican/tests/output/basic/tag/yeah.html +++ b/pelican/tests/output/basic/tag/yeah.html @@ -35,8 +35,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/bar.html">bar</a>. </p> <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p> </footer><!-- /.post-info --><div class="section" id="why-not"> diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html index 617b8c6d..e65f37e3 100644 --- a/pelican/tests/output/basic/this-is-a-super-article.html +++ b/pelican/tests/output/basic/this-is-a-super-article.html @@ -38,8 +38,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="/category/yeah.html">yeah</a>. </p> <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p>Some content here !</p> diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html index 7b953a61..6fbb116f 100644 --- a/pelican/tests/output/custom/a-markdown-powered-article.html +++ b/pelican/tests/output/custom/a-markdown-powered-article.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>You're mutually oblivious.</p> diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html index c52fdd9a..38d0efb5 100644 --- a/pelican/tests/output/custom/article-1.html +++ b/pelican/tests/output/custom/article-1.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 1</p> diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html index 7a045bdc..cf7d3f6a 100644 --- a/pelican/tests/output/custom/article-2.html +++ b/pelican/tests/output/custom/article-2.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 2</p> diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html index f887218c..da73f06f 100644 --- a/pelican/tests/output/custom/article-3.html +++ b/pelican/tests/output/custom/article-3.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 3</p> diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html index f18b8ce8..7dcfc87e 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau.html +++ b/pelican/tests/output/custom/author/alexis-metaireau.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --><p>You're mutually oblivious.</p> @@ -67,8 +66,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 1</p> @@ -92,8 +90,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 2</p> @@ -117,8 +114,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 3</p> @@ -128,7 +124,7 @@ </article></li> </ol><!-- /#posts-list --> <p class="paginator"> - Page 1 / 3 + Page 1 / 2 <a href="../author/alexis-metaireau2.html">»</a> </p> </section><!-- /#content --> diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html index 9f4a31e8..40fc46f9 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau2.html +++ b/pelican/tests/output/custom/author/alexis-metaireau2.html @@ -46,8 +46,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>Some cool stuff!</p> @@ -71,8 +70,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/bar.html">bar</a>. </p> <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: <a href="../oh-yeah-fr.html">fr</a> @@ -92,59 +90,56 @@ YEAH !</p> <li><article class="hentry"> <header> - <h1><a href="../second-article.html" rel="bookmark" - title="Permalink to Second article">Second article</a></h1> + <h1><a href="../this-is-a-super-article.html" rel="bookmark" + title="Permalink to This is a super article !">This is a super article !</a></h1> </header> <div class="entry-content"> <footer class="post-info"> - <abbr class="published" title="2012-02-29T00:00:00"> - Wed 29 February 2012 + <abbr class="published" title="2010-12-02T10:14:00"> + Thu 02 December 2010 </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> - <p>In <a href="../category/misc.html">misc</a>. </p> -<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: - <a href="../second-article-fr.html">fr</a> - -</footer><!-- /.post-info --> <p>This is some article, in english</p> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> + <p>In <a href="../category/yeah.html">yeah</a>. </p> +<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p> +</footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported +as well as <strong>inline markup</strong>.</p> - <a class="readmore" href="../second-article.html">read more</a> - <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content --> + <a class="readmore" href="../this-is-a-super-article.html">read more</a> + <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content --> </article></li> <li><article class="hentry"> <header> - <h1><a href="../this-is-a-super-article.html" rel="bookmark" - title="Permalink to This is a super article !">This is a super article !</a></h1> + <h1><a href="../unbelievable.html" rel="bookmark" + title="Permalink to Unbelievable !">Unbelievable !</a></h1> </header> <div class="entry-content"> <footer class="post-info"> - <abbr class="published" title="2010-12-02T10:14:00"> - Thu 02 December 2010 + <abbr class="published" title="2010-10-15T20:30:00"> + Fri 15 October 2010 </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> - <p>In <a href="../category/yeah.html">yeah</a>. </p> -<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p> -</footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported -as well as <strong>inline markup</strong>.</p> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> + <p>In <a href="../category/misc.html">misc</a>. </p> - <a class="readmore" href="../this-is-a-super-article.html">read more</a> - <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content --> +</footer><!-- /.post-info --> <p>Or completely awesome. Depends the needs.</p> +<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a> +<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> + + <a class="readmore" href="../unbelievable.html">read more</a> + <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content --> </article></li> </ol><!-- /#posts-list --> <p class="paginator"> <a href="../author/alexis-metaireau.html">«</a> - Page 2 / 3 - <a href="../author/alexis-metaireau3.html">»</a> + Page 2 / 2 </p> </section><!-- /#content --> <section id="extras" class="body"> diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html index 4eda0b62..1966b99a 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau3.html +++ b/pelican/tests/output/custom/author/alexis-metaireau3.html @@ -46,8 +46,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>Or completely awesome. Depends the needs.</p> diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html index f7f1bbf3..24bd7d5e 100644 --- a/pelican/tests/output/custom/category/bar.html +++ b/pelican/tests/output/custom/category/bar.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/bar.html">bar</a>. </p> <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: <a href="../oh-yeah-fr.html">fr</a> diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html index 10c4ce76..2a9af66d 100644 --- a/pelican/tests/output/custom/category/cat1.html +++ b/pelican/tests/output/custom/category/cat1.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --><p>You're mutually oblivious.</p> @@ -67,8 +66,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 1</p> @@ -92,8 +90,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 2</p> @@ -117,8 +114,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 3</p> diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html index 121c9451..d815aa44 100644 --- a/pelican/tests/output/custom/category/misc.html +++ b/pelican/tests/output/custom/category/misc.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> </footer><!-- /.post-info --><p>Some cool stuff!</p> @@ -66,8 +65,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <a href="../second-article-fr.html">fr</a> @@ -93,8 +91,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>Or completely awesome. Depends the needs.</p> diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html index f7cc8d12..452a5c44 100644 --- a/pelican/tests/output/custom/category/yeah.html +++ b/pelican/tests/output/custom/category/yeah.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/yeah.html">yeah</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --><p>Some content here !</p> diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html index 493eb611..af9b0620 100644 --- a/pelican/tests/output/custom/drafts/a-draft-article.html +++ b/pelican/tests/output/custom/drafts/a-draft-article.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>This is a draft article, it should live under the /drafts/ folder and not be diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html index 626e8c64..65b42d7f 100644 --- a/pelican/tests/output/custom/filename_metadata-example.html +++ b/pelican/tests/output/custom/filename_metadata-example.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>Some cool stuff!</p> diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html index 1a1d89e9..1b084d49 100644 --- a/pelican/tests/output/custom/index.html +++ b/pelican/tests/output/custom/index.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> </footer><!-- /.post-info --><p>Some cool stuff!</p> @@ -66,8 +65,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: <a href="./second-article-fr.html">fr</a> @@ -93,8 +91,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>You're mutually oblivious.</p> @@ -119,8 +116,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 1</p> diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html index b8e2ac1a..52f0ecc6 100644 --- a/pelican/tests/output/custom/index2.html +++ b/pelican/tests/output/custom/index2.html @@ -46,8 +46,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 2</p> @@ -71,8 +70,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/cat1.html">cat1</a>. </p> </footer><!-- /.post-info --> <p>Article 3</p> @@ -96,8 +94,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/yeah.html">yeah</a>. </p> <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported @@ -122,8 +119,7 @@ as well as <strong>inline markup</strong>.</p> </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/bar.html">bar</a>. </p> <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: <a href="./oh-yeah-fr.html">fr</a> diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html index cf285ea2..d0e537ba 100644 --- a/pelican/tests/output/custom/index3.html +++ b/pelican/tests/output/custom/index3.html @@ -46,8 +46,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>Or completely awesome. Depends the needs.</p> diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html index e34e6078..9d2a764a 100644 --- a/pelican/tests/output/custom/oh-yeah-fr.html +++ b/pelican/tests/output/custom/oh-yeah-fr.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> Translations: <a href="./oh-yeah.html">en</a> diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html index 2f6ca309..04db2171 100644 --- a/pelican/tests/output/custom/oh-yeah.html +++ b/pelican/tests/output/custom/oh-yeah.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/bar.html">bar</a>. </p> <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: <a href="./oh-yeah-fr.html">fr</a> diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html index 3d5fbd29..9021cdc1 100644 --- a/pelican/tests/output/custom/second-article-fr.html +++ b/pelican/tests/output/custom/second-article-fr.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: <a href="./second-article.html">en</a> diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html index be83983e..d0430d53 100644 --- a/pelican/tests/output/custom/second-article.html +++ b/pelican/tests/output/custom/second-article.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: <a href="./second-article-fr.html">fr</a> diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html index d1805e50..f9896c5e 100644 --- a/pelican/tests/output/custom/tag/bar.html +++ b/pelican/tests/output/custom/tag/bar.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <a href="../second-article-fr.html">fr</a> @@ -68,8 +67,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/yeah.html">yeah</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported @@ -94,8 +92,7 @@ as well as <strong>inline markup</strong>.</p> </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/bar.html">bar</a>. </p> <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: <a href="../oh-yeah-fr.html">fr</a> diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html index a6d23907..df7dc92c 100644 --- a/pelican/tests/output/custom/tag/baz.html +++ b/pelican/tests/output/custom/tag/baz.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <a href="../second-article-fr.html">fr</a> diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html index 04cb7529..3daf7c68 100644 --- a/pelican/tests/output/custom/tag/foo.html +++ b/pelican/tests/output/custom/tag/foo.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/misc.html">misc</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <a href="../second-article-fr.html">fr</a> @@ -68,8 +67,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/yeah.html">yeah</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p class="first last">Multi-line metadata should be supported diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html index 2c50c8ae..9184e3dd 100644 --- a/pelican/tests/output/custom/tag/foobar.html +++ b/pelican/tests/output/custom/tag/foobar.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/yeah.html">yeah</a>. </p> <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --><p>Some content here !</p> diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html index b798964e..901fe9ff 100644 --- a/pelican/tests/output/custom/tag/oh.html +++ b/pelican/tests/output/custom/tag/oh.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/bar.html">bar</a>. </p> <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: <a href="../oh-yeah-fr.html">fr</a> diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html index 54ad93c6..d12788e0 100644 --- a/pelican/tests/output/custom/tag/yeah.html +++ b/pelican/tests/output/custom/tag/yeah.html @@ -39,8 +39,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="../category/bar.html">bar</a>. </p> <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: <a href="../oh-yeah-fr.html">fr</a> diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html index 1fdd8897..5b1b1485 100644 --- a/pelican/tests/output/custom/this-is-a-super-article.html +++ b/pelican/tests/output/custom/this-is-a-super-article.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/yeah.html">yeah</a>. </p> <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p> </footer><!-- /.post-info --> <p>Some content here !</p> diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html index e7253497..d06dcb9e 100644 --- a/pelican/tests/output/custom/unbelievable.html +++ b/pelican/tests/output/custom/unbelievable.html @@ -42,8 +42,7 @@ </abbr> <address class="vcard author"> - By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> - </address> + By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a> </address> <p>In <a href="./category/misc.html">misc</a>. </p> </footer><!-- /.post-info --> <p>Or completely awesome. Depends the needs.</p> diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html index 4b86716d..8097b5d6 100644 --- a/pelican/themes/notmyidea/templates/article_infos.html +++ b/pelican/themes/notmyidea/templates/article_infos.html @@ -3,9 +3,9 @@ {{ article.locale_date }} </abbr> - {% if article.author %} + {% if article.authors %} <address class="vcard author"> - By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> + By {% for author in article.authors %} <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> {% endfor %} </address> {% endif %} <p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p> diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html index 5bb94dfc..8593cec5 100644 --- a/pelican/themes/simple/templates/index.html +++ b/pelican/themes/simple/templates/index.html @@ -11,7 +11,11 @@ <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header> <footer class="post-info"> <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr> - {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %} + <address class="vcard author">By + {% for author in article.authors %} + <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> + {% endfor %} + </address> </footer><!-- /.post-info --> <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content --> </article></li> diff --git a/samples/content/article2.rst b/samples/content/article2.rst index 66f768ea..d07ddc8e 100644 --- a/samples/content/article2.rst +++ b/samples/content/article2.rst @@ -5,5 +5,6 @@ Second article :date: 2012-02-29 :lang: en :slug: second-article +:authors: babar, celestine This is some article, in english |