X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=13d39e63612d7525d132f834ab0ac7167c89571e;hb=8438a027a31b2625f21db52a3cbff254b739a221;hp=b27f5fde11ae787a486fc4fa73ecce2556dca591;hpb=c0b985cc57f88e49f3402e1c55f7e884e55770ea;p=fa-stable.git diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index b27f5fde..13d39e63 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -356,8 +356,8 @@ function check_cells($label, $name, $value=null, $submit_on_change=false, $title function check_row($label, $name, $value=null, $submit_on_change=false, $title=false) { - echo ""; - echo check_cells($label, $name, $value, $submit_on_change, $title); + echo "$label"; + echo check_cells(NULL, $name, $value, $submit_on_change, $title); echo "\n"; } @@ -439,6 +439,11 @@ function label_cells($label, $value, $params="", $params2="", $id='') function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='') { echo ""; + if ($params == "") + { + echo "$label"; + $label = null; + } label_cells($label, $value, $params, $params2, $id); if ($leftfill!=0) echo ""; @@ -503,9 +508,8 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null, function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="") { - echo ""; - - text_cells($label, $name, $value, $size, $max, $title, $params, $post_label); + echo "$label"; + text_cells(null, $name, $value, $size, $max, $title, $params, $post_label); echo "\n"; } @@ -514,9 +518,8 @@ function text_row($label, $name, $value, $size, $max, $title=null, $params="", $ function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null, $params=null, $post_label=null) { - echo ""; - - text_cells_ex($label, $name, $size, $max, $value, $title, $params, $post_label); + echo "$label"; + text_cells_ex(null, $name, $size, $max, $value, $title, $params, $post_label); echo "\n"; } @@ -614,12 +617,34 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0, function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false) { - echo ""; - date_cells($label, $name, $title, $check, $inc_days, $inc_months, + echo "$label"; + date_cells(null, $name, $title, $check, $inc_days, $inc_months, $inc_years, $params, $submit_on_change); echo "\n"; } +//----------------------------------------------------------------------------------- +function password_row($label, $name, $value) +{ + echo "$label"; + label_cell(""); + echo "\n"; +} + +//----------------------------------------------------------------------------------- +function file_cells($label, $name, $id="") +{ + if ($id != "") + $id = "id='$id'"; + label_cells($label, ""); +} +function file_row($label, $name, $id = "") +{ + echo "$label"; + file_cells(null, $name, $id); + echo "\n"; +} + //----------------------------------------------------------------------------------- function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false) @@ -631,8 +656,8 @@ function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false) { - echo ""; - ref_cells($label, $name, $title, $init, null, $submit_on_change); + echo "$label"; + ref_cells(null, $name, $title, $init, null, $submit_on_change); echo "\n"; } @@ -663,8 +688,11 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu $_POST[$name] = ''; } if ($label != null) + { + if ($params == null) + $params = "class='label'"; label_cell($label, $params); - + } if (!isset($max)) $max = $size; @@ -780,8 +808,8 @@ function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $par function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="") { - echo ""; - textarea_cells($label, $name, $value, $cols, $rows, $title, $params); + echo "$label"; + textarea_cells(null, $name, $value, $cols, $rows, $title, $params); echo "\n"; }