')
+ .appendTo(msg_dialog.body);
+ }
+
+ if(msg.search(/
|
/)==-1)
+ msg = replace_newlines(msg);
+
+ msg_dialog.set_title(title || 'Message')
+ msg_dialog.msg_area.append(msg);
+ msg_dialog.show();
+
+}
+
+/*
function msgprint(msg, issmall, callback) {
if(!msg) return;
@@ -67,8 +100,8 @@ function msgprint(msg, issmall, callback) {
msg_dialog.msg_icon.src = 'images/lib/icons/accept.gif'; $di(msg_dialog.msg_icon); msg = msg.substr(3);
}
-
- m.innerHTML = replace_newlines(msg);
+ if(msg.search(/
|
/)==-1)
+ m.innerHTML = replace_newlines(msg);
if(m.offsetHeight > 200) {
$y(m, {height:'200px', width:'400px', overflow:'auto'})
@@ -76,7 +109,7 @@ function msgprint(msg, issmall, callback) {
msg_dialog.custom_onhide = callback;
-}
+}*/
// Floating Message
diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js
index 6125020379..22e480777b 100644
--- a/js/legacy/widgets/form/form.js
+++ b/js/legacy/widgets/form/form.js
@@ -318,7 +318,8 @@ _f.Frm.prototype.set_intro = function(txt) {
.insertBefore(this.page_layout.body.firstChild);
}
if(txt) {
- this.intro_area.html(txt);
+ if(txt.search(/
/)==-1) txt = '
' + txt + '
';
+ this.intro_area.html(txt);
} else {
this.intro_area.remove();
this.intro_area = null;
@@ -1096,6 +1097,8 @@ _f.set_value = function(dt, dn, fn, v) {
if(changed && (d[fn]==null || v==null) && (cstr(d[fn])==cstr(v))) changed = 0;
if(changed) {
+ //console.log('value changed for ' + dt + ', ' + dn + ', ' + fn)
+
var prev_unsaved = d.__unsaved
d[fn] = v;
d.__unsaved = 1;
diff --git a/js/legacy/widgets/form/form_fields.js b/js/legacy/widgets/form/form_fields.js
index d9c5dd7198..6c0972ea9e 100644
--- a/js/legacy/widgets/form/form_fields.js
+++ b/js/legacy/widgets/form/form_fields.js
@@ -152,14 +152,7 @@ _f.SectionBreak.prototype.refresh = function(from_form) {
if(hidden) {
if(this.row)this.row.hide();
} else {
- if(this.collapsible) {
- //this.section_expand(from_form);
- //if(this.df.reqd || this.has_data()) {
- // this.section_expand(from_form);
- //} else {
- // this.section_collapse();
- //}
- }
+ if(this.row)this.row.show();
}
}
@@ -241,7 +234,8 @@ _f.TableField.prototype.make_body = function() {
// description
if(this.df.description) {
- this.desc_area = $a(this.parent, 'div', 'help small', '', this.df.description)
+ this.desc_area = $a(this.parent, 'div', 'help small',
+ {marginBottom:'9px', marginTop:'0px'}, this.df.description)
}
}
}
diff --git a/js/legacy/widgets/form/form_header.js b/js/legacy/widgets/form/form_header.js
index 86504e2efe..54931a0e22 100644
--- a/js/legacy/widgets/form/form_header.js
+++ b/js/legacy/widgets/form/form_header.js
@@ -31,14 +31,17 @@
_f.FrmHeader = Class.extend({
init: function(parent, frm) {
this.appframe = new wn.ui.AppFrame(parent)
- this.appframe.$titlebar.append('\
-
');
this.$w = this.appframe.$w;
},
refresh: function() {
// refresh breadcrumbs
- wn.views.breadcrumbs($(this.$w.find('.breadcrumb-area')),
- cur_frm.meta.module, cur_frm.meta.name, cur_frm.docname);
+ if(cur_frm.cscript.set_breadcrumbs) {
+ this.appframe.clear_breadcrumbs();
+ cur_frm.cscript.set_breadcrumbs();
+ } else {
+ wn.views.breadcrumbs(this.appframe,
+ cur_frm.meta.module, cur_frm.meta.name, cur_frm.docname);
+ }
this.refresh_labels();
this.refresh_toolbar();
@@ -116,6 +119,12 @@ _f.FrmHeader = Class.extend({
// Amend
if(docstatus==2 && p[AMEND])
this.appframe.add_button('Amend', function() { cur_frm.amend_doc() }, 'icon-pencil');
+
+ // Help
+ if(cur_frm.meta.description) {
+ this.appframe.add_help_button(wn.markdown('## ' + cur_frm.doctype + '\n
\n'
+ + cur_frm.meta.description));
+ }
},
show: function() {
diff --git a/js/legacy/wn/widgets/form/sidebar.js b/js/legacy/wn/widgets/form/sidebar.js
index 70dc021fad..56d8f40cfd 100644
--- a/js/legacy/wn/widgets/form/sidebar.js
+++ b/js/legacy/wn/widgets/form/sidebar.js
@@ -160,15 +160,6 @@ wn.widgets.form.sidebar = { Sidebar: function(form) {
}));
},
display: function() { return !me.form.doc.__islocal }
- },
-
- {
- title: 'Help',
- render: function(wrapper) {
- $(wrapper).html('
'
- + wn.markdown(me.form.meta.description) + '
')
- },
- display: function() { return me.form.meta.description }
}
]
}
diff --git a/js/wn/ui/appframe.js b/js/wn/ui/appframe.js
index 62b33d0768..3ca97aef74 100644
--- a/js/wn/ui/appframe.js
+++ b/js/wn/ui/appframe.js
@@ -18,10 +18,12 @@ wn.ui.AppFrame = Class.extend({
title: function(txt) {
this.$titlebar.find('.appframe-title').html(txt);
},
- add_button: function(label, click, icon) {
+ make_toolbar: function() {
if(!this.$w.find('.appframe-toolbar').length)
- this.$w.append('
');
-
+ this.$w.append('
');
+ },
+ add_button: function(label, click, icon) {
+ this.make_toolbar();
args = { label: label, icon:'' };
if(icon) {
args.icon = '
';
@@ -32,8 +34,32 @@ wn.ui.AppFrame = Class.extend({
.appendTo(this.$w.find('.appframe-toolbar'));
return this.buttons[label];
},
+ add_help_button: function(txt) {
+ this.make_toolbar();
+ $('
')
+ .data('help-text', txt)
+ .click(function() { msgprint($(this).data('help-text'), 'Help'); })
+ .appendTo(this.$w.find('.appframe-toolbar'));
+ },
clear_buttons: function() {
this.$w.find('.appframe-toolbar').empty();
+ },
+ add_breadcrumb: function(html) {
+ if(!this.$breadcrumbs)
+ this.$breadcrumbs = $('\
+
').appendTo(this.$titlebar);
+
+ var crumb = $('
').html(html);
+
+ // first breadcrumb is a title
+ if(!this.$breadcrumbs.find('span').length) {
+ crumb.addClass('appframe-title');
+ }
+ crumb.appendTo(this.$breadcrumbs);
+ },
+ clear_breadcrumbs: function() {
+ this.$breadcrumbs && this.$breadcrumbs.empty();
}
});
diff --git a/js/wn/ui/dialog.js b/js/wn/ui/dialog.js
index bde93b6737..39131ab095 100644
--- a/js/wn/ui/dialog.js
+++ b/js/wn/ui/dialog.js
@@ -99,12 +99,13 @@ wn.widgets.FieldGroup = function() {
wn.widgets.Dialog = function(opts) {
- this.opts = opts;
this.display = false;
this.make = function(opts) {
- if(opts)
+ if(opts) {
this.opts = opts;
+ $.extend(this, opts);
+ }
if(!this.opts.width) this.opts.width = 480;
if(!$('#dialog-container').length) {
@@ -183,7 +184,7 @@ wn.widgets.Dialog = function(opts) {
this.appframe.$titlebar.find('.close').toggle(false);
}
- if(opts) this.make();
+ if(opts) this.make(opts);
}
diff --git a/js/wn/views/breadcrumbs.js b/js/wn/views/breadcrumbs.js
index f66075b917..b9afcec76e 100644
--- a/js/wn/views/breadcrumbs.js
+++ b/js/wn/views/breadcrumbs.js
@@ -1,24 +1,22 @@
wn.provide('wn.views');
-wn.views.breadcrumbs = function(parent, module, doctype, name) {
- $(parent).empty();
- var $bspan = $(parent);
+wn.views.breadcrumbs = function(appframe, module, doctype, name) {
+ appframe.clear_breadcrumbs();
if(name) {
- $bspan.append('' + name + '');
+ appframe.add_breadcrumb(name);
} else if(doctype) {
- $bspan.append('' + doctype + ' List ');
+ appframe.add_breadcrumb(doctype + ' List');
} else if(module) {
- $bspan.append('' + module + '');
+ appframe.add_breadcrumb(module);
}
if(name && doctype && (!locals['DocType'][doctype].issingle)) {
- $bspan.append(repl(' in %(doctype)s List',
+ appframe.add_breadcrumb(repl(' in %(doctype)s List',
{doctype: doctype}))
};
if(doctype && module && wn.modules && wn.modules[module]) {
- $bspan.append(repl(' in %(module)s',
+ appframe.add_breadcrumb(repl(' in %(module)s',
{module: module, module_page: wn.modules[module] }))
}
- //$bspan.appendTo(parent);
}
\ No newline at end of file
diff --git a/js/wn/views/doclistview.js b/js/wn/views/doclistview.js
index 664695f943..29e206d3a7 100644
--- a/js/wn/views/doclistview.js
+++ b/js/wn/views/doclistview.js
@@ -74,8 +74,7 @@ wn.views.DocListView = wn.ui.Listing.extend({