From e2d3b54cc3bc5a5db770b8599cf0a13de5b6d5c4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 25 Aug 2020 21:35:58 +0530
Subject: [PATCH] fix: Navbar

---
 frappe/public/js/frappe/ui/toolbar/navbar.html | 12 ++++++------
 frappe/utils/install.py                        |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 86df1e9fd3..4ffee22033 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -68,15 +68,15 @@
 					</a>
 					<div class="dropdown-menu dropdown-menu-right" id="toolbar-help" role="menu">
 						<div class="divider documentation-links"></div>
-						{% for item in navbar_items.help_dropdown %}
+						{% for item in navbar_settings.help_dropdown %}
 							{% if (!item.hidden) { %}
 								{% if (item.route) { %}
 									<a class="dropdown-item" href="{{ item.route }}">
-										{%= __(item.label) %}
+										{%= __(item.item_label) %}
 									</a>
 								{% } else if (item.action) { %}
 									<a class="dropdown-item" onclick="return {{ item.action }}">
-										{%= __(item.label) %}
+										{%= __(item.item_label) %}
 									</a>
 								{% } else { %}
 									<div class="dropdown-divider"></div>
@@ -90,15 +90,15 @@
 						{{ avatar }}
 					</a>
 					<div class="dropdown-menu dropdown-menu-right" id="toolbar-user" role="menu">
-						{% for item in navbar_items.settings_dropdown %}
+						{% for item in navbar_settings.settings_dropdown %}
 							{% if (!item.hidden) { %}
 								{% if (item.route) { %}
 									<a class="dropdown-item" href="{{ item.route }}">
-										{%= __(item.label) %}
+										{%= __(item.item_label) %}
 									</a>
 								{% } else if (item.action) { %}
 									<a class="dropdown-item" onclick="return {{ item.action }}">
-										{%= __(item.label) %}
+										{%= __(item.item_label) %}
 									</a>
 								{% } else { %}
 									<div class="dropdown-divider"></div>
diff --git a/frappe/utils/install.py b/frappe/utils/install.py
index d20abdb11d..6cd4044a7b 100644
--- a/frappe/utils/install.py
+++ b/frappe/utils/install.py
@@ -228,10 +228,6 @@ def add_standard_navbar_items():
 	]
 
 	standard_help_items = [
-		{
-			'item_type': 'Separator',
-			'is_standard': 1
-		},
 		{
 			'item_label': 'About',
 			'item_type': 'Action',