From b9878d01e1b9cc5506dd371e26f7c9faa7ac8069 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 12 Mar 2012 16:12:09 +0530 Subject: [PATCH] style fixes --- css/all-app.css | 23 ++- css/all-web.css | 7 +- .../projects/Module Def/Projects/Projects.txt | 141 ------------------ erpnext/projects/doctype/project/project.txt | 11 +- .../doctype/sales_common/sales_common.js | 12 +- erpnext/setup/page/import_data/import_data.js | 2 +- js/all-app.js | 44 +++--- js/all-web.js | 18 +-- version.num | 2 +- 9 files changed, 66 insertions(+), 194 deletions(-) delete mode 100644 erpnext/projects/Module Def/Projects/Projects.txt diff --git a/css/all-app.css b/css/all-app.css index f706a03f00..fad5701120 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -26,12 +26,15 @@ label { } select, input, textarea { - border: 1px solid #AAA; + border: 1px solid #ccc; -moz-border-radius: 4px; -webkit-border-radius: 4px; font-size: 13px; padding: 4px; - color: #222; + color: #444; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } textarea { @@ -299,6 +302,18 @@ div.notice { */ /* FORMS */ +div.form-section-break { + margin: 15px 0px 3px 0px; +} + +div.form-section-break h3 { + line-height: 20px; +} + +div.form-section-break hr { + margin: 9px 0px; +} + div.frm_print_wrapper { background-color:#FFF; @@ -442,9 +457,9 @@ div.time_field select{ .field_description, .help { - margin: 3px 0px 11px 0px; + margin: 3px 0px; + font-size: 11px; color: #888; - font-style: italic; } .field_description_top { diff --git a/css/all-web.css b/css/all-web.css index ceb6d9c7be..5843385975 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -26,12 +26,15 @@ label { } select, input, textarea { - border: 1px solid #AAA; + border: 1px solid #ccc; -moz-border-radius: 4px; -webkit-border-radius: 4px; font-size: 13px; padding: 4px; - color: #222; + color: #444; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } textarea { diff --git a/erpnext/projects/Module Def/Projects/Projects.txt b/erpnext/projects/Module Def/Projects/Projects.txt deleted file mode 100644 index f8cf6f7f72..0000000000 --- a/erpnext/projects/Module Def/Projects/Projects.txt +++ /dev/null @@ -1,141 +0,0 @@ -[ - { - '_last_update': '1300959287', - 'creation': '2010-11-30 17:31:44', - 'disabled': 'No', - 'docstatus': 0, - 'doctype': u'Module Def', - 'doctype_list': None, - 'file_list': 'undefined,undefined', - 'idx': None, - 'is_hidden': 'No', - 'last_updated_date': '2011-03-10 15:57:47', - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'module_desc': '
', - 'module_icon': 'puzzle.png', - 'module_label': 'Projects', - 'module_name': 'Projects', - 'module_page': None, - 'module_seq': 2, - 'name': 'Projects', - 'owner': 'Administrator', - 'parent': None, - 'parentfield': None, - 'parenttype': None, - 'trash_reason': None, - 'widget_code': None - }, - { - 'click_function': None, - 'creation': '2010-11-30 17:31:44', - 'description': None, - 'display_name': 'Project', - 'doc_name': 'Project', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 1, - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'name': 'MDI00099', - 'owner': 'Administrator', - 'parent': 'Projects', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': None, - 'description': None, - 'display_name': 'Task', - 'doc_name': 'Ticket', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 2, - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'name': 'MDI00285', - 'owner': None, - 'parent': 'Projects', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': None, - 'description': None, - 'display_name': 'Gantt Chart', - 'doc_name': 'Projects', - 'doc_type': 'Pages', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 3, - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'name': 'MDI00286', - 'owner': None, - 'parent': 'Projects', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': None, - 'description': None, - 'display_name': 'Timesheet', - 'doc_name': 'Timesheet', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 4, - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'name': 'MDI00287', - 'owner': None, - 'parent': 'Projects', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'creation': '2010-11-30 17:31:44', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 1, - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'name': 'MDR00012', - 'owner': 'Administrator', - 'parent': 'Projects', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Projects User' - }, - { - 'creation': '2010-11-30 17:31:44', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 2, - 'modified': '2011-03-24 15:07:53', - 'modified_by': 'Administrator', - 'name': 'MDR00013', - 'owner': 'Administrator', - 'parent': 'Projects', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'System Manager' - } -] \ No newline at end of file diff --git a/erpnext/projects/doctype/project/project.txt b/erpnext/projects/doctype/project/project.txt index f02db92328..936fd7dec9 100644 --- a/erpnext/projects/doctype/project/project.txt +++ b/erpnext/projects/doctype/project/project.txt @@ -5,14 +5,14 @@ { 'creation': '2010-08-08 17:09:14', 'docstatus': 0, - 'modified': '2012-03-12 14:25:08', + 'modified': '2012-03-12 16:07:48', 'modified_by': u'Administrator', 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': u'1331542439', + '_last_update': u'1331542508', 'allow_attach': 1, 'allow_trash': 1, 'autoname': u'field:project_name', @@ -29,7 +29,7 @@ 'show_in_menu': 0, 'subject': u' ', 'tag_fields': u'status', - 'version': 37 + 'version': 38 }, # These values are common for all DocField @@ -461,11 +461,14 @@ # DocField { + 'colour': u'White:FFF', 'doctype': u'DocField', 'fieldname': u'file_list', 'fieldtype': u'Small Text', + 'hidden': 1, 'label': u'File List', 'no_copy': 1, - 'permlevel': 0 + 'permlevel': 0, + 'print_hide': 1 } ] \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index deec159c5b..192875c2a8 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -100,14 +100,14 @@ var set_dynamic_label_par = function(doc, cdt, cdn, base_curr) { 'grand_total': 'Grand Total', 'rounded_total': 'Rounded Total', 'in_words': 'In Words'} par_cols_export = {'grand_total_export': 'Grand Total', 'rounded_total_export': 'Rounded Total', 'in_words_export': 'In Words'}; - for (d in par_cols_base) cur_frm.fields_dict[d].label_area.innerHTML = par_cols_base[d]+' (' + base_curr + ')'; - for (d in par_cols_export) cur_frm.fields_dict[d].label_area.innerHTML = par_cols_export[d]+' (' + doc.currency + ')'; - cur_frm.fields_dict['conversion_rate'].label_area.innerHTML = "Conversion Rate (" + doc.currency +' -> '+ base_curr + ')'; - cur_frm.fields_dict['plc_conversion_rate'].label_area.innerHTML = 'Price List Currency Conversion Rate (' + doc.price_list_currency +' -> '+ base_curr + ')'; + for (d in par_cols_base) cur_frm.fields_dict[d].label_span.innerHTML = par_cols_base[d]+' (' + base_curr + ')'; + for (d in par_cols_export) cur_frm.fields_dict[d].label_span.innerHTML = par_cols_export[d]+' (' + doc.currency + ')'; + cur_frm.fields_dict['conversion_rate'].label_span.innerHTML = "Conversion Rate (" + doc.currency +' -> '+ base_curr + ')'; + cur_frm.fields_dict['plc_conversion_rate'].label_span.innerHTML = 'Price List Currency Conversion Rate (' + doc.price_list_currency +' -> '+ base_curr + ')'; if (doc.doctype == 'Receivable Voucher') { - cur_frm.fields_dict['total_advance'].label_area.innerHTML = 'Total Advance (' + base_curr + ')'; - cur_frm.fields_dict['outstanding_amount'].label_area.innerHTML = 'Outstanding Amount (' + base_curr + ')'; + cur_frm.fields_dict['total_advance'].label_span.innerHTML = 'Total Advance (' + base_curr + ')'; + cur_frm.fields_dict['outstanding_amount'].label_span.innerHTML = 'Outstanding Amount (' + base_curr + ')'; } } diff --git a/erpnext/setup/page/import_data/import_data.js b/erpnext/setup/page/import_data/import_data.js index b3b0a499b6..734c16d6e7 100644 --- a/erpnext/setup/page/import_data/import_data.js +++ b/erpnext/setup/page/import_data/import_data.js @@ -47,7 +47,7 @@ pscript['onload_Import Data'] = function() { dt.onclick = function(){ var ovr = $('input[name="overwrite"]:checked').length; - window.location = webnotes.request.url + '?cmd=get_template&dt=' + this.nm + (ovr ? '&overwrite=1' : ''); + window.location = wn.request.url + '?cmd=get_template&dt=' + this.nm + (ovr ? '&overwrite=1' : ''); } } } diff --git a/js/all-app.js b/js/all-app.js index 71e09547df..815a3db524 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -473,7 +473,7 @@ function $c_page(module,page,method,arg,callback,no_spinner,freeze_msg,btn){if(a function $c_obj_csv(doclist,method,arg){var args={} args.cmd='runserverobj';args.as_csv=1;args.method=method;args.arg=arg;if(doclist.substr) args.doctype=doclist;else -args.docs=compress_doclist(doclist);open_url_post(webnotes.request.url,args);} +args.docs=compress_doclist(doclist);open_url_post(wn.request.url,args);} function open_url_post(URL,PARAMS,new_window){var temp=document.createElement("form");temp.action=URL;temp.method="POST";temp.style.display="none";if(new_window){temp.target='_blank';} for(var x in PARAMS){var opt=document.createElement("textarea");opt.name=x;opt.value=PARAMS[x];temp.appendChild(opt);} document.body.appendChild(temp);temp.submit();return temp;} @@ -528,12 +528,12 @@ html.push('');html.push('';var div=$a(parent,'div');div.innerHTML='
';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';} + style="width:0px; height:0px; border:0px">';var div=$a(parent,'div');div.innerHTML='
';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';} var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];} uploaders[id]=this;} function upload_callback(id,fid){uploaders[id].callback(fid);} @@ -1372,12 +1372,12 @@ this.setup();} var no_value_fields=['Section Break','Column Break','HTML','Table','FlexTable','Button','Image'];var codeid=0;var code_editors={};function Field(){this.with_label=1;} Field.prototype.make_body=function(){var ischk=(this.df.fieldtype=='Check'?1:0);if(this.parent) this.wrapper=$a(this.parent,(this.with_label?'div':'span'));else -this.wrapper=document.createElement((this.with_label?'div':'span'));this.label_area=$a(this.wrapper,'div','',{margin:'8px 0px 2px 0px'});if(ischk&&!this.in_grid){this.input_area=$a(this.label_area,'span','',{marginRight:'4px'});this.disp_area=$a(this.label_area,'span','',{marginRight:'4px'});} +this.wrapper=document.createElement((this.with_label?'div':'span'));this.label_area=$a(this.wrapper,'div','',{margin:'0px 0px 2px 0px'});if(ischk&&!this.in_grid){this.input_area=$a(this.label_area,'span','',{marginRight:'4px'});this.disp_area=$a(this.label_area,'span','',{marginRight:'4px'});} if(this.with_label){this.label_span=$a(this.label_area,'span','field_label') this.label_icon=$a(this.label_area,'img','',{margin:'-3px 4px -3px 4px'});$dh(this.label_icon);this.label_icon.src='lib/images/icons/error.gif';this.label_icon.title='Mandatory value needs to be entered';this.suggest_icon=$a(this.label_area,'img','',{margin:'-3px 4px -3px 0px'});$dh(this.suggest_icon);this.suggest_icon.src='lib/images/icons/bullet_arrow_down.png';this.suggest_icon.title='With suggestions';}else{this.label_span=$a(this.label_area,'span','',{marginRight:'4px'}) $dh(this.label_area);} if(!this.input_area){this.input_area=$a(this.wrapper,(this.with_label?'div':'span'));this.disp_area=$a(this.wrapper,(this.with_label?'div':'span'));} -if(this.in_grid){if(this.label_area)$dh(this.label_area);}else{this.input_area.className='input_area';$y(this.wrapper,{marginBottom:'4px'});this.set_description();} +if(this.in_grid){if(this.label_area)$dh(this.label_area);}else{this.input_area.className='input_area';$y(this.wrapper,{marginBottom:'9px'});this.set_description();} if(this.onmake)this.onmake();} Field.prototype.set_max_width=function(){var no_max=['Code','Text Editor','Text','Table','HTML'] if(this.wrapper&&this.layout_cell&&this.layout_cell.parentNode.cells&&this.layout_cell.parentNode.cells.length==1&&!in_list(no_max,this.df.fieldtype)){$y(this.wrapper,{paddingRight:'50%'});}} @@ -1643,7 +1643,7 @@ this.setup_footer();if(!(this.meta.istable||user=='Guest'))this.frm_head=new _f. this.layout.wrapper.style.backgroundColor='#'+this.meta.colour.split(':')[1];this.setup_fields_std();if(this.meta.description) this.add_description();} _f.Frm.prototype.add_description=function(){if(!wn.md2html){wn.require('lib/js/lib/showdown.js');wn.md2html=new Showdown.converter();} -this.description_wrapper=$a(this.page_layout.footer.help_area,'div','info-box',{marginTop:'10px'},wn.md2html.makeHtml('#### Help\n\n'+this.meta.description));} +this.description_wrapper=$a(this.page_layout.footer.help_area,'div','well',{marginTop:'11px'},wn.md2html.makeHtml('#### Help\n\n'+this.meta.description));} _f.Frm.prototype.setup_print=function(){var fl=getchildren('DocFormat',this.meta.name,'formats','DocType');var l=[];this.default_format='Standard';if(fl.length){this.default_format=fl[0].format;for(var i=0;i50?'...':'');} -var span=$a(div,'i','icon-arrow-up',{cssFloat:'right',marginRight:'8px',cursor:'pointer',verticalAlign:'middle',marginTop:'7px'}) -span.title='Go to top';span.onclick=function(){scroll(0,0);} -this.chk.onclick=function(){if(this.checked)me.expand();else me.collapse();} -this.expand=function(){$(me.row.main_body).slideDown();} -this.collapse=function(){$(me.row.main_body).slideUp();} -if(me.frm.section_count){$dh(this.row.main_body);}else{this.chk.checked=true;}} -_f.SectionBreak.prototype.make_simple_section=function(with_header){this.wrapper=$a(this.row.main_head,'div','',{margin:'8px 8px 0px 0px'});var me=this;if(this.df.colour){var col=this.df.colour.split(':')[1];if(col!='FFF'){$y(this.row.sub_wrapper,{margin:'8px',padding:'0px',backgroundColor:('#'+col)});}} -if(with_header){if(this.df.label&&this.df.options!='Simple'){this.make_collapsible(this.wrapper);}else{$y(this.wrapper,{paddingBottom:'4px'});if(this.df.label){$a(this.wrapper,'h3','',{},this.df.label);}}} -$y(this.row.body,{marginLeft:'17px'});} _f.SectionBreak.prototype.add_to_sections=function(){this.sec_id=this.frm.sections.length;this.frm.sections[this.sec_id]=this;this.frm.sections_by_label[this.df.label]=this;} _f.cur_sec_header=null;_f.SectionBreak.prototype.make_body=function(){if((!this.perm[this.df.permlevel])||(!this.perm[this.df.permlevel][READ])||this.df.hidden){return;} -var me=this;if(this.df){this.make_row();this.make_simple_section(1,1);}} +this.make_row();this.wrapper=$a(this.row.main_head,'div');if(this.df.label){if(!this.df.description)this.df.description='';$(this.wrapper).html(repl('
\ +

%(label)s

\ +
%(description)s
\ +
',this.df));}else{$(this.wrapper).html('
');} +$y(this.row.body,{marginLeft:'17px'});} _f.SectionBreak.prototype.refresh=function(layout){var fn=this.df.fieldname?this.df.fieldname:this.df.label;if(fn) this.df=get_field(this.doctype,fn,this.docname);if(this.set_hidden!=this.df.hidden){if(this.df.hidden){if(this.frm.meta.section_style=='Tabbed'){$dh(this.mytab);}else if(this.tray_item) this.tray_item.hide();if(this.row)this.row.hide();}else{if(this.frm.meta.section_style=='Tabbed'){$di(this.mytab);}else if(this.tray_item) @@ -1807,10 +1799,10 @@ this.tray_item.show();if(this.expanded)this.row.show();} this.set_hidden=this.df.hidden;}} _f.ImageField=function(){this.images={};} _f.ImageField.prototype=new Field();_f.ImageField.prototype.onmake=function(){this.no_img=$a(this.wrapper,'div','no_img');this.no_img.innerHTML="No Image";$dh(this.no_img);} -_f.ImageField.prototype.get_image_src=function(doc){if(doc.file_list){file=doc.file_list.split(',');extn=file[0].split('.');extn=extn[extn.length-1].toLowerCase();var img_extn_list=['gif','jpg','bmp','jpeg','jp2','cgm','ief','jpm','jpx','png','tiff','jpe','tif'];if(in_list(img_extn_list,extn)){var src=webnotes.request.url+"?cmd=downloadfile&file_id="+file[1];}}else{var src="";} +_f.ImageField.prototype.get_image_src=function(doc){if(doc.file_list){file=doc.file_list.split(',');extn=file[0].split('.');extn=extn[extn.length-1].toLowerCase();var img_extn_list=['gif','jpg','bmp','jpeg','jp2','cgm','ief','jpm','jpx','png','tiff','jpe','tif'];if(in_list(img_extn_list,extn)){var src=wn.request.url+"?cmd=downloadfile&file_id="+file[1];}}else{var src="";} return src;} _f.ImageField.prototype.onrefresh=function(){var me=this;if(!this.images[this.docname])this.images[this.docname]=$a(this.wrapper,'img');else $di(this.images[this.docname]);var img=this.images[this.docname] -for(var dn in this.images)if(dn!=this.docname)$dh(this.images[dn]);var doc=locals[this.frm.doctype][this.frm.docname];if(!this.df.options)var src=this.get_image_src(doc);else var src=webnotes.request.url+'?cmd=get_file&fname='+this.df.options+"&__account="+account_id+(__sid150?("&sid150="+__sid150):'');if(src){$dh(this.no_img);if(img.getAttribute('src')!=src)img.setAttribute('src',src);canvas=this.wrapper;canvas.img=this.images[this.docname];canvas.style.overflow="auto";$w(canvas,"100%");if(!this.col_break_width)this.col_break_width='100%';var allow_width=cint(1000*(cint(this.col_break_width)-10)/100);if((!img.naturalWidth)||cint(img.naturalWidth)>allow_width) +for(var dn in this.images)if(dn!=this.docname)$dh(this.images[dn]);var doc=locals[this.frm.doctype][this.frm.docname];if(!this.df.options)var src=this.get_image_src(doc);else var src=wn.request.url+'?cmd=get_file&fname='+this.df.options+"&__account="+account_id+(__sid150?("&sid150="+__sid150):'');if(src){$dh(this.no_img);if(img.getAttribute('src')!=src)img.setAttribute('src',src);canvas=this.wrapper;canvas.img=this.images[this.docname];canvas.style.overflow="auto";$w(canvas,"100%");if(!this.col_break_width)this.col_break_width='100%';var allow_width=cint(1000*(cint(this.col_break_width)-10)/100);if((!img.naturalWidth)||cint(img.naturalWidth)>allow_width) $w(img,allow_width+'px');}else{$ds(this.no_img);}} _f.ImageField.prototype.set_disp=function(val){} _f.ImageField.prototype.set=function(val){} @@ -2098,8 +2090,8 @@ this.refresh();} /* * lib/js/legacy/wn/widgets/form/attachments.js */ -wn.widgets.form.sidebar.Attachments=function(parent,sidebar,doctype,docname){var me=this;this.frm=sidebar.form;this.make=function(){if(this.wrapper)this.wrapper.innerHTML='';else this.wrapper=$a(parent,'div','sidebar-comment-wrapper');this.attach_wrapper=$a(this.wrapper,'div');if(this.frm.doc.__islocal){this.attach_wrapper.innerHTML='Attachments can be uploaded after saving' -return;} +wn.widgets.form.sidebar.Attachments=function(parent,sidebar,doctype,docname){var me=this;this.frm=sidebar.form;this.make=function(){if(this.wrapper)this.wrapper.innerHTML='';else this.wrapper=$a(parent,'div','sidebar-comment-wrapper');this.attach_wrapper=$a(this.wrapper,'div');if(this.frm.doc.__islocal){this.attach_wrapper.innerHTML='
Attachments can be \ + uploaded after saving
';return;} var n=this.frm.doc.file_list?this.frm.doc.file_list.split('\n').length:0;if(n\
\ @@ -689,7 +689,7 @@ $.extend(this,this.opts);this.prepare_opts();$(this.parent).html(repl('\
\ \

%(title)s

\ -
\ +
\
\ \ Refresh\ @@ -702,7 +702,6 @@ $.extend(this,this.opts);this.prepare_opts();$(this.parent).html(repl('\ class="img-load"/>\
\ \ -
\
\
\
\ @@ -731,7 +730,8 @@ if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newd if(!me.show_filters){this.$w.find('.btn-filter').toggle(false).attr('hidden','hidden');} if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').toggle(false).attr('hidden','hidden');} if(this.show_grid){this.$w.find('.select-view').toggle(true);} -if(this.$w.find('.list-toolbar a[hidden!="hidden"]').length>1){this.$w.find('.list-toolbar').addClass('btn-group')}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function') +if(this.$w.find('.list-toolbar a[hidden!="hidden"]').length>1){this.$w.find('.list-toolbar').addClass('btn-group')} +if(this.$w.find('.list-toolbar a[hidden!="hidden"]').length==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function') this.onrun=a0;if(a0&&a0.callback) this.onrun=a0.callback;if(!a1&&!(a0&&a0.append)) this.start=0;me.$w.find('.img-load').toggle(true);wn.call({method:this.opts.method||'webnotes.widgets.query_builder.runquery',args:this.get_call_args(),callback:function(r){me.$w.find('.img-load').toggle(false);me.render_results(r)},no_spinner:this.opts.no_loading,btn:this.run_btn});},get_call_args:function(){if(!this.method){this.query=this.get_query?this.get_query():this.query;this.add_limits();var args={query_max:this.query_max,as_dict:1} @@ -790,7 +790,7 @@ LayoutRow.prototype.hide=function(){$dh(this.wrapper);} LayoutRow.prototype.show=function(){$ds(this.wrapper);} LayoutRow.prototype.addCell=function(wid){var lc=new LayoutCell(this.layout,this,wid);this.mycells[this.mycells.length]=lc;return lc;} function LayoutCell(layout,layoutRow,width){if(width){var w=width+'';if(w.substr(w.length-2,2)!='px'){if(w.substr(w.length-1,1)!="%"){width=width+'%'};}} -this.width=width;this.layout=layout;var cidx=layoutRow.row.cells.length;this.cell=layoutRow.row.insertCell(cidx);this.cell.style.verticalAlign='top';this.set_width(layoutRow.row,width);var h=$a(this.cell,'div','',{padding:(layout.with_border?'0px 8px':'0px')});this.wrapper=$a(this.cell,'div','',{padding:(layout.with_border?'8px':'8px 0px')});layout.cur_cell=this.wrapper;layout.cur_cell.header=h;} +this.width=width;this.layout=layout;var cidx=layoutRow.row.cells.length;this.cell=layoutRow.row.insertCell(cidx);this.cell.style.verticalAlign='top';this.set_width(layoutRow.row,width);var h=$a(this.cell,'div','',{padding:(layout.with_border?'0px 8px':'0px')});this.wrapper=$a(this.cell,'div','',{padding:(layout.with_border?'8px':'0px')});layout.cur_cell=this.wrapper;layout.cur_cell.header=h;} LayoutCell.prototype.set_width=function(row,width){var w=100;var n_cells=row.cells.length;var cells_with_no_width=n_cells;if(width){$y(row.cells[n_cells-1],{width:cint(width)+'%'})}else{row.cells[n_cells-1].estimated_width=1;} for(var i=0;i';var div=$a(parent,'div');div.innerHTML='
';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';} + style="width:0px; height:0px; border:0px">';var div=$a(parent,'div');div.innerHTML='
';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';} var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];} uploaders[id]=this;} function upload_callback(id,fid){uploaders[id].callback(fid);} diff --git a/version.num b/version.num index 90afd51b60..e57d8dfad6 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -940 \ No newline at end of file +965 \ No newline at end of file