X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=788767c403758e01601742583bbb96c1f812b38e;hb=62c48a4e71294c51defb624ed9b921aee7904e1b;hp=1e966a1a72758135e2bd5a06d434e2c0a41b660d;hpb=da774ae85617b051675afe581f413da78febfc0f;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 1e966a1a..788767c4 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -37,6 +37,7 @@ function find_submit($prefix, $numeric=true)
     }
     return $numeric ? -1 : null;
 }
+
 //------------------------------------------------------------------------------
 //
 // Helper function for simple db table editor pages
@@ -84,10 +85,16 @@ function input_num($postname=null, $dflt=0)
 }
 
 //---------------------------------------------------------------------------------
+//
+//	Thanks to hidden fields buffering hidden() helper can be used in arbitrary places and 
+//  proper html structure is still preserved. Buffered hidden fields are output on the nearest 
+//  table or form closing tag (see output_hidden()).
+//
+$hidden_fields = array();
 
 function hidden($name, $value=null, $echo=true)
 {
-  	global $Ajax;
+  	global $Ajax, $hidden_fields;
 	
 	if ($value === null) 
 		$value = get_post($name);
@@ -95,7 +102,7 @@ function hidden($name, $value=null, $echo=true)
   	$ret = "<input type=\"hidden\" name=\"$name\" value=\"$value\">";
 	$Ajax->addUpdate($name, $name, $value);
 	if ($echo)
-		echo $ret."\n";
+			$hidden_fields[] = $ret;
 	else
 		return $ret;
 }
@@ -112,7 +119,7 @@ function hidden($name, $value=null, $echo=true)
 		'selector' - ditto with closing current popup editor window
 		'cancel'  - cancel form entry on Escape press; dflt ICON_CANCEL
 		'process' - displays progress bar during call; optional icon
-
+		'nonajax' - ditto, non-ajax submit
 	$atype can contain also multiply type selectors separated by space, 
 	however make sense only combination of 'process' and one of defualt/selector/cancel
 */
@@ -126,7 +133,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 
 	} elseif (!is_bool($atype)) { // necessary: switch uses '=='
 
-		$aspect = "aspect='$atype' ";
+		$aspect = " aspect='$atype' ";
 		$types = explode(' ', $atype);
 
 		foreach ($types as $type) {
@@ -141,6 +148,9 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 
 				case 'cancel':
 					if ($icon===false) $icon=ICON_ESCAPE; break;
+
+				case 'nonajax':
+					$atype = false;
 			}
 		}
 	}
@@ -151,7 +161,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 	    ." name=\"$name\"  id=\"$name\" value=\"$value\""
 	    .($title ? " title='$title'" : '')
 	    .">"
-		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12'>" : '')
+		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12' alt=''>" : '')
 		."<span>$value</span>"
 		."</button>\n";
 	if ($echo)
@@ -264,7 +274,7 @@ function set_icon($icon, $title=false)
 	global $path_to_root;
 	if (basename($icon) === $icon) // standard icons does not contain path separator
 		$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
-	return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." />\n";	
+	return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." >\n";	
 }
 
 function button($name, $value, $title=false, $icon=false,  $aspect='')
@@ -286,7 +296,7 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
 			."' value='1'" . ($title ? " title='$title'":" title='$value'")
 			. ($aspect ? " aspect='$aspect'" : '')
 			. $rel
-			." />".set_icon($icon)."</button>\n";
+			." >".set_icon($icon)."</button>\n";
 	}
 	else
 		return "<input type='submit' class='editbutton' name='"
@@ -296,7 +306,7 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
 			.($title ? " title='$title'":'')
 			. ($aspect ? " aspect='$aspect'" : '')
 			. $rel
-			." />\n";
+			." >\n";
 }
 
 function button_cell($name, $value, $title=false, $icon=false, $aspect='')
@@ -324,7 +334,7 @@ function select_button_cell($name, $value, $title=false)
 
 function check_value($name)
 {
-	if (!isset($_POST[$name]))
+    if (!isset($_POST[$name]) || ($_POST[$name]+0) === 0)
 		return 0;
 	return 1;
 }
@@ -379,7 +389,10 @@ function check_row($label, $name, $value=null, $submit_on_change=false, $title=f
 }
 
 //-----------------------------------------------------------------------------------
-function radio($label, $name, $value, $selected, $submit_on_change=false) {
+function radio($label, $name, $value, $selected=null, $submit_on_change=false)
+{
+	if (!isset($selected))
+		$selected = get_post($name) == $value;
 
 	if ($submit_on_change === true)
 		$submit_on_change = 
@@ -457,14 +470,14 @@ 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="", $id='')
+function label_cells($label, $value, $params="", $params2="", $id=null)
 {
 	if ($label != null)
 		echo "<td $params>$label</td>\n";
 	label_cell($value, $params2, $id);
 }
 
-function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=null)
 {
 	echo "<tr>";
 	if ($params == "")
@@ -617,8 +630,12 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 		}
 	}
 	if ($use_date_picker)
+	{
+		$calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? 
+			"$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
 		$post_label = "<a tabindex='-1' href=\"javascript:date_picker(document.getElementsByName('$name')[0]);\">"
-		. "	<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";
+		. "	<img src='$calc_image' style='vertical-align:middle;padding-bottom:4px;width:16px;height:16px;border:0;' alt='"._('Click Here to Pick up the date')."'></a>\n";
+	}	
 	else
 		$post_label = "";
 
@@ -627,15 +644,15 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 
 	echo "<td>";
 	
-	$class = $submit_on_change ? 'class="searchbox"' : '';
+	$class = $submit_on_change ? 'date active' : 'date';
 
 	$aspect = $check ? 'aspect="cdate"' : '';
 	if ($check && (get_post($name) != Today()))
 		$aspect .= ' style="color:#FF0000"';
 
 	default_focus($name);
-
-	echo "<input type=\"text\" name=\"$name\" $class $aspect size=\"9\" maxlength=\"12\" value=\"" 
+	$size = (user_date_format()>3)?11:10; 
+	echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"$size\" maxlength=\"12\" value=\"" 
 	 . $_POST[$name]. "\""
 	 .($title ? " title='$title'": '')." > $post_label";
 	echo "</td>\n";
@@ -655,7 +672,7 @@ function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_mon
 function password_row($label, $name, $value)
 {
 	echo "<tr><td class='label'>$label</td>";
-	label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' />");
+	label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' >");
 	echo "</tr>\n";
 }	
 
@@ -664,7 +681,7 @@ function file_cells($label, $name, $id="")
 {
 	if ($id != "")
 		$id = "id='$id'";
-	label_cells($label, "<input type='file' name='$name' $id />");
+	label_cells($label, "<input type='file' name='$name' $id >");
 }		
 function file_row($label, $name, $id = "")
 {
@@ -879,7 +896,7 @@ function inactive_control_cell($id, $value, $table, $key)
 			get_post('Update')) && (check_value('Inactive'.$id) != $value)) {
 			update_record_status($id, !$value, $table, $key);
 		}
-		echo '<td align="center">'. checkbox(null, $name, $value, true, '', "align='center'")
+		echo '<td align="center">'. checkbox(null, $name, $value, true, '')
  			. hidden("LInact[$id]", $value, false) . '</td>';	
 	}
 }