From 7d7682de85ce73c182ec9005d0813facdaafbbd3 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 7 Aug 2014 15:25:06 +0530
Subject: [PATCH] [ux] fixed primary action

---
 .../doctype/customize_form/customize_form.js     |  4 ++--
 frappe/core/doctype/todo/todo.js                 | 15 +++++++++++----
 frappe/core/doctype/user/user.js                 |  2 +-
 frappe/core/doctype/version/version.js           |  2 +-
 frappe/website/doctype/blog_post/blog_post.js    | 16 +++-------------
 .../doctype/website_settings/website_settings.js | 16 ++++++++--------
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/frappe/core/doctype/customize_form/customize_form.js b/frappe/core/doctype/customize_form/customize_form.js
index 9b15c3cf9a..cdd0c72b00 100644
--- a/frappe/core/doctype/customize_form/customize_form.js
+++ b/frappe/core/doctype/customize_form/customize_form.js
@@ -58,11 +58,11 @@ frappe.ui.form.on("Customize Form", "refresh", function(frm) {
 
 		frm.add_custom_button('Refresh Form', function() {
 			frm.script_manager.trigger("doc_type");
-		}, "icon-refresh");
+		}, "icon-refresh", "btn-default");
 
 		frm.add_custom_button('Reset to defaults', function() {
 			frappe.customize_form.confirm(__('Remove all customizations?'), frm);
-		}, "icon-eraser");
+		}, "icon-eraser", "btn-default");
 	}
 
 	// if(!frm.doc.doc_type) {
diff --git a/frappe/core/doctype/todo/todo.js b/frappe/core/doctype/todo/todo.js
index 2d190db8ad..c93d5ff329 100644
--- a/frappe/core/doctype/todo/todo.js
+++ b/frappe/core/doctype/todo/todo.js
@@ -1,10 +1,17 @@
 // bind events
 
 frappe.ui.form.on("ToDo", "refresh", function(frm) {
-	frm.add_custom_button((frm.doc.status=="Open" ? __("Close") : __("Re-open")), function() {
-		frm.set_value("status", frm.doc.status=="Open" ? "Closed" : "Open");
-		frm.save();
-	});
+	if(frm.doc.status=="Open") {
+		frm.add_custom_button(__("Close"), function() {
+			frm.set_value("status", "Closed");
+			frm.save();
+		}, "icon-ok", "btn-success");
+	} else {
+		frm.add_custom_button(__("Re-open"), function() {
+			frm.set_value("status", "Open");
+			frm.save();
+		}, null, "btn-default");
+	}
 
 	if(frm.doc.reference_type && frm.doc.reference_name) {
 		frm.set_intro('Reference: <a href="#Form/'+frm.doc.reference_type+'/'+frm.doc.reference_name+'">'
diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index ba5fe4bbff..7b87bb0d23 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -52,7 +52,7 @@ cur_frm.cscript.refresh = function(doc) {
 				"user": doc.name
 			};
 			frappe.set_route("user-permissions");
-		})
+		}, null, "btn-default")
 
 		if(has_common(user_roles, ["Administrator", "System Manager"])) {
 			cur_frm.toggle_display(['sb1', 'sb3'], true);
diff --git a/frappe/core/doctype/version/version.js b/frappe/core/doctype/version/version.js
index 0b62fc0fa0..f815cd444f 100644
--- a/frappe/core/doctype/version/version.js
+++ b/frappe/core/doctype/version/version.js
@@ -11,5 +11,5 @@ frappe.ui.form.on("Version", "refresh", function(frm) {
 				}
 			}
 		})
-	})
+	});
 })
diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js
index 9be0deed80..fbd5de1190 100644
--- a/frappe/website/doctype/blog_post/blog_post.js
+++ b/frappe/website/doctype/blog_post/blog_post.js
@@ -2,18 +2,8 @@
 // MIT License. See license.txt
 
 cur_frm.cscript.refresh = function(doc) {
-	if(!doc.__islocal && doc.published) {
-		if(!doc.email_sent) {
-			cur_frm.add_custom_button('Email Subscribers', function() {
-				$c_obj(doc, 'send_emails', '', function(r) {
-					cur_frm.refresh();
-				});
-			});
-		}
-
-		if (!doc.__islocal && doc.published) {
-			cur_frm.set_intro(__("Published on website at: {0}",
-				[repl('<a href="/%(website_route)s" target="_blank">/%(website_route)s</a>', doc.__onload)]));
-		}
+	if (!doc.__islocal && doc.published) {
+		cur_frm.set_intro(__("Published on website at: {0}",
+			[repl('<a href="/%(website_route)s" target="_blank">/%(website_route)s</a>', doc.__onload)]));
 	}
 }
diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index 66746130b4..0d240ba180 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -19,7 +19,7 @@ frappe.ui.form.on("Website Settings", "refresh", function(frm) {
 					}
 				})
 			})
-		})
+		}, null, "btn-default")
 	}
 })
 
@@ -29,31 +29,31 @@ $.extend(cur_frm.cscript, {
 	onload_post_render: function(doc) {
 		this.set_parent_label_options();
 	},
-	
+
 	label: function(doc, cdt, cdn) {
 		var item = frappe.get_doc(cdt, cdn);
 		if(item.parentfield === "top_bar_items") {
 			this.set_parent_label_options();
 		}
 	},
-	
+
 	parent_label: function(doc, cdt, cdn) {
 		this.label(doc, cdt, cdn);
 	},
-	
+
 	url: function(doc, cdt, cdn) {
 		this.label(doc, cdt, cdn);
 	},
-	
+
 	set_parent_label_options: function() {
-		frappe.meta.get_docfield("Top Bar Item", "parent_label", cur_frm.docname).options = 
+		frappe.meta.get_docfield("Top Bar Item", "parent_label", cur_frm.docname).options =
 			this.get_parent_options("top_bar_items");
-		
+
 		if($(cur_frm.fields_dict.top_bar_items.grid.wrapper).find(".grid-row-open")) {
 			cur_frm.fields_dict.top_bar_items.grid.refresh();
 		}
 	},
-	
+
 	// get labels of parent items
 	get_parent_options: function(table_field) {
 		var items = cur_frm.doc[table_field] || [];