From 60d93f29e947461326c83da023d3392ee7526158 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 27 Dec 2012 12:53:11 +0530 Subject: [PATCH 1/5] show content in hover in listview --- public/js/wn/views/listview.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/public/js/wn/views/listview.js b/public/js/wn/views/listview.js index 156ccea0fc..7cb7dfbfc7 100644 --- a/public/js/wn/views/listview.js +++ b/public/js/wn/views/listview.js @@ -39,7 +39,8 @@ wn.views.ListView = Class.extend({ opts.content(parent, data, me); } else if(opts.content=='name') { - $(parent).append(repl('%(name)s', data)); + $(parent).append(repl('%(name)s', data)); } else if(opts.content=='avatar') { $(parent).append(wn.avatar(data.owner, false, "Created by: " @@ -77,8 +78,14 @@ wn.views.ListView = Class.extend({ if(opts.type=="date") { data[opts.content] = wn.datetime.str_to_user(data[opts.content]) } + $(parent).append(repl(' %(content)s', { - "title": opts.title || opts.content, "content": data[opts.content]})); + "title": (opts.title || opts.content) + + (data[opts.content].indexOf("<")===-1 + ? ": " + data[opts.content] + : ""), + "content": data[opts.content] + })); } }, From b1f3d06a92c28d124276429b56b9ffd4e03e5152 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 27 Dec 2012 13:08:56 +0530 Subject: [PATCH 2/5] fix in listview show title on hover and customize form: show updated only if something returned from server --- core/doctype/customize_form/customize_form.js | 6 ++++-- public/js/wn/views/listview.js | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/doctype/customize_form/customize_form.js b/core/doctype/customize_form/customize_form.js index 032b6ca4dd..11a6e42fd1 100644 --- a/core/doctype/customize_form/customize_form.js +++ b/core/doctype/customize_form/customize_form.js @@ -49,8 +49,10 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { if(r.exc) { //msgprint(r.exc); } else { - if(r.server_messages) { cur_frm.cscript.doc_type(doc, doc.doctype, doc.name); } - cur_frm.frm_head.set_label(['Updated', 'label-success']); + if(r.server_messages) { + cur_frm.cscript.doc_type(doc, doc.doctype, doc.name); + cur_frm.frm_head.set_label(['Updated', 'label-success']); + } } }); } diff --git a/public/js/wn/views/listview.js b/public/js/wn/views/listview.js index 7cb7dfbfc7..4cf5bf7c20 100644 --- a/public/js/wn/views/listview.js +++ b/public/js/wn/views/listview.js @@ -55,14 +55,16 @@ wn.views.ListView = Class.extend({ $(parent).find('input').data('name', data.name); } else if(opts.content=='docstatus') { - $(parent).append(repl(' \ + ', data)); } else if(opts.content=='tags') { this.add_user_tags(parent, data); } else if(opts.content=='modified') { - $(parent).append(data.when); + $(parent).append(data.when) + .attr("title", "Last Modified On: " + data.when); } else if(opts.type=='bar-graph') { this.render_bar_graph(parent, data, opts.content, opts.label); @@ -82,7 +84,7 @@ wn.views.ListView = Class.extend({ $(parent).append(repl(' %(content)s', { "title": (opts.title || opts.content) + (data[opts.content].indexOf("<")===-1 - ? ": " + data[opts.content] + ? ": " + data[opts.content].replace(/\"/g, '"') : ""), "content": data[opts.content] })); From 01b5a77d9b5beb015885d444320c02327c54a9ed Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 27 Dec 2012 13:31:23 +0530 Subject: [PATCH 3/5] fixes in communication --- public/js/wn/views/communication.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/wn/views/communication.js b/public/js/wn/views/communication.js index 1fadb3c13a..7392589601 100644 --- a/public/js/wn/views/communication.js +++ b/public/js/wn/views/communication.js @@ -10,7 +10,7 @@ wn.views.CommunicationList = Class.extend({ return; } - var sortfn = function (a, b) { return (b > a) ? 1 : -1; } + var sortfn = function (a, b) { return (b.creation > a.creation) ? 1 : -1; } this.list = this.list.sort(sortfn); this.make(); @@ -61,6 +61,7 @@ wn.views.CommunicationList = Class.extend({ prepare: function(doc) { //doc.when = comment_when(this.doc.modified); doc.when = doc.modified; + if(!doc.content) doc.content = "[no content]"; if(doc.content.indexOf("
")== -1 && doc.content.indexOf("

")== -1) { doc.content = doc.content.replace(/\n/g, "
"); } From a86c1972a4936eabc663a43bd0eaef126720ec52 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 27 Dec 2012 13:52:34 +0530 Subject: [PATCH 4/5] if in developer mode, show fieldname on hover of label --- public/js/legacy/widgets/form/fields.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index 5834bd9e28..44805e782e 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -57,7 +57,10 @@ Field.prototype.make_body = function() { // label if(this.with_label) { - this.label_span = $a(this.label_area, 'span', 'small') + this.label_span = $a(this.label_area, 'span', 'small'); + + if(wn.boot && wn.boot.developer_mode) + $(this.label_span).attr("title", this.df.fieldname); // error icon this.label_icon = $('').toggle(false) From dbbe1fb4ee7e0e83c4ba77a5817c6ede5b9bf13e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 27 Dec 2012 14:05:02 +0530 Subject: [PATCH 5/5] fixes in listview --- public/js/wn/views/listview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/wn/views/listview.js b/public/js/wn/views/listview.js index 4cf5bf7c20..5960af680b 100644 --- a/public/js/wn/views/listview.js +++ b/public/js/wn/views/listview.js @@ -29,7 +29,7 @@ wn.views.ListView = Class.extend({ // multiple content if(opts.content.indexOf && opts.content.indexOf('+')!=-1) { $.map(opts.content.split('+'), function(v) { - me.render_column(data, parent, {content:v}); + me.render_column(data, parent, {content:v, title: opts.title}); }); return; }