Fix #2694 -- remove misplaced meta description tags

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Mar 26, 2017 · ad6b25a · ad6b25a
1 parent ef4ecc7
commit ad6b25a
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 18 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -29,6 +29,7 @@ Features
 Bugfixes
 --------
 
+* Remove misplaced and duplicated meta description tags (Issue #2694)
 * Fix crash if ``PAGE_INDEX`` is enabled and make them actually work
   (Issue #2646)
 * Ignore ``NEW_POST_DATE_PATH`` when creating pages (Issue #2699)

diff --git a/nikola/data/themes/base-jinja/templates/post.tmpl b/nikola/data/themes/base-jinja/templates/post.tmpl
@@ -9,9 +9,6 @@
     {% if post.meta('keywords') %}
     <meta name="keywords" content="{{ post.meta('keywords')|e }}">
     {% endif %}
-    {% if post.description() %}
-    <meta name="description" content="{{ post.description()|e }}">
-    {% endif %}
     <meta name="author" content="{{ post.author()|e }}">
     {% if post.prev_post %}
         <link rel="prev" href="{{ post.prev_post.permalink() }}" title="{{ post.prev_post.title()|e }}" type="text/html">

diff --git a/nikola/data/themes/base-jinja/templates/post_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl
@@ -46,9 +46,6 @@
             {% if post.meta('link') %}
                     <p class="linkline"><a href="{{ post.meta('link') }}">{{ messages("Original site") }}</a></p>
             {% endif %}
-            {% if post.description() %}
-                <meta name="description" itemprop="description" content="{{ post.description()|e }}">
-            {% endif %}
         </div>
         {{ html_translations(post) }}
     </header>

diff --git a/nikola/data/themes/base/templates/post.tmpl b/nikola/data/themes/base/templates/post.tmpl
@@ -9,9 +9,6 @@
     % if post.meta('keywords'):
     <meta name="keywords" content="${post.meta('keywords')|h}">
     % endif
-    %if post.description():
-    <meta name="description" content="${post.description()|h}">
-    %endif
     <meta name="author" content="${post.author()|h}">
     %if post.prev_post:
         <link rel="prev" href="${post.prev_post.permalink()}" title="${post.prev_post.title()|h}" type="text/html">

diff --git a/nikola/data/themes/base/templates/post_header.tmpl b/nikola/data/themes/base/templates/post_header.tmpl
@@ -46,9 +46,6 @@
             % if post.meta('link'):
                     <p class="linkline"><a href="${post.meta('link')}">${messages("Original site")}</a></p>
             % endif
-            %if post.description():
-                <meta name="description" itemprop="description" content="${post.description()|h}">
-            %endif
         </div>
         ${html_translations(post)}
     </header>

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/post.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/post.tmpl
@@ -9,9 +9,6 @@
     {% if post.meta('keywords') %}
     <meta name="keywords" content="{{ post.meta('keywords')|e }}">
     {% endif %}
-    {% if post.description() %}
-    <meta name="description" itemprop="description" content="{{ post.description()|e }}">
-    {% endif %}
     <meta name="author" content="{{ post.author()|e }}">
     {% if post.prev_post %}
         <link rel="prev" href="{{ post.prev_post.permalink() }}" title="{{ post.prev_post.title()|e }}" type="text/html">

diff --git a/nikola/data/themes/bootstrap3/templates/post.tmpl b/nikola/data/themes/bootstrap3/templates/post.tmpl
@@ -9,9 +9,6 @@
     % if post.meta('keywords'):
     <meta name="keywords" content="${post.meta('keywords')|h}">
     % endif
-    %if post.description():
-    <meta name="description" itemprop="description" content="${post.description()|h}">
-    %endif
     <meta name="author" content="${post.author()|h}">
     %if post.prev_post:
         <link rel="prev" href="${post.prev_post.permalink()}" title="${post.prev_post.title()|h}" type="text/html">