From 7af1c880fd47f15234243ecf40112d32e35de40c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 22 Mar 2012 11:59:46 +0530 Subject: [PATCH 1/2] grid table size fix --- css/all-app.css | 2 +- css/all-web.css | 2 +- js/all-app.js | 5 +++-- version.num | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index 6ef5847ca4..cb9940bfdb 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -3479,7 +3479,7 @@ span, div, td, input, textarea, button, select { } body { - background: url(../lib/images/ui/redbeech.jpg) repeat; + background: url(../images/redbeech.jpg) repeat; } .small { diff --git a/css/all-web.css b/css/all-web.css index a6c3429180..6a75d12c2a 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1619,7 +1619,7 @@ span, div, td, input, textarea, button, select { } body { - background: url(../lib/images/ui/redbeech.jpg) repeat; + background: url(../images/redbeech.jpg) repeat; } .small { diff --git a/js/all-app.js b/js/all-app.js index 684cce8874..898bbf83e2 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1857,7 +1857,8 @@ _f.Grid.prototype.hide=function(){$dh(this.wrapper);$dh(this.tbar_div);} _f.Grid.prototype.insert_column=function(doctype,fieldname,fieldtype,label,width,options,perm,reqd){var idx=this.head_row.cells.length;if(!width)width='100px';if((width+'').slice(-2)!='px'){width=width+'px';} var col=this.head_row.insertCell(idx);col.doctype=doctype;col.fieldname=fieldname;col.fieldtype=fieldtype;col.innerHTML='
'+label+'
';col.label=label;if(reqd) col.childNodes[0].style.color="#D22";col.style.width=width;col.options=options;col.perm=perm;this.col_idx_by_name[fieldname]=idx;} -_f.Grid.prototype.reset_table_width=function(){var w=0;for(var i=0,len=this.head_row.cells.length;i%(owner)s \ ×',d[i]))} -$(this.body).find('a.close').click(function(){$c('webnotes.widgets.form.assign_to.remove',{doctype:me.doctype,name:me.name,assign_to:$(this).attr('data-owner')},function(r,rt){me.render(r.message);});return false;});},add:function(){var me=this;if(!me.dialog){me.dialog=new wn.widgets.Dialog({title:'Add to To Do',width:350,fields:[{fieldtype:'Link',fieldname:'assign_to',options:'Profile',label:'Assign To',description:'Add to To Do List of',reqd:true},{fieldtype:'Data',fieldname:'description',label:'Comment'},{fieldtype:'Date',fieldname:'date',label:'Complete By'},{fieldtype:'Select',fieldname:'priority',label:'Priority',options:'Low\nMedium\nHigh','default':'Medium'},{fieldtype:'Check',fieldname:'notify',label:'Notify By Email'},{fieldtype:'Button',label:'Add',fieldname:'add_btn'}]});me.dialog.fields_dict.add_btn.input.onclick=function(){var assign_to=me.dialog.fields_dict.assign_to.get_value();if(assign_to){$c('webnotes.widgets.form.assign_to.add',{doctype:me.doctype,name:me.name,assign_to:assign_to,description:me.dialog.fields_dict.description.get_value(),priority:me.dialog.fields_dict.priority.get_value(),date:me.dialog.fields_dict.date.get_value(),notify:me.dialog.fields_dict.notify.get_value()},function(r,rt){me.render(r.message);});}}} +$(this.body).find('a.close').click(function(){$c('webnotes.widgets.form.assign_to.remove',{doctype:me.doctype,name:me.name,assign_to:$(this).attr('data-owner')},function(r,rt){me.render(r.message);});return false;});},add:function(){var me=this;if(!me.dialog){me.dialog=new wn.widgets.Dialog({title:'Add to To Do',width:350,fields:[{fieldtype:'Link',fieldname:'assign_to',options:'Profile',label:'Assign To',description:'Add to To Do List of',reqd:true},{fieldtype:'Data',fieldname:'description',label:'Comment','default':'Assigned by '+user},{fieldtype:'Date',fieldname:'date',label:'Complete By'},{fieldtype:'Select',fieldname:'priority',label:'Priority',options:'Low\nMedium\nHigh','default':'Medium'},{fieldtype:'Check',fieldname:'notify',label:'Notify By Email'},{fieldtype:'Button',label:'Add',fieldname:'add_btn'}]});me.dialog.fields_dict.add_btn.input.onclick=function(){var assign_to=me.dialog.fields_dict.assign_to.get_value();if(assign_to){$c('webnotes.widgets.form.assign_to.add',{doctype:me.doctype,name:me.name,assign_to:assign_to,description:me.dialog.fields_dict.description.get_value(),priority:me.dialog.fields_dict.priority.get_value(),date:me.dialog.fields_dict.date.get_value(),notify:me.dialog.fields_dict.notify.get_value()},function(r,rt){me.render(r.message);});}}} me.dialog.clear();me.dialog.show();}}); /* * lib/js/legacy/app.js diff --git a/version.num b/version.num index 97dc468497..5b2b555c51 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1339 +1340 \ No newline at end of file From 6ac1d73731e34e9384e6af7d22282b928624d7a6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 22 Mar 2012 12:10:49 +0530 Subject: [PATCH 2/2] lead listview --- erpnext/selling/doctype/lead/listview.js | 30 +++++++++++++++++++ .../doctype/support_ticket/listview.js | 7 ++--- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 erpnext/selling/doctype/lead/listview.js diff --git a/erpnext/selling/doctype/lead/listview.js b/erpnext/selling/doctype/lead/listview.js new file mode 100644 index 0000000000..368a1d9a16 --- /dev/null +++ b/erpnext/selling/doctype/lead/listview.js @@ -0,0 +1,30 @@ +wn.doclistviews['Lead'] = wn.views.ListView.extend({ + init: function(d) { + this._super(d) + this.fields = this.fields.concat([ + 'tabLead.lead_name', + 'tabLead.status', + 'tabLead.source' + ]); + this.stats = this.stats.concat(['status', 'source']); + }, + + prepare_data: function(data) { + this._super(data); + if(data.status=='Interested') { + data.label_type = 'success' + } + else if(['Open', 'Attempted to Contact', 'Contacted', 'Contact in Future'].indexOf(data.status)!=-1) { + data.label_type = 'info' + } + data.status_html = repl('%(status)s', data); + }, + + columns: [ + {width: '20%', content:'name'}, + {width: '10%', content:'status_html'}, + {width: '15%', content:'source'}, + {width: '40%', content:'tags+lead_name', css: {color:'#aaa'}}, + {width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} + ] +}) diff --git a/erpnext/support/doctype/support_ticket/listview.js b/erpnext/support/doctype/support_ticket/listview.js index 3c5258a40a..711e29e06f 100644 --- a/erpnext/support/doctype/support_ticket/listview.js +++ b/erpnext/support/doctype/support_ticket/listview.js @@ -31,14 +31,13 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({ // description if(data.description && data.description.length > 50) { - data.description = '' + data.description.substr(0,30) + '...'; + data.description = '' + data.description.substr(0,50) + '...'; } }, columns: [ - {width: '3%', content:'docstatus'}, - {width: '15%', content:'name'}, - {width: '8%', content:'status_html'}, + {width: '20%', content:'name'}, + {width: '10%', content:'status_html'}, {width: '60%', content:'tags+description', css: {color:'#aaa'}}, {width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} ]