From 91db9dc4eec361125b482e45fd21eb88714378a0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 11 Nov 2013 18:28:45 +0530 Subject: [PATCH] [cleanup] [ui] minor --- setup/doctype/contact_control/contact_control.js | 2 +- setup/page/setup_wizard/setup_wizard.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/setup/doctype/contact_control/contact_control.js b/setup/doctype/contact_control/contact_control.js index 6c3f17d833..af42d838e3 100755 --- a/setup/doctype/contact_control/contact_control.js +++ b/setup/doctype/contact_control/contact_control.js @@ -123,7 +123,7 @@ cur_frm.cscript.render_row_in_wrapper = function(wrapper, data, doctype) { }); // css - $wrapper.css({ 'padding': '5px 0px' }); + $wrapper.css({ 'margin': '0px' }); $wrapper.find('div.description').css({ 'padding': '5px 2px', 'line-height': '150%', diff --git a/setup/page/setup_wizard/setup_wizard.js b/setup/page/setup_wizard/setup_wizard.js index da6ea6bfa1..f75aeac277 100644 --- a/setup/page/setup_wizard/setup_wizard.js +++ b/setup/page/setup_wizard/setup_wizard.js @@ -241,6 +241,7 @@ wn.pages['setup-wizard'].onload = function(wrapper) { "help": wn._("List a few products or services you buy from your suppliers or vendors. If these are same as your products, then do not add them."), "fields": [ {fieldtype:"Data", fieldname:"item_buy_1", label:"Item 1", placeholder:"A Product or Service"}, + {fieldtype:"Column Break"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_1", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, @@ -248,6 +249,7 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Select", fieldname:"item_buy_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, {fieldtype:"Section Break"}, {fieldtype:"Data", fieldname:"item_buy_2", label:"Item 2", placeholder:"A Product or Service"}, + {fieldtype:"Column Break"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_2", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, @@ -255,6 +257,7 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Select", fieldname:"item_buy_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, {fieldtype:"Section Break"}, {fieldtype:"Data", fieldname:"item_buy_3", label:"Item 3", placeholder:"A Product or Service"}, + {fieldtype:"Column Break"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_3", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, @@ -262,6 +265,7 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Select", fieldname:"item_buy_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, {fieldtype:"Section Break"}, {fieldtype:"Data", fieldname:"item_buy_4", label:"Item 4", placeholder:"A Product or Service"}, + {fieldtype:"Column Break"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_4", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, @@ -269,6 +273,7 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Select", fieldname:"item_buy_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, {fieldtype:"Section Break"}, {fieldtype:"Data", fieldname:"item_buy_5", label:"Item 5", placeholder:"A Product or Service"}, + {fieldtype:"Column Break"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_5", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},