diff --git a/css/legacy/messages.css b/css/legacy/messages.css index 5ca3eacda4..6ef04b6621 100644 --- a/css/legacy/messages.css +++ b/css/legacy/messages.css @@ -39,8 +39,11 @@ div.notice { .help_box, .help-box { background-color: #ffe; - color: #874; padding: 9px 9px 9px 9px; border: 1px dashed #fc7; margin: 11px 0px; } + +.help-box, .help-box p, .help-box h1, .help-box h2, .help-box h3, .help-box h4 { + color: #643; +} diff --git a/js/legacy/model/doclist.js b/js/legacy/model/doclist.js index bc7a41351f..7b37f1c78c 100644 --- a/js/legacy/model/doclist.js +++ b/js/legacy/model/doclist.js @@ -133,8 +133,19 @@ function check_required(dt, dn, parent_dt) { for(var i=0;i|

/)==-1) + if(msg.search(/
|

|

  • /)==-1) msg = replace_newlines(msg); msg_dialog.set_title(title || 'Message') diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js index 7eb1050677..b0ca86b7f1 100644 --- a/js/legacy/widgets/form/form.js +++ b/js/legacy/widgets/form/form.js @@ -324,9 +324,23 @@ _f.Frm.prototype.set_intro = function(txt) { this.intro_area.remove(); this.intro_area = null; } - } +_f.Frm.prototype.set_footnote = function(txt) { + if(!this.footnote_area) { + this.footnote_area = $('
    ') + .insertAfter(this.page_layout.body.lastChild); + } + if(txt) { + if(txt.search(/

    /)==-1) txt = '

    ' + txt + '

    '; + this.footnote_area.html(txt); + } else { + this.footnote_area.remove(); + this.footnote_area = null; + } +} + + _f.Frm.prototype.setup_fields_std = function() { var fl = wn.meta.docfield_list[this.doctype]; @@ -834,19 +848,8 @@ _f.Frm.prototype.save = function(save_action, call_back) { var ret_fn = function(r) { - me.savingflag = false; - if(user=='Guest' && !r.exc) { - // if user is guest, show a message after succesful saving - $dh(me.page_layout.wrapper); - $ds(me.saved_wrapper); - me.saved_wrapper.innerHTML = - '
    ' - + (cur_frm.message_after_save ? cur_frm.message_after_save : 'Your information has been sent. Thank you!') - + '
    '; - return; // no refresh - } - - if(!me.meta.istable) { + me.savingflag = false; + if(!me.meta.istable && r) { me.refresh(r.docname); } @@ -1163,4 +1166,9 @@ _f.Frm.prototype.enable_fields = function(fields, enable) { _f.Frm.prototype.call_server = function(method, args, callback) { $c_obj(cur_frm.get_doclist(), method, args, callback); +} + +_f.Frm.prototype.set_value = function(field, value) { + cur_frm.get_doc()[field] = value; + cur_frm.fields_dict[field].refresh(); } \ No newline at end of file diff --git a/js/legacy/widgets/form/form_header.js b/js/legacy/widgets/form/form_header.js index 90c1b72402..b6965d09ab 100644 --- a/js/legacy/widgets/form/form_header.js +++ b/js/legacy/widgets/form/form_header.js @@ -81,6 +81,12 @@ _f.FrmHeader = Class.extend({ }, refresh_toolbar: function() { // clear + + if(cur_frm.meta.hide_toolbar) { + $('.appframe-toolbar').toggle(false); + return; + } + this.appframe.clear_buttons(); var p = cur_frm.get_doc_perms(); diff --git a/js/legacy/wn/widgets/form/sidebar.js b/js/legacy/wn/widgets/form/sidebar.js index 8a88671748..0a2c43034b 100644 --- a/js/legacy/wn/widgets/form/sidebar.js +++ b/js/legacy/wn/widgets/form/sidebar.js @@ -95,7 +95,10 @@ wn.widgets.form.sidebar = { Sidebar: function(form) { icon: 'icon-remove-sign', onclick: function() { me.form.savetrash() } } - ] + ], + display: function() { + return me.form.meta.hide_toolbar ? false : true; + } }, {