X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=6e2c664a7a8f9cc01a59ca65fa49fbed8fb4efa1;hb=56390edbd0d21b90f348200144d06c096483e59c;hp=46744ae8974b14e38dad7da4c502a6fdf5c624a2;hpb=b956923926de6b7eecf57510cf86857354cac1b3;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 46744ae8..6e2c664a 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -56,6 +56,37 @@ function end_table($breaks=0)
 		br($breaks);
 }
 
+function start_outer_table($extra="", $padding='2', $spacing='0', $br=false)
+{
+	if ($br)
+		br();
+	start_table($extra, $padding, $spacing);
+	echo "<tr valign=top><td>\n"; // outer table
+}
+
+function table_section($number=1, $width=false)
+{
+	if ($number > 1)
+	{
+		echo "</table>\n";
+		$width = ($width ? "width=$width" : "");
+		echo "</td><td class='tableseparator' $width>\n"; // outer table
+	}
+	echo "<table>\n";
+}	
+
+function end_outer_table($breaks=0, $close_table=true)
+{
+	if ($close_table)
+		echo "</table>\n";
+	echo "</td></tr>\n";
+	end_table($breaks);
+}
+
+function vertical_space()
+{
+	echo "</td></tr><tr><td valign=center>"; // outer table
+}
 function meta_forward($forward_to, $params="")
 {
     global $Ajax;
@@ -172,63 +203,18 @@ function alt_table_row_color(&$k)
 	}
 }
 
-function table_section_title($msg)
+function table_section_title($msg, $colspan=2)
 {
-	echo "<tr><td colspan=2 class='tableheader'>$msg</td><tr>\n";
+	echo "<tr><td colspan=$colspan class='tableheader'>$msg</td></tr>\n";
 }
 
-function table_header($labels)
+function table_header($labels, $params='')
 {
 	start_row();
 	foreach ($labels as $label)
-		labelheader_cell($label);
+		labelheader_cell($label, $params);
 	end_row();
 }
-
-//-----------------------------------------------------------------------------------
-
-function set_icon($icon, $title)
-{
-	global $path_to_root;
-	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$title' />\n";	
-}
-
-function button($name, $value, $title=false, $icon=false)
-{
-	// php silently changes dots,spaces,'[' and characters 128-159
-	// to underscore in POST names, to maintain compatibility with register_globals
-	if (user_graphic_links() && $icon)
-	{
-		if ($value == _("Delete")) // Helper during implementation
-			$icon = ICON_DELETE;
-		echo "<button type='submit' class='editbutton' name='".
-			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
-			"' value='' />".set_icon($icon, ($title ? $title: $value))."\n";
-	}
-	else
-		echo "<input type='submit' class='editbutton' name='"
-			.htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
-			."' value='$value'"
-			.($title ? " title='$title'":'')." />\n";
-}
-
-function button_cell($name, $value, $title=false, $icon=false)
-{
-	echo "<td>";
-	button($name, $value, $title, $icon);
-	echo "</td>";
-}
-
-function delete_button_cell($name, $value, $title=false)
-{
-	button_cell($name, $value, $title, ICON_DELETE);
-}
-
-function edit_button_cell($name, $value, $title=false)
-{
-	button_cell($name, $value, $title, ICON_EDIT);
-}
-
 //-----------------------------------------------------------------------------------
 
 function start_row($param="")
@@ -352,5 +338,33 @@ function context_reset()
 if (!isset($_SESSION['Context'])) {
 		context_reset();
 }
+/*
+	Redirector for selector F4 calls.
+	$sel_editors is array of selname=>editor_page
+*/
+function editor_redirect($sel_editors, $save_fun='') {
+	foreach ($sel_editors as $selname=>$editor)
+		if (isset($_POST['_'.$selname.'_editor'])) {
+			if (function_exists($save_fun))
+				$save_fun();
+			unset($_POST['_'.$selname.'_editor']);
+			context_call($editor, array_keys($_POST));
+		}
+}
+/*
+	Return procedure for selector F4 calls
+*/
+function editor_return($vars, $restore_fun='') {
+	if (function_exists($restore_fun))
+		$restore_fun();
+
+	if ($ret = context_restore()) {
+		foreach ($vars as $postname=>$retname)
+			if (isset($ret[$retname])) {
+				$_POST[$postname] = $ret[$retname];
+				set_focus($postname);
+			}
+	}
+}
 
 ?>
\ No newline at end of file