From 6f99a24a2ced6b2aee2fa52648ac9e173ed0b9f1 Mon Sep 17 00:00:00 2001
From: Raghavendra Kamath <raghu@raghukamath.com>
Date: Wed, 7 Feb 2018 14:59:07 +0530
Subject: [PATCH] correct the meta block portion (#4978)

---
 frappe/templates/base.html                          | 13 +------------
 frappe/templates/includes/meta_block.html           |  6 +++---
 frappe/templates/web.html                           |  1 -
 .../doctype/blog_post/templates/blog_post.html      |  5 +++--
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 9b7d48e1f8..4e820d69cc 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -6,7 +6,6 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>{% block title %} {{ title | striptags }} {% endblock %}</title>
 	<meta name="generator" content="frappe">
-
     {% block favicon %}
 	<link rel="shortcut icon"
 		href="{{ (favicon or "/assets/frappe/images/favicon.png") | abs_url }}"
@@ -16,20 +15,14 @@
 		type="image/x-icon">
     {% endblock %}
 	{%- block head -%}
-		{% if meta_block is defined -%}
-		{{ meta_block }}
-		{%- endif %}
-
+		{% block meta_block %}{% endblock %}
 		{% if head_html is defined -%}
 		{{ head_html or "" }}
 		{%- endif %}
-
 		{%- for link in web_include_css %}
 		<link type="text/css" rel="stylesheet" href="{{ link|abs_url }}">
 		{%- endfor -%}
-
 	    {%- block head_include %}{{ head_include or "" }}{% endblock -%}
-
 		{%- block style %}{%- endblock -%}
 	{%- endblock -%}
     <script>
@@ -95,15 +88,11 @@
     {%- endfor -%}
     </script>
     {% endif -%}
-
 	{%- for link in web_include_js %}
 	<script type="text/javascript" src="{{ link|abs_url }}"></script>
 	{%- endfor -%}
-
     {%- block script %}{%- endblock %}
-
 	<!-- csrf_token -->
-
     {%- block body_include %}{{ body_include or "" }}{% endblock -%}
 </body>
 </html>
diff --git a/frappe/templates/includes/meta_block.html b/frappe/templates/includes/meta_block.html
index 5a22341e11..6f8a6a3a73 100644
--- a/frappe/templates/includes/meta_block.html
+++ b/frappe/templates/includes/meta_block.html
@@ -2,9 +2,9 @@
 {%- for name in metatags %}
 <meta {% if name == 'og:title' or name == "og:image" or name == "og:type" or name == "og:description" %} property="{{ name }}" {% else %} name="{{ name }}" {% endif %}  content="{{ metatags[name]|striptags|escape }}" data-html-block="meta_block">
 {%- endfor -%}
-<meta property="og:url" content="{{ frappe.utils.get_url(path) }}"></meta>
-<meta itemprop="datePublished" content="{{ frappe.format_date(published_on) }}"></meta>
-<meta itemprop="author" content="{{ blogger }}"></meta>
+<meta property="og:url" content="{{ frappe.utils.get_url(path) }}">
+<meta itemprop="datePublished" content="{{ frappe.format_date(published_on) }}">
+<meta itemprop="author" content="{{ blogger }}">
 <meta itemprop="name" content="{{ name }}" data-html-block="meta_block">
 <meta itemprop="description" content="{{ description }}" data-html-block="meta_block">
 <meta itemprop="image" content="{{ frappe.utils.get_url(metatags["image"]) }}" data-html-block="meta_block">
diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index 44b5c1cb8c..d0c8dc7df5 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -1,5 +1,4 @@
 {% extends base_template_path %}
-
 {% block hero %}{% endblock %}
 {% block content %}
 <div class="page-container" id="page-{{ name or route }}"
diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html
index 61de52268c..99f4c1e392 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post.html
@@ -1,7 +1,8 @@
 {% extends "templates/web.html" %}
-{% include "templates/includes/meta_block.html" %}
+{% block meta_block %}
+	{% include "templates/includes/meta_block.html" %}
+{% endblock %}
 {% block page_content %}
-
 <div class="blog-container">
 <article class="blog-content" itemscope itemtype="http://schema.org/BlogPosting">
 	<!-- begin blog content -->