From c455c40797cb6a04a909594f542de6bea10b6147 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Thu, 15 Dec 2016 09:47:10 +0530
Subject: [PATCH] [fix] mobile sidebar close button (#2462)

---
 frappe/desk/page/modules/modules_sidebar.html            | 6 +++++-
 frappe/public/js/frappe/form/templates/form_sidebar.html | 4 ++++
 frappe/public/js/frappe/list/list_sidebar.html           | 6 ++++--
 frappe/public/js/frappe/list/list_sidebar.js             | 2 +-
 frappe/public/js/frappe/ui/toolbar/toolbar.js            | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/page/modules/modules_sidebar.html b/frappe/desk/page/modules/modules_sidebar.html
index 04719f271a..a5f8cf2740 100644
--- a/frappe/desk/page/modules/modules_sidebar.html
+++ b/frappe/desk/page/modules/modules_sidebar.html
@@ -3,4 +3,8 @@
 			if(item.type==="module" && !item.blocked) { %}
 			{{ frappe.render_template("modules_sidebar_item", {"item": item}) }}
     {% }; } %}
-</ul>
+	<li class="divider"></li>
+	<li class="module-sidebar-item">
+		<a class="module-link">Close</a>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 7233397ffe..f3ed783e89 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -70,3 +70,7 @@
 {% if(frappe.get_form_sidebar_extension) { %}
     {{ frappe.get_form_sidebar_extension() }}
 {% } %}
+<ul class="list-unstyled visible-xs visible-sm">
+	<li class="divider"></li>
+	<li class="close-sidebar">Close</li>
+</ul>
\ No newline at end of file
diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html
index 981bfe5c2b..4e011f3ae9 100644
--- a/frappe/public/js/frappe/list/list_sidebar.html
+++ b/frappe/public/js/frappe/list/list_sidebar.html
@@ -29,5 +29,7 @@
     <li><a class="help-link" data-doctype="{{ doctype }}">{{ __("Help") }}</a></li>
     {% } %}
 </ul>
-
-
+<ul class="list-unstyled close-sidebar-button visible-xs visible-sm">
+	<li class="divider"></li>
+	<li class="close-sidebar">Close</li>
+</ul>
\ No newline at end of file
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 42acfdd63d..c1e13326fd 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -202,7 +202,7 @@ frappe.views.ListSidebar = Class.extend({
 					me.set_filter(fieldname, label);
 				}
 			})
-			.appendTo(this.sidebar);
+			.insertBefore(this.sidebar.find(".close-sidebar-button"));
 	},
 	set_fieldtype: function(df, fieldtype) {
 
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 6b8d0c73de..02701b767c 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -63,7 +63,7 @@ frappe.ui.toolbar.Toolbar = Class.extend({
 			function close_sidebar(e) {
 				scroll_container.css("overflow-y", "");
 
-				layout_side_section.find(".close-sidebar").fadeOut(function() {
+				layout_side_section.find("div.close-sidebar").fadeOut(function() {
 					overlay_sidebar.removeClass('opened')
 						.find('.dropdown-toggle')
 						.removeClass('text-muted');