Merge pull request #1937 from netchampfaris/ui-fixes

[ui] multilevel dropdown fix

frappe/templates/includes/navbar/navbar_link.html

@@ -1,4 +1,4 @@
-<li data-label='{{ page.label }}' {% if page.child_items %} class="dropdown"{% endif %}>
+<li data-label='{{ page.label }}' {% if page.child_items %} class="dropdown dropdown-submenu"{% endif %}>
 	<a {% if not page.child_items -%} href="{{ (page.url or '')|abs_url }}" {%- endif %}
 		{% if page.child_items %} class="dropdown-toggle" onclick="return false;" data-toggle="dropdown"{% endif %}
 		{{ page.target or ''}}>

frappe/website/js/website.js

@@ -377,7 +377,8 @@ $(document).ready(function() {
 	// switch to app link
 	if(getCookie("system_user")==="yes" && logged_in) {
 		$("#website-post-login .dropdown-menu").append('<li><a href="/desk">Switch To Desk</a></li>');
-		$(".navbar-header .dropdown .dropdown-menu").append('<li><a href="/desk">Switch To Desk</a></li>');
+		$(".navbar-header .dropdown:not(.dropdown-submenu) > .dropdown-menu")
+			.append('<li><a href="/desk">Switch To Desk</a></li>');
 	}
 
 	frappe.render_user();
@@ -389,6 +390,12 @@ $(document).on("page-change", function() {
 	$(document).trigger("apply_permissions");
 	$('.dropdown-toggle').dropdown();
 
+	//multilevel dropdown fix
+	$('.dropdown-menu .dropdown-submenu .dropdown-toggle').on('click', function (e) {
+		e.stopPropagation();
+		$(this).parent().parent().parent().addClass('open');
+	})
+
 	$.extend(frappe, getCookies());
 	frappe.session = {'user': frappe.user_id};