From: Janusz Dobrowolski Date: Fri, 8 May 2009 10:18:09 +0000 (+0000) Subject: Small fixed needed for client-side validation. X-Git-Tag: v2.4.2~19^2~1406 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=f1e793b356fd4d526eafc66073302e584ede78a7;p=fa-stable.git Small fixed needed for client-side validation. --- diff --git a/js/inserts.js b/js/inserts.js index dd78a9f6..a6d08dd9 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -13,12 +13,6 @@ var _hotkeys = { 'alt': false, // whether is the Alt key pressed 'focus': -1 // currently selected indeks of document.links }; -var _validate = {}; // validation functions - -function debug(msg) { - box = document.getElementById('msgbox') - box.innerHTML= box.innerHTML+'
'+msg -} function save_focus(e) { _focus = e.name||e.id; @@ -195,14 +189,14 @@ var inserts = { function(e) { e.onclick = function() { save_focus(e); - if (e.getAttribute('aspect') == 'process') - JsHttpRequest.request(this, null, 30000); - else - JsHttpRequest.request(this); + if (e.getAttribute('aspect') == 'process') + JsHttpRequest.request(this, null, 30000); + else + JsHttpRequest.request(this); return false; } }, - 'button': function(e) { +/* 'button': function(e) { if (e.name) { var func = _validate[e.name]; var old = e.onclick; @@ -220,7 +214,7 @@ var inserts = { } } }, - '.amount': function(e) { +*/ '.amount': function(e) { if(e.onblur==undefined) { e.onblur = function() { var dec = this.getAttribute("dec"); @@ -306,11 +300,11 @@ var inserts = { } }, -*/ '#msgbox': function(e) { +*//* '#msgbox': function(e) { // this is to avoid changing div height after ajax update in IE7 e.style.display = e.innerHTML.length ? 'block' : 'none'; } -/* TODO +*//* TODO 'a.date_picker': function(e) { // this un-hides data picker for js enabled browsers e.href = date_picker(this.getAttribute('rel')); diff --git a/js/utils.js b/js/utils.js index d051b10f..73151cf3 100644 --- a/js/utils.js +++ b/js/utils.js @@ -14,6 +14,13 @@ function set_mark(img) { box.style.visibility = img ? 'visible' : 'hidden' } +function disp_msg(msg, cl) { + var box = document.getElementById('msgbox') + box.innerHTML= "
"+ msg+'
'; +// box.style.display = msg=='' ? 'none':'block'; + if (msg!='') window.scrollTo(0,element_pos(box).y-10); +} + // // JsHttpRequest class extensions. // @@ -25,13 +32,13 @@ function set_mark(img) { // request is directed to current location // JsHttpRequest.request= function(trigger, form, tout) { +// if (trigger.type=='submit' && !validate(trigger)) return false; tout = tout | 3000; // default timeout value set_mark(tout>5000 ? 'progressbar.gif' : 'ajax-loader.gif'); JsHttpRequest._request(trigger, form, tout, 2); } JsHttpRequest._request = function(trigger, form, tout, retry) { - if (trigger.tagName=='A') { var content = {}; var upload = 0; @@ -223,9 +230,11 @@ function price_format(post, num, dec, label, color) { function get_amount(doc, label) { if(label) - var val = document.getElementById(doc).innerHTML; + var val = document.getElementById(doc).innerHTML; else - var val = document.getElementsByName(doc)[0].value; + var val = typeof(doc) == "string" ? + document.getElementsByName(doc)[0].value : doc.value; + val = val.replace(new RegExp('\\'+user.ts, 'g'),''); val = +val.replace(new RegExp('\\'+user.ds, 'g'),'.'); return isNaN(val) ? 0 : val; diff --git a/themes/aqua/default.css b/themes/aqua/default.css index f26ff382..82d778ee 100644 --- a/themes/aqua/default.css +++ b/themes/aqua/default.css @@ -568,7 +568,17 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{ border: 1px solid #FFF; } +div.err_msg { + margin: 10px; + padding: 3px; + border: 1px solid #cc3300; + background-color: #ffcccc; + color: #dd2200; + text-align: center; +} + div.warn_msg { + margin: 10px; padding: 3px; border: 1px solid #ff9900; background-color: #ffff00; @@ -577,6 +587,7 @@ div.warn_msg { } div.note_msg { + margin: 10px; padding: 3px; border: 1px solid #33cc00; background-color: #ccffcc; @@ -584,6 +595,7 @@ div.note_msg { text-align: center; } -#msgbox { - margin: 10px; +#title { + margin-bottom: 10px; + width: 100%; } diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php index 87fd53d6..8abc9c46 100644 --- a/themes/aqua/renderer.php +++ b/themes/aqua/renderer.php @@ -73,16 +73,18 @@ echo ""; } echo ""; - - if ($title && !$no_menu && !$is_index) + if ($no_menu) + echo "
"; + elseif ($title && !$is_index) { - echo "
" + echo "
$title
" ."" ."
$title" .(user_hints() ? "" : '') ."
"; } + } function menu_footer($no_menu, $is_index) diff --git a/themes/cool/default.css b/themes/cool/default.css index 6a557702..ac706d53 100644 --- a/themes/cool/default.css +++ b/themes/cool/default.css @@ -574,7 +574,17 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{ border: 1px solid #FFF; } +div.err_msg { + margin: 10px; + padding: 3px; + border: 1px solid #cc3300; + background-color: #ffcccc; + color: #dd2200; + text-align: center; +} + div.warn_msg { + margin: 10px; padding: 3px; border: 1px solid #ff9900; background-color: #ffff00; @@ -583,6 +593,7 @@ div.warn_msg { } div.note_msg { + margin: 10px; padding: 3px; border: 1px solid #33cc00; background-color: #ccffcc; @@ -590,6 +601,7 @@ div.note_msg { text-align: center; } -#msgbox { - margin: 10px; +#title { + margin-bottom: 10px; + width: 100%; } diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php index 0d302700..f4f59c15 100644 --- a/themes/cool/renderer.php +++ b/themes/cool/renderer.php @@ -74,9 +74,11 @@ } echo ""; - if ($title && !$no_menu && !$is_index) + if ($no_menu) + echo "
"; + elseif ($title && !$is_index) { - echo "
" + echo "
$title
" ."" diff --git a/themes/default/default.css b/themes/default/default.css index 4b71231f..b6443476 100644 --- a/themes/default/default.css +++ b/themes/default/default.css @@ -570,6 +570,7 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{ } div.err_msg { + margin: 10px; padding: 3px; border: 1px solid #cc3300; background-color: #ffcccc; @@ -578,6 +579,7 @@ div.err_msg { } div.warn_msg { + margin: 10px; padding: 3px; border: 1px solid #ff9900; background-color: #ffff00; @@ -586,6 +588,7 @@ div.warn_msg { } div.note_msg { + margin: 10px; padding: 3px; border: 1px solid #33cc00; background-color: #ccffcc; @@ -593,6 +596,7 @@ div.note_msg { text-align: center; } -#msgbox { - margin: 10px; +#title { + margin-bottom: 10px; + width: 100%; } diff --git a/themes/default/renderer.php b/themes/default/renderer.php index 5233839d..43b163bd 100644 --- a/themes/default/renderer.php +++ b/themes/default/renderer.php @@ -71,19 +71,21 @@ echo "$himg" . _("Help") . "   "; } echo "$img" . _("Logout") . "   "; + echo "
$title" .(user_hints() ? "" : '') ."
"; echo "
"; } echo ""; - if ($title && !$no_menu && !$is_index) + if ($no_menu) + echo "
"; + elseif ($title && !$is_index) { - echo "
" + echo "
$title
" ."" ."
$title" .(user_hints() ? "" : '') ."
"; } - } function menu_footer($no_menu, $is_index)