Small fixed needed for client-side validation.

diff --git a/js/inserts.js b/js/inserts.js
index dd78a9f607be68de748e56c8bfde841f26093e8a..a6d08dd952c70fe8e264c81a6f9828d1f8f2b340 100644 (file)
--- 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+'<br>'+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 d051b10f1a900a1a9d1bb4e478cbfe218b7f4715..73151cf3010d2f28e6a197f35de9b96832b8642d 100644 (file)
--- 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= "<div class='"+(cl || 'err_msg')+"'>"+ msg+'</div>';
+//     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 f26ff382606965deb4806c9185a3eff85b2a6ad1..82d778eed70fde5c0beac5a34825e313196cc9cd 100644 (file)
--- 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 87fd53d6adf31d2ef33a016c6580c2c3c8e3a039..8abc9c46e054e7377acfe610d04863ff5af28968 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -73,16 +73,18 @@
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
-
-                       if ($title && !$no_menu && !$is_index)
+                       if ($no_menu)
+                               echo "<br>";
+                       elseif ($title && !$is_index)
                        {
-                               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td>"
+                                       echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
                                ."<td align=right>"
                                .(user_hints() ? "<span id='hints'></span>" : '')
                                ."</td>"
                                ."</tr></table></center>";
                        }
 
+
                }
 
                function menu_footer($no_menu, $is_index)

diff --git a/themes/cool/default.css b/themes/cool/default.css
index 6a55770267d528a9af4ada232f712f83134ce37a..ac706d53106b3e27c77cf75902a8257227fd52eb 100644 (file)
--- 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 0d30270000db461e2da42533868da763a6591415..f4f59c15e502fbb7e1a7d525ad0c3a0dfa961e40 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -74,9 +74,11 @@
                        }
                        echo "</td></tr></table>";
 
-                       if ($title && !$no_menu && !$is_index)
+                       if ($no_menu)
+                               echo "<br>";
+                       elseif ($title && !$is_index)
                        {
-                               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td>"
+                               echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
                                ."<td align=right>"
                                .(user_hints() ? "<span id='hints'></span>" : '')
                                ."</td>"

diff --git a/themes/default/default.css b/themes/default/default.css
index 4b71231f363bd810b236942e742ff2b855cac426..b6443476d690a10520366303aa58122198b7895f 100644 (file)
--- 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 5233839d91e513e918ce128ecd60a0d1912eaa9f..43b163bd4e926a2340e8eed1cd155b07f909aea9 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -71,19 +71,21 @@
                                        echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
                                echo "$img<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "</td></tr><tr><td colspan=3>";
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
 
-                       if ($title && !$no_menu && !$is_index)
+                       if ($no_menu)
+                               echo "<br>";
+                       elseif ($title && !$is_index)
                        {
-                               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td>"
+                               echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
                                ."<td align=right>"
                                .(user_hints() ? "<span id='hints'></span>" : '')
                                ."</td>"
                                ."</tr></table></center>";
                        }
-
                }
 
                function menu_footer($no_menu, $is_index)