Fixed submit button for IE7

[fa-stable.git] / includes / ui / ui_input.inc

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 74437698b62b80c087a04067326027e07156d203..08a4035b518fa3d06a8ab7a0feff03bc20cd22a0 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -53,7 +53,9 @@ function simple_page_mode($numeric_id = true)
        foreach (array('Edit', 'Delete') as $m) {
                foreach ($_POST as $p => $pvar) {
                        if (strpos($p, $m) === 0) {
-                               $selected_id = substr($p, strlen($m));
+//                             $selected_id = strtr(substr($p, strlen($m)), array('%2E'=>'.'));
+                               unset($_POST['_focus']); // focus on first form entry
+                               $selected_id = quoted_printable_decode(substr($p, strlen($m)));
                                $Ajax->activate('_page_body');
                                $Mode = $m;
                                return;
@@ -67,10 +69,10 @@ function simple_page_mode($numeric_id = true)
 //
 //     Read numeric value from user formatted input
 //
-function input_num($postname=null)
+function input_num($postname=null, $dflt=null)
 {
        if (!isset($_POST[$postname]))
-               return null;
+               return $dflt;
 
     return user_numeric($_POST[$postname]);
 }
@@ -92,48 +94,45 @@ function hidden($name, $value=null, $echo=true)
                return $ret;
 }
 
-//---------------------------------------------------------------------------------
-//     Submit button.
-//     $async parameter can have 3 values:
-//             false - normal submit via form action
-//             true  - when js is on submition via ajax call
-//             null - fallback button not visible in js enabled mode
-//
-function submit($name, $value, $echo=true, $title=false, $async=false)
+function submit($name, $value, $echo=true, $title=false, $async=false, $icon=false)
 {
-
+       global $path_to_root;
+       
        default_focus($name);
-       $submit_str = "<input type=\"submit\" class=\""
+       $submit_str = "<button class=\""
            .($async ? 'ajaxsubmit' : 'inputsubmit')
-               ."\""
-               .($async === null ? (in_ajax() ? " style='display:none;'" : ' fallback="1"' ): '')
+               ."\" type=\"submit\""
+               .($async === null ? (fallback_mode() ? ' aspect="fallback"' : " style='display:none;'" ): 
+                       ($async === 'process' ? 'aspect="process"' : '') )
            ." name=\"$name\"  id=\"$name\" value=\"$value\""
            .($title ? " title='$title'" : '')
-           .">\n";
+           ."><span>$value</span>"
+               .($icon ? "<img src='$path_to_root/themes/default/images/$icon'>" : '')
+               ."</button>\n";
        if ($echo)
                echo $submit_str;
        else
                return $submit_str;
 }
 
-function submit_center($name, $value, $echo=true, $title=false, $async=false)
+function submit_center($name, $value, $echo=true, $title=false, $async=false, $icon=false)
 {
        echo "<center>";
-       submit($name, $value, $echo, $title, $async);
+       submit($name, $value, $echo, $title, $async, $icon);
        echo "</center>";
 }
 
-function submit_center_first($name, $value, $title=false, $async=false)
+function submit_center_first($name, $value, $title=false, $async=false, $icon=false)
 {
        echo "<center>";
-       submit($name, $value, true, $title, $async);
+       submit($name, $value, true, $title, $async, $icon);
        echo "&nbsp;";
 }
 
-function submit_center_last($name, $value, $title=false, $async=false)
+function submit_center_last($name, $value, $title=false, $async=false, $icon=false)
 {
        echo "&nbsp;";
-       submit($name, $value, true, $title, $async);
+       submit($name, $value, true, $title, $async, $icon);
        echo "</center>";
 }
 
@@ -187,6 +186,13 @@ function submit_row($name, $value, $right=true, $extra="", $title=false, $async=
        submit_cells($name, $value, $extra, $title, $async);
        echo "</tr>\n";
 }
+
+function submit_return($name, $value, $title=false, $async=false)
+{
+       if (count($_SESSION['Context'])) {
+               submit($name, $value, true, $title, $async);
+       }
+}
 //---------------------------------------------------------------------------------
 
 function button($name, $value, $onclick, $title=false)
@@ -296,17 +302,17 @@ function qty_cell($label, $bold=false, $dec=null, $id=null)
                label_cell(number_format2($label, $dec), "nowrap align=right", $id);
 }
 
-function label_cells($label, $value, $params="", $params2="")
+function label_cells($label, $value, $params="", $params2="", $id='')
 {
        if ($label != null)
                echo "<td $params>$label</td>\n";
-       echo "<td $params2>$value</td>\n";
+       label_cell($value, $params2, $id);
 }
 
-function label_row($label, $value, $params="", $params2="", $leftfill=0)
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
 {
        echo "<tr>";
-       label_cells($label, $value, $params, $params2);
+       label_cells($label, $value, $params, $params2, $id);
        if ($leftfill!=0)
                echo "<td colspan=$leftfill></td>";
        echo "</tr>\n";
@@ -388,7 +394,8 @@ function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null,
 
 //-----------------------------------------------------------------------------------
 
-function date_cells($label, $name, $title = null, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_cells($label, $name, $title = null, $init=null, $inc_days=0, 
+       $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false)
 {
        global $use_date_picker, $path_to_root;
        if (!isset($_POST[$name]) || $_POST[$name] == "")
@@ -417,13 +424,15 @@ function date_cells($label, $name, $title = null, $init=null, $inc_days=0, $inc_
                . "     <img src='$path_to_root/themes/default/images/cal.gif' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
        else
                $post_label = "";
-       text_cells_ex($label, $name, 9, 12, $_POST[$name], $title, $params, $post_label);
+       text_cells_ex($label, $name, 9, 12, $_POST[$name], $title, $params, $post_label, $submit_on_change);
 }
 
-function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0, 
+       $inc_years=0, $params=null, $submit_on_change=false)
 {
        echo "<tr>";
-       date_cells($label, $name, $title, $init, $inc_days, $inc_months, $inc_years, $params);
+       date_cells($label, $name, $title, $init, $inc_days, $inc_months, 
+               $inc_years, $params, $submit_on_change);
        echo "</tr>\n";
 }