From ef158136fff4b06e912eaa2a6e9f03a0c66e8129 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 Jul 2015 11:50:36 +0530
Subject: [PATCH 1/2] [fix] display for empty form frappe/erpnext#3506

---
 frappe/public/js/frappe/form/layout.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 10c8bd7c57..c26269a163 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -47,10 +47,11 @@ frappe.ui.form.Layout = Class.extend({
 		if (this.frm) {
 			// show empty form notification
 			setTimeout(function() {
-				me.wrapper.find(".empty-form-alert").remove();
-				if(!(me.wrapper.find(".frappe-control:visible").length)) {
-					$('<div class="empty-form-alert text-muted" style="margin: 15px; margin-top: -15px;">'+__("This form does not have any input")+'</div>')
-					.appendTo(me.wrapper)
+				me.page.find(".empty-form-alert").remove();
+				if(!(me.page.find(".frappe-control:visible").length)) {
+					$('<div class="empty-form-alert text-muted" style="padding: 15px;">'
+						+__("This form does not have any input")+'</div>')
+					.appendTo(me.page);
 				}
 			}, 100);
 		}

From 2338eef688fff3febdfe056487048aa3d77f37fd Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 Jul 2015 12:03:04 +0530
Subject: [PATCH 2/2] [fix] print format builder #3510

---
 frappe/print/page/print_format_builder/print_format_builder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/print/page/print_format_builder/print_format_builder.js b/frappe/print/page/print_format_builder/print_format_builder.js
index ce1c2c3a6c..d4b2f0f32e 100644
--- a/frappe/print/page/print_format_builder/print_format_builder.js
+++ b/frappe/print/page/print_format_builder/print_format_builder.js
@@ -152,6 +152,7 @@ frappe.PrintFormatBuilder = Class.extend({
 			me.page.set_primary_action(__("Save"), function() {
 				me.save_print_format();
 			});
+			me.page.clear_menu();
 			me.page.add_menu_item(__("Start new Format"), function() {
 				me.print_format = null;
 				me.refresh();