diff options
| author | Justin Mayer <entroP@gmail.com> | 2020-04-16 07:03:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 07:03:57 +0200 |
| commit | adf12505ab4b459d9efd49e82c8a793ed0edd631 (patch) | |
| tree | 337de4eb3108cb78b2789fb86dc4dbfc964c6260 | |
| parent | 592517dea96327dd52a2f7ca245ea9cbf8c2287a (diff) | |
| parent | 540c06b2b8b678992b22e4df29e5671f93851fda (diff) | |
| download | pelican-adf12505ab4b459d9efd49e82c8a793ed0edd631.tar.gz | |
Merge pull request #2724 from getpelican/theme-metadata
Put article summary in notmyidea "description" HTML metadata tag
44 files changed, 51 insertions, 0 deletions
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html index 1e080c8f..894fb8c9 100644 --- a/pelican/tests/output/basic/a-markdown-powered-article.html +++ b/pelican/tests/output/basic/a-markdown-powered-article.html @@ -6,6 +6,7 @@ <title>A markdown powered article</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html index 63cc0170..5e1196b7 100644 --- a/pelican/tests/output/basic/article-1.html +++ b/pelican/tests/output/basic/article-1.html @@ -6,6 +6,7 @@ <title>Article 1</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="Article 1" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html index cde9dce1..7dab6907 100644 --- a/pelican/tests/output/basic/article-2.html +++ b/pelican/tests/output/basic/article-2.html @@ -6,6 +6,7 @@ <title>Article 2</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="Article 2" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html index 4887ecc8..ba934652 100644 --- a/pelican/tests/output/basic/article-3.html +++ b/pelican/tests/output/basic/article-3.html @@ -6,6 +6,7 @@ <title>Article 3</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="Article 3" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html index 5187afab..039f2187 100644 --- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html +++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html @@ -6,6 +6,7 @@ <title>A draft article without date</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html index 3e6ed5f0..068b414a 100644 --- a/pelican/tests/output/basic/drafts/a-draft-article.html +++ b/pelican/tests/output/basic/drafts/a-draft-article.html @@ -6,6 +6,7 @@ <title>A draft article</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html index 29aabac3..6a6ee389 100644 --- a/pelican/tests/output/basic/filename_metadata-example.html +++ b/pelican/tests/output/basic/filename_metadata-example.html @@ -6,6 +6,7 @@ <title>FILENAME_METADATA example</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="Some cool stuff!" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html index e605ac2e..58b933aa 100644 --- a/pelican/tests/output/basic/oh-yeah-fr.html +++ b/pelican/tests/output/basic/oh-yeah-fr.html @@ -8,6 +8,7 @@ <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> <link rel="alternate" hreflang="en" href="/oh-yeah.html"> + <meta name="description" content="Et voila du contenu en français" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html index d01a631e..1b8077f8 100644 --- a/pelican/tests/output/basic/oh-yeah.html +++ b/pelican/tests/output/basic/oh-yeah.html @@ -8,6 +8,7 @@ <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> <link rel="alternate" hreflang="fr" href="/oh-yeah-fr.html"> + <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html index f3c39ca4..87b95cc4 100644 --- a/pelican/tests/output/basic/second-article-fr.html +++ b/pelican/tests/output/basic/second-article-fr.html @@ -8,6 +8,7 @@ <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> <link rel="alternate" hreflang="en" href="/second-article.html"> + <meta name="description" content="Ceci est un article, en français." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html index a7ea7780..3e0c5296 100644 --- a/pelican/tests/output/basic/second-article.html +++ b/pelican/tests/output/basic/second-article.html @@ -8,6 +8,7 @@ <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> <link rel="alternate" hreflang="fr" href="/second-article-fr.html"> + <meta name="description" content="This is some article, in english" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html index 259b17fe..c891121e 100644 --- a/pelican/tests/output/basic/tag/baz.html +++ b/pelican/tests/output/basic/tag/baz.html @@ -6,6 +6,7 @@ <title>The baz tag</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="This article overrides the listening of the articles under the baz tag." /> </head> <body id="index" class="home"> 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 220817d3..bd1472e4 100644 --- a/pelican/tests/output/basic/this-is-a-super-article.html +++ b/pelican/tests/output/basic/this-is-a-super-article.html @@ -6,6 +6,7 @@ <title>This is a super article !</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="Multi-line metadata should be supported as well as inline markup." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html index 8cdc892c..e0836d70 100644 --- a/pelican/tests/output/basic/unbelievable.html +++ b/pelican/tests/output/basic/unbelievable.html @@ -6,6 +6,7 @@ <title>Unbelievable !</title> <link rel="stylesheet" href="/theme/css/main.css" /> <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" /> + <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html index e797c35a..00aa18e8 100644 --- a/pelican/tests/output/custom/a-markdown-powered-article.html +++ b/pelican/tests/output/custom/a-markdown-powered-article.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html index a2954757..cc15ba5c 100644 --- a/pelican/tests/output/custom/article-1.html +++ b/pelican/tests/output/custom/article-1.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Article 1" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html index 5a964cdb..cc331a4d 100644 --- a/pelican/tests/output/custom/article-2.html +++ b/pelican/tests/output/custom/article-2.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Article 2" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html index ef656391..8b180180 100644 --- a/pelican/tests/output/custom/article-3.html +++ b/pelican/tests/output/custom/article-3.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Article 3" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html index 3c61b23c..03aecc56 100644 --- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html +++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html index 3316df7c..87be8bec 100644 --- a/pelican/tests/output/custom/drafts/a-draft-article.html +++ b/pelican/tests/output/custom/drafts/a-draft-article.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html index 765b06c1..2fcbe562 100644 --- a/pelican/tests/output/custom/filename_metadata-example.html +++ b/pelican/tests/output/custom/filename_metadata-example.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Some cool stuff!" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html index b5504212..bb7eb44e 100644 --- a/pelican/tests/output/custom/oh-yeah-fr.html +++ b/pelican/tests/output/custom/oh-yeah-fr.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="en" href="./oh-yeah.html"> + <meta name="description" content="Et voila du contenu en français" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html index dff78a30..f7afb399 100644 --- a/pelican/tests/output/custom/oh-yeah.html +++ b/pelican/tests/output/custom/oh-yeah.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="fr" href="./oh-yeah-fr.html"> + <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html index 4c6894d3..8e360e9c 100644 --- a/pelican/tests/output/custom/second-article-fr.html +++ b/pelican/tests/output/custom/second-article-fr.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="en" href="./second-article.html"> + <meta name="description" content="Ceci est un article, en français." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html index 3004b068..5001f0d0 100644 --- a/pelican/tests/output/custom/second-article.html +++ b/pelican/tests/output/custom/second-article.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="fr" href="./second-article-fr.html"> + <meta name="description" content="This is some article, in english" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html index 3bcda170..ef53c34c 100644 --- a/pelican/tests/output/custom/tag/baz.html +++ b/pelican/tests/output/custom/tag/baz.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="This article overrides the listening of the articles under the baz tag." /> </head> <body id="index" class="home"> 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 da602d45..55053cb2 100644 --- a/pelican/tests/output/custom/this-is-a-super-article.html +++ b/pelican/tests/output/custom/this-is-a-super-article.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Multi-line metadata should be supported as well as inline markup." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html index 024d428f..0132162c 100644 --- a/pelican/tests/output/custom/unbelievable.html +++ b/pelican/tests/output/custom/unbelievable.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="./theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html index 327d6460..c289ec72 100644 --- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html +++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html index 1a7e9427..a166efdf 100644 --- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html +++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html index 01188766..58859a3a 100644 --- a/pelican/tests/output/custom_locale/oh-yeah-fr.html +++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="en" href="./posts/2010/octobre/20/oh-yeah/"> + <meta name="description" content="Et voila du contenu en français" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html index 9a376c44..dee44f28 100644 --- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html +++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Multi-line metadata should be supported as well as inline markup." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html index c31cdfab..e42c70f6 100644 --- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html +++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html index fdc8efde..1bf74b57 100644 --- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html +++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="fr" href="../../../../../oh-yeah-fr.html"> + <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html index db3d04d2..0f35847a 100644 --- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html +++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html index 1c153b0f..05418036 100644 --- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html +++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Article 1" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html index 9ee6269f..8cb67749 100644 --- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html +++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Article 2" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html index e1374f0c..62423814 100644 --- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html +++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Article 3" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html index ba8b3ee0..615a7f30 100644 --- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html +++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="fr" href="../../../../../second-article-fr.html"> + <meta name="description" content="This is some article, in english" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html index 7f15782e..2213d174 100644 --- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html +++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../../../../../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="Some cool stuff!" /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html index b0c92d9f..3c21ef75 100644 --- a/pelican/tests/output/custom_locale/second-article-fr.html +++ b/pelican/tests/output/custom_locale/second-article-fr.html @@ -9,6 +9,7 @@ <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> <link rel="alternate" hreflang="en" href="./posts/2012/février/29/second-article/"> + <meta name="description" content="Ceci est un article, en français." /> </head> <body id="index" class="home"> diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html index 8896bad3..9554bdd6 100644 --- a/pelican/tests/output/custom_locale/tag/baz.html +++ b/pelican/tests/output/custom_locale/tag/baz.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="../theme/css/main.css" /> <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" /> <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" /> + <meta name="description" content="This article overrides the listening of the articles under the baz tag." /> </head> <body id="index" class="home"> diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html index 98c91bbc..6abcb09d 100644 --- a/pelican/themes/notmyidea/templates/article.html +++ b/pelican/themes/notmyidea/templates/article.html @@ -1,5 +1,12 @@ {% extends "base.html" %} {% block html_lang %}{{ article.lang }}{% endblock %} +{% block head -%} + {{ super() -}} + {% if article.summary %} + <meta name="description" content="{{ article.summary | striptags | safe | truncate(150) }}" /> + {% endif %} +{% endblock %} + {% block title %}{{ article.title|striptags }}{% endblock %} {% block extra_head %} diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html index 34ed4e97..6be5f1d8 100644 --- a/pelican/themes/notmyidea/templates/base.html +++ b/pelican/themes/notmyidea/templates/base.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}"> <head> + {% block head %} <meta charset="utf-8" /> <meta name="generator" content="Pelican" /> <title>{% block title %}{{ SITENAME }}{%endblock%}</title> @@ -12,6 +13,7 @@ <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> {% endif %} {% block extra_head %}{% endblock extra_head %} + {% endblock head %} </head> <body id="index" class="home"> |