From f512fe8446f4fb8f9755099406a014ed0f04b8fd Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 7 May 2020 18:21:05 +0530
Subject: [PATCH 01/10] feat: help article feedback

---
 .../js/frappe/form/sidebar/form_sidebar.js    | 13 ++++
 .../frappe/form/templates/form_sidebar.html   |  6 +-
 frappe/public/js/frappe/utils/common.js       |  6 ++
 frappe/public/less/sidebar.less               |  3 +-
 frappe/templates/includes/feedback.html       | 29 +++++++++
 frappe/website/doctype/feedback/__init__.py   |  0
 frappe/website/doctype/feedback/feedback.js   |  8 +++
 frappe/website/doctype/feedback/feedback.json | 59 +++++++++++++++++++
 frappe/website/doctype/feedback/feedback.py   | 27 +++++++++
 .../website/doctype/feedback/test_feedback.py | 10 ++++
 .../help_article/templates/help_article.html  |  5 +-
 11 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 frappe/templates/includes/feedback.html
 create mode 100644 frappe/website/doctype/feedback/__init__.py
 create mode 100644 frappe/website/doctype/feedback/feedback.js
 create mode 100644 frappe/website/doctype/feedback/feedback.json
 create mode 100644 frappe/website/doctype/feedback/feedback.py
 create mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index a145e47149..9450fdc674 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,6 +93,19 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
+			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
+				this.sidebar
+					.find(".helpful")
+					.html(
+						__("Helpful {0}", [String(res.message.helpful).bold()])
+					);
+				this.sidebar
+					.find(".not-helpful")
+					.html(
+						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
+					);
+			});
+
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 30b2205bae..3e72684818 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,11 +106,15 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
+	<li class="feedback">
+		<p class="helpful"></p>
+		<p class="not-helpful"></p>
+	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
 {% if(frappe.get_form_sidebar_extension) { %}
-    {{ frappe.get_form_sidebar_extension() }}
+	{{ frappe.get_form_sidebar_extension() }}
 {% } %}
 <ul class="list-unstyled visible-xs visible-sm">
 
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 1cdabf23e0..2fda8ed27a 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,3 +359,9 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
+
+frappe.utils.get_feedback = function(reference_name) {
+	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
+		reference_name: reference_name
+	});
+};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 109b7a3209..b6ffb7e697 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,7 +274,8 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count {
+	.pageview-count,
+	.feedback {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
new file mode 100644
index 0000000000..5d10c7b159
--- /dev/null
+++ b/frappe/templates/includes/feedback.html
@@ -0,0 +1,29 @@
+<div class="feedback-view mb-4">
+	<hr />
+	<span class="text-muted small">{{ _("Helpful?") }}</span>
+	<span class="small">
+		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
+		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
+	</span>
+</div>
+
+<script>
+	frappe.ready(function() {
+		$(".feedback").click(function() {
+			let args = {
+				reference_doctype: "{{ reference_doctype or doctype }}",
+				reference_name: "{{ reference_name or name }}",
+				helpful: this.getAttribute("data-value"),
+			}
+
+			frappe.call({
+				btn: this,
+				method: "frappe.website.doctype.feedback.feedback.add_feedback",
+				args: args,
+				callback: function(r) {
+					console.log(r);
+				}
+			})
+		})
+	});
+</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
new file mode 100644
index 0000000000..f5fa89b30e
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Feedback', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
new file mode 100644
index 0000000000..b04aefa462
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.json
@@ -0,0 +1,59 @@
+{
+ "actions": [],
+ "creation": "2020-05-07 16:42:27.234652",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "reference_doctype",
+  "reference_name",
+  "helpful"
+ ],
+ "fields": [
+  {
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "helpful",
+   "fieldtype": "Select",
+   "label": "Helpful",
+   "options": "Yes\nNo"
+  },
+  {
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_doctype",
+   "search_index": 1
+  }
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2020-05-07 16:53:29.211653",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Feedback",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
new file mode 100644
index 0000000000..3b92118ec3
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Feedback(Document):
+	pass
+
+@frappe.whitelist(allow_guest=True)
+def add_feedback(reference_doctype, reference_name, helpful):
+	frappe.get_doc({
+		"doctype": "Feedback",
+		"reference_doctype": reference_doctype,
+		"reference_name": reference_name,
+		"helpful": helpful
+	}).insert(ignore_permissions=True)
+
+@frappe.whitelist()
+def get_feedback_count(reference_name):
+
+	return {
+		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
+		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
+	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
new file mode 100644
index 0000000000..9a31738d75
--- /dev/null
+++ b/frappe/website/doctype/feedback/test_feedback.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestFeedback(unittest.TestCase):
+	pass
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 913e6d6a92..6c59359785 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,6 +19,9 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
+<div class="help-article-feedback">
+	{% include 'templates/includes/feedback.html' %}
+</div>
 <div class="help-article-comments">
 	<hr>
 	<h4>Comments</h4>
@@ -26,7 +29,7 @@
 </div>
 <script>
 frappe.ready(function() {
-    frappe.set_search_path("/kb");
+	frappe.set_search_path("/kb");
 });
 </script>
 {% endblock %}

From c3a45de794a23f96ba208add27c518765d8c9d80 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 8 May 2020 11:39:40 +0530
Subject: [PATCH 02/10] fix: feedback restrict to help article

---
 .../js/frappe/form/sidebar/form_sidebar.js    |  13 -
 .../frappe/form/templates/form_sidebar.html   |   4 -
 frappe/public/js/frappe/utils/common.js       |   6 -
 frappe/public/less/sidebar.less               |   3 +-
 frappe/templates/includes/feedback.html       |  29 -
 frappe/website/doctype/feedback/__init__.py   |   0
 frappe/website/doctype/feedback/feedback.js   |   8 -
 frappe/website/doctype/feedback/feedback.json |  59 --
 frappe/website/doctype/feedback/feedback.py   |  27 -
 .../website/doctype/feedback/test_feedback.py |  10 -
 .../doctype/help_article/help_article.js      |  15 +
 .../doctype/help_article/help_article.json    | 559 +++++-------------
 .../doctype/help_article/help_article.py      |  10 +-
 .../help_article/templates/help_article.html  |  26 +-
 14 files changed, 185 insertions(+), 584 deletions(-)
 delete mode 100644 frappe/templates/includes/feedback.html
 delete mode 100644 frappe/website/doctype/feedback/__init__.py
 delete mode 100644 frappe/website/doctype/feedback/feedback.js
 delete mode 100644 frappe/website/doctype/feedback/feedback.json
 delete mode 100644 frappe/website/doctype/feedback/feedback.py
 delete mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index 9450fdc674..a145e47149 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,19 +93,6 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
-			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
-				this.sidebar
-					.find(".helpful")
-					.html(
-						__("Helpful {0}", [String(res.message.helpful).bold()])
-					);
-				this.sidebar
-					.find(".not-helpful")
-					.html(
-						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
-					);
-			});
-
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 3e72684818..497a6488e2 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,10 +106,6 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
-	<li class="feedback">
-		<p class="helpful"></p>
-		<p class="not-helpful"></p>
-	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 2fda8ed27a..1cdabf23e0 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,9 +359,3 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
-
-frappe.utils.get_feedback = function(reference_name) {
-	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
-		reference_name: reference_name
-	});
-};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index b6ffb7e697..109b7a3209 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,8 +274,7 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count,
-	.feedback {
+	.pageview-count {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
deleted file mode 100644
index 5d10c7b159..0000000000
--- a/frappe/templates/includes/feedback.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="feedback-view mb-4">
-	<hr />
-	<span class="text-muted small">{{ _("Helpful?") }}</span>
-	<span class="small">
-		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
-		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
-	</span>
-</div>
-
-<script>
-	frappe.ready(function() {
-		$(".feedback").click(function() {
-			let args = {
-				reference_doctype: "{{ reference_doctype or doctype }}",
-				reference_name: "{{ reference_name or name }}",
-				helpful: this.getAttribute("data-value"),
-			}
-
-			frappe.call({
-				btn: this,
-				method: "frappe.website.doctype.feedback.feedback.add_feedback",
-				args: args,
-				callback: function(r) {
-					console.log(r);
-				}
-			})
-		})
-	});
-</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
deleted file mode 100644
index f5fa89b30e..0000000000
--- a/frappe/website/doctype/feedback/feedback.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Feedback', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
deleted file mode 100644
index b04aefa462..0000000000
--- a/frappe/website/doctype/feedback/feedback.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "actions": [],
- "creation": "2020-05-07 16:42:27.234652",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "reference_doctype",
-  "reference_name",
-  "helpful"
- ],
- "fields": [
-  {
-   "fieldname": "reference_doctype",
-   "fieldtype": "Link",
-   "label": "Reference DocType",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "helpful",
-   "fieldtype": "Select",
-   "label": "Helpful",
-   "options": "Yes\nNo"
-  },
-  {
-   "fieldname": "reference_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Reference Name",
-   "options": "reference_doctype",
-   "search_index": 1
-  }
- ],
- "in_create": 1,
- "links": [],
- "modified": "2020-05-07 16:53:29.211653",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Feedback",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
deleted file mode 100644
index 3b92118ec3..0000000000
--- a/frappe/website/doctype/feedback/feedback.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Feedback(Document):
-	pass
-
-@frappe.whitelist(allow_guest=True)
-def add_feedback(reference_doctype, reference_name, helpful):
-	frappe.get_doc({
-		"doctype": "Feedback",
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name,
-		"helpful": helpful
-	}).insert(ignore_permissions=True)
-
-@frappe.whitelist()
-def get_feedback_count(reference_name):
-
-	return {
-		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
-		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
-	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
deleted file mode 100644
index 9a31738d75..0000000000
--- a/frappe/website/doctype/feedback/test_feedback.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestFeedback(unittest.TestCase):
-	pass
diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index c56bda8e0b..0ca92aefbd 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -3,6 +3,21 @@
 
 frappe.ui.form.on('Help Article', {
 	refresh: function(frm) {
+		frm.dashboard.clear_headline();
 
+		frm.dashboard.set_headline_alert(`
+			<div class="row">
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap green">
+						<span>Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap red">
+						<span>Not Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+			</div>
+		`);
 	}
 });
diff --git a/frappe/website/doctype/help_article/help_article.json b/frappe/website/doctype/help_article/help_article.json
index 5957333724..ca659692c6 100644
--- a/frappe/website/doctype/help_article/help_article.json
+++ b/frappe/website/doctype/help_article/help_article.json
@@ -1,445 +1,158 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 1, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2014-10-30 14:25:53.780105", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_guest_to_view": 1,
+ "allow_import": 1,
+ "creation": "2014-10-30 14:25:53.780105",
+ "doctype": "DocType",
+ "field_order": [
+  "title",
+  "category",
+  "published",
+  "column_break_4",
+  "author",
+  "level",
+  "section_break_7",
+  "content",
+  "likes",
+  "route",
+  "owner",
+  "feedback",
+  "helpful",
+  "cb_00",
+  "not_helpful"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Title",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Help Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Category",
+   "options": "Help Category",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "published", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Published", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "published",
+   "fieldtype": "Check",
+   "label": "Published"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user_fullname", 
-   "fieldname": "author", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Author", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "user_fullname",
+   "fieldname": "author",
+   "fieldtype": "Data",
+   "label": "Author"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "level", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Level", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Beginner\nIntermediate\nExpert", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "level",
+   "fieldtype": "Select",
+   "label": "Level",
+   "options": "Beginner\nIntermediate\nExpert"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "in_global_search": 1,
+   "label": "Content",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "likes", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Likes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "likes",
+   "fieldtype": "Int",
+   "label": "Likes",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Route"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user", 
-   "fieldname": "owner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Owner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "user",
+   "fieldname": "owner",
+   "fieldtype": "Link",
+   "label": "Owner",
+   "options": "User"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "feedback",
+   "fieldtype": "Section Break",
+   "label": "Feedback"
+  },
+  {
+   "default": "0",
+   "fieldname": "helpful",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Helpful",
+   "read_only": 1
+  },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "not_helpful",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Not Helpful",
+   "read_only": 1
   }
- ], 
- "has_web_view": 1, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-file-alt", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_published_field": "published", 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-05-18 17:49:52.912440", 
- "modified_by": "Administrator", 
- "module": "Website", 
- "name": "Help Article", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 1,
+ "icon": "icon-file-alt",
+ "is_published_field": "published",
+ "links": [],
+ "modified": "2020-05-08 10:48:19.997789",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Help Article",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Knowledge Base Editor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Knowledge Base Editor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Knowledge Base Contributor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Knowledge Base Contributor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Guest", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "read": 1,
+   "role": "Guest"
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/help_article.py b/frappe/website/doctype/help_article/help_article.py
index 6220d0aff5..fa26cfef99 100644
--- a/frappe/website/doctype/help_article/help_article.py
+++ b/frappe/website/doctype/help_article/help_article.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.utils import is_markdown, markdown
+from frappe.utils import is_markdown, markdown, cint
 from frappe.website.utils import get_comment_list
 from frappe import _
 
@@ -100,3 +100,11 @@ def clear_website_cache(path=None):
 	frappe.cache().delete_value("knowledge_base:category_sidebar")
 	frappe.cache().delete_value("knowledge_base:faq")
 
+@frappe.whitelist(allow_guest=True)
+def add_feedback(article, helpful):
+	field = "helpful"
+	if helpful == "No":
+		field = "not_helpful"
+
+	value = cint(frappe.db.get_value("Help Article", article, field))
+	frappe.db.set_value("Help Article", article, field, value+1, update_modified=False)
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 6c59359785..4f71117dea 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,8 +19,13 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
-<div class="help-article-feedback">
-	{% include 'templates/includes/feedback.html' %}
+<div class="help-article-feedback mb-4">
+	<hr />
+	<div class="feedback-view ">
+		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+	</div>
 </div>
 <div class="help-article-comments">
 	<hr>
@@ -30,6 +35,23 @@
 <script>
 frappe.ready(function() {
 	frappe.set_search_path("/kb");
+	$(".feedback").click(function() {
+		let args = {
+			article: "{{ reference_name or name }}",
+			helpful: this.getAttribute("data-value"),
+		}
+
+		frappe.call({
+			btn: this,
+			method: "frappe.website.doctype.help_article.help_article.add_feedback",
+			args: args,
+			callback: function(r) {
+				$(".feedback")[0].disabled = true;
+				$(".feedback")[1].disabled = true;
+				frappe.msgprint(__("Feedback Submitted."));
+			}
+		})
+	});
 });
 </script>
 {% endblock %}

From 8c65d3581ebb634d913cc81a02dbda60fd278c4d Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 27 May 2020 13:39:29 +0530
Subject: [PATCH 03/10] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 4f71117dea..08c8fa342d 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -48,7 +48,7 @@ frappe.ready(function() {
 			callback: function(r) {
 				$(".feedback")[0].disabled = true;
 				$(".feedback")[1].disabled = true;
-				frappe.msgprint(__("Feedback Submitted."));
+				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})
 	});

From 86508e7617e9b9d448599b6298dacf83f840d136 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 15 Jun 2020 14:53:30 +0530
Subject: [PATCH 04/10] fix: change to primary for button

---
 .../help_article/templates/help_article.html       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 08c8fa342d..01271af8b9 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -23,8 +23,8 @@
 	<hr />
 	<div class="feedback-view ">
 		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
-		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
-		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,13 +41,19 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
+		let disable_button = function(btn) {
+			btn.classList.remove("btn-outline-primary");
+			btn.classList.add("btn-light");
+			btn.disabled = true
+		}
+
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].disabled = true;
-				$(".feedback")[1].disabled = true;
+				disable_button($(".feedback")[0]);
+				disable_button($(".feedback")[1]);
 				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})

From 0aceebd5507d088410354e6bf55acdc54667b816 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 24 Jun 2020 10:52:03 +0530
Subject: [PATCH 05/10] Update
 frappe/website/doctype/help_article/help_article.js

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/help_article.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index 0ca92aefbd..0a87b22e2c 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -14,7 +14,7 @@ frappe.ui.form.on('Help Article', {
 				</div>
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful ${frm.doc.helpful}</span>
+						<span>Not Helpful ${frm.doc.not_helpful}</span>
 					</span>
 				</div>
 			</div>

From 249d04420b9e32e8543c02bf8879d321747df5ba Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 13:28:15 +0530
Subject: [PATCH 06/10] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 01271af8b9..cdd830295f 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>

From 548a5fa41640e6bf7dff1e19c011146ddfa7e65e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 15:38:07 +0530
Subject: [PATCH 07/10] fix: add new disabled state

---
 .../help_article/templates/help_article.html        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index cdd830295f..a97154847b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -25,6 +25,7 @@
 		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,20 +42,14 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
-		let disable_button = function(btn) {
-			btn.classList.remove("btn-outline-primary");
-			btn.classList.add("btn-light");
-			btn.disabled = true
-		}
-
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				disable_button($(".feedback")[0]);
-				disable_button($(".feedback")[1]);
-				frappe.msgprint(__("Thank you for your feedback!"));
+				$(".feedback")[0].classList.add("hide");
+				$(".feedback")[1].classList.add("hide");
+				$(".feedback-msg")[0].classList.remove("hide");
 			}
 		})
 	});

From 817b2488271ef109d4f53ecf4b1856ff3635892e Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:28 +0530
Subject: [PATCH 08/10] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index a97154847b..bfe2bc4529 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
+		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>

From 44979d17f6762f069acca40fb0ac5063bd5df550 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:50 +0530
Subject: [PATCH 09/10] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 .../doctype/help_article/templates/help_article.html        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index bfe2bc4529..577383858b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -47,9 +47,9 @@ frappe.ready(function() {
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].classList.add("hide");
-				$(".feedback")[1].classList.add("hide");
-				$(".feedback-msg")[0].classList.remove("hide");
+				$(".feedback")[0].classList.add("hidden");
+				$(".feedback")[1].classList.add("hidden");
+				$(".feedback-msg")[0].classList.remove("hidden");
 			}
 		})
 	});

From 1f2cf125035185bd3c610702afa7de0969d7bbb8 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 22 Jul 2020 14:14:05 +0530
Subject: [PATCH 10/10] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index f5583931e2..1b4bf123e6 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -24,7 +24,7 @@
 		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
-		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
+		<span class="feedback-msg small hidden">{{ _("Thank you for your feedback!") }}</span>
 	</div>
 </div>
 <div class="help-article-comments">