erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-16 18:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix navbar in login menu

Browse Source
This commit is contained in:
Raghavendra Kamath
2018-04-26 12:23:30 +05:30
parent 6f0e8fe52f
commit ad0d48ac6a
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
foundation/templates/includes/navbar/navbar.html
View File

@@ -1,12 +1,11 @@
<nav class="navbar navbar-expand-lg border-bottom" role="navigation"> <nav class="navbar navbar-expand-lg border-bottom navbar-light" role="navigation">
<a class="navbar-brand ellipsis" <a class="navbar-brand" href="{{ url_prefix }}{{ home_page or "/"}}">
href="{{ url_prefix }}{{ home_page or "/"}}">
<span>{{ brand_html or (frappe.get_hooks("brand_html") or ["Home"])[0] }}</span> <span>{{ brand_html or (frappe.get_hooks("brand_html") or ["Home"])[0] }}</span>
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarNavDropdown">
{% include "templates/includes/navbar/navbar_items.html" %} {% include "templates/includes/navbar/navbar_items.html" %}
</div> </div>
</nav> </nav>

2
foundation/templates/includes/navbar/navbar_link.html
View File

@@ -1,6 +1,6 @@
<li class="nav-item {% if page.child_items %} dropdown {% endif %}" data-label='{{ page.label }}'> <li class="nav-item {% if page.child_items %} dropdown {% endif %}" data-label='{{ page.label }}'>
<a {% if not page.child_items -%} class="nav-link" href="{{ (page.url or '')|abs_url }}" {%- endif %} <a {% if not page.child_items -%} class="nav-link" href="{{ (page.url or '')|abs_url }}" {%- endif %}
{% if page.child_items %} class="nav-link dropdown-toggle" data-toggle="dropdown" id="navbarDropdown" role="button" aria-haspopup="true" aria-expanded="false" {% endif %} {% if page.child_items %} class="nav-link dropdown-toggle" data-toggle="dropdown" id="navbarDropdownMenuLink" role="button" aria-haspopup="true" aria-expanded="false" {% endif %}
{{ page.target or ''}}> {{ page.target or ''}}>
{{ page.label }} {{ page.label }}
</a> </a>

4
foundation/templates/includes/navbar/navbar_login.html
View File

@@ -10,13 +10,13 @@
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
{%- for child in post_login -%} {%- for child in post_login -%}
{%- if child.url -%} {%- if child.url -%}
<a href="{{ child.url | abs_url }}" {{ child.target or '' }} <a class="dropdown-item" href="{{ child.url | abs_url }}" {{ child.target or '' }}
rel="nofollow"> rel="nofollow">
{{ child.label }} {{ child.label }}
</a> </a>
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}
<a href="/desk">{{ _('Switch To Desk') }}</a> <a class="dropdown-item" href="/desk">{{ _('Switch To Desk') }}</a>
</div> </div>
</li> </li>
{% if not hide_login %} {% if not hide_login %}