vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: Navbar

Browse source
This commit is contained in:
Suraj Shetty 2020-08-25 21:35:58 +05:30
parent 20fc9e659a
commit e2d3b54cc3
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/public/js/frappe/ui/toolbar/navbar.html
View file

@ -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>

4
frappe/utils/install.py
View file

@ -228,10 +228,6 @@ def add_standard_navbar_items():
]
standard_help_items = [
{
'item_type': 'Separator',
'is_standard': 1
},
{
'item_label': 'About',
'item_type': 'Action',