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/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'}} ] diff --git a/js/all-app.js b/js/all-app.js index 3eda674be9..40a67fc2a1 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='