From 423cdc643df98263b5244fdbef872bbc57af2510 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 8 Jun 2016 12:46:18 +0530
Subject: [PATCH] [minor] css for upload.js

---
 frappe/public/js/frappe/request.js     | 5 +++--
 frappe/public/js/frappe/ui/messages.js | 1 +
 frappe/public/js/frappe/ui/upload.html | 4 ++--
 frappe/public/js/frappe/upload.js      | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 48a6624291..72a490abac 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -231,8 +231,9 @@ frappe.request.cleanup = function(opts, r) {
 
 	// show messages
 	if(r._server_messages && !opts.silent) {
-		r._server_messages = JSON.parse(r._server_messages)
-		msgprint(r._server_messages);
+		r._server_messages = JSON.parse(r._server_messages);
+		frappe.hide_msgprint();
+		frappe.msgprint(r._server_messages);
 	}
 
 	// show errors
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 0b99aeccde..f3734c2665 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -140,6 +140,7 @@ frappe.msgprint = function(msg, title) {
 }
 
 frappe.hide_msgprint = function(instant) {
+	msg_dialog.msg_area.empty();
 	if(msg_dialog && msg_dialog.$wrapper.is(":visible")) {
 		if(instant) {
 			msg_dialog.$wrapper.removeClass("fade");
diff --git a/frappe/public/js/frappe/ui/upload.html b/frappe/public/js/frappe/ui/upload.html
index 134818e51b..254add2901 100644
--- a/frappe/public/js/frappe/ui/upload.html
+++ b/frappe/public/js/frappe/ui/upload.html
@@ -3,8 +3,8 @@
 		<input class="input-upload-file hidden" type="file" name="filedata" />
 		<button class="btn btn-primary btn-sm btn-browse">{%= __("Browse") %}</button>
 	</div>
-	<div class="uploaded-filename hidden" style="width: calc(100% - 67px);"></div>
-	<div class="web-link-wrapper" style="width: calc(100% - 67px);">
+	<div class="uploaded-filename hidden" style="width: calc(100% - 80px);"></div>
+	<div class="web-link-wrapper" style="width: calc(100% - 80px);">
 		<span class="text-muted file-upload-or">{%= __("or") %}</span>
 		<div class="input-link" style="width: calc(100% - 30px);">
 			<div class="input-group">
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 322818b940..94c9284f5c 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -161,8 +161,9 @@ frappe.upload = {
 			"method": "uploadfile",
 			args: args,
 			callback: function(r) {
-				if(!r._server_messages)
+				if(!r._server_messages) {
 					msgbox.hide();
+				}
 				if(r.exc) {
 					// if no onerror, assume callback will handle errors
 					opts.onerror ? opts.onerror(r) : opts.callback(null, null, r);