X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=217be194c3642061fa15fc7b5085deac3fda3106;hb=eac78d6c63115a15ca659b0ef27ed76894777814;hp=20d191f464a52c018bdb22605d97232fcf5c4241;hpb=72af4496f87c438dc85a0a7573d36b7bd9e49624;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 20d191f4..217be194 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -28,7 +28,7 @@ function end_form($breaks=0)
{
if ($breaks)
br($breaks);
- echo "\n";
+ echo "\n";
echo "\n";
}
@@ -52,7 +52,7 @@ function meta_forward($forward_to, $params="")
global $Ajax;
echo "\n";
echo "
" . _("You should automatically be forwarded.");
- echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".
\n";
+ echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".
\n";
$Ajax->redirect($forward_to.'?'.$params);
exit;
}
@@ -100,7 +100,7 @@ function hyperlink_params($target, $label, $params, $center=true)
function hyperlink_params_td($target, $label, $params)
{
echo "";
- hyperlink_params($target, $label, $params);
+ hyperlink_params($target, $label, $params, false);
echo " | \n";
}
@@ -151,19 +151,22 @@ function table_header($labels)
end_row();
}
-function edit_link_cell($param)
+function edit_link_cell($param, $title=false)
{
- label_cell("" . _("Edit") . "", "nowrap");
+ label_cell("" . _("Edit") . "", "nowrap");
}
-function delete_link_cell($param)
+function delete_link_cell($param, $title=false)
{
- label_cell("" . _("Delete") . "", "nowrap");
+ label_cell("" . _("Delete") . "", "nowrap");
}
-function edit_button_cell($name, $value)
+function edit_button_cell($name, $value, $title=false)
{
- label_cell("\n");
+ label_cell("\n");
}
//-----------------------------------------------------------------------------------
@@ -189,13 +192,18 @@ function br($num=1)
$ajax_divs = array();
-function div_start($id='')
+function div_start($id='', $trigger=null, $non_ajax=false)
{
global $ajax_divs;
- array_push($ajax_divs, $id);
- echo "";
- ob_start();
+ if ($non_ajax) { // div for non-ajax elements
+ array_push($ajax_divs, array($id, null));
+ echo "
";
+ } else { // ajax ready div
+ array_push($ajax_divs, array($id, $trigger===null ? $id : $trigger));
+ echo "
";
+ ob_start();
+ }
}
function div_end()
@@ -204,8 +212,9 @@ function div_end()
if (count($ajax_divs))
{
- $id = array_pop($ajax_divs);
- $Ajax->addUpdate($id, $id, ob_get_flush());
+ $div = array_pop($ajax_divs);
+ if ($div[1] !== null)
+ $Ajax->addUpdate($div[1], $div[0], ob_get_flush());
echo "
";
}
}