X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=391cd7fc5a4e0952b10ee5878ce842478e23f39e;hb=4dd21ab081490bde56eb842544b57db6692c7301;hp=b2a49e2b90a447cdb5848382d2f922ccd0ac205e;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index b2a49e2b..391cd7fc 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -75,7 +75,7 @@ function simple_page_mode($numeric_id = true)
//
// Read numeric value from user formatted input
//
-function input_num($postname=null, $dflt=null)
+function input_num($postname=null, $dflt=0)
{
if (!isset($_POST[$postname]) || $_POST[$postname] == "")
return $dflt;
@@ -107,35 +107,43 @@ function hidden($name, $value=null, $echo=true)
null - button visible only in fallback mode; optional icon
Ajax submit:
true - standard button; optional icon
- 'process' - displays progress bar during call; optional icon
+
'default' - default form submit on Ctrl-Enter press; dflt ICON_OK icon
'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
+
+ $atype can contain also multiply type selectors separated by space,
+ however make sense only combination of 'process' and one of defualt/selector/cancel
*/
function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false)
{
global $path_to_root;
$aspect='';
- if (!is_bool($atype)) // necessary: switch uses '=='
- switch($atype) {
- case 'process':
- $aspect = " aspect='process'"; break;
- case 'selector':
- $aspect = " aspect='selector' rel = '$value'";
- $value = _("Select");
- if ($icon===false) $icon=ICON_SUBMIT; break;
- case 'default':
- $aspect = " aspect='default'";
- if ($icon===false) $icon=ICON_SUBMIT; break;
- case 'cancel':
- $aspect = " aspect='cancel'";
- if ($icon===false) $icon=ICON_ESCAPE; break;
- case null:
- $aspect = fallback_mode() ?
- " aspect='fallback'" : " style='display:none;'"; break;
- }
+ if ($atype === null) {
+ $aspect = fallback_mode() ? " aspect='fallback'" : " style='display:none;'";
+
+ } elseif (!is_bool($atype)) { // necessary: switch uses '=='
+
+ $aspect = "aspect='$atype' ";
+ $types = explode(' ', $atype);
+
+ foreach ($types as $type) {
+ switch($type) {
+ case 'selector':
+ $aspect = " aspect='selector' rel = '$value'";
+ $value = _("Select");
+ if ($icon===false) $icon=ICON_SUBMIT; break;
+
+ case 'default':
+ if ($icon===false) $icon=ICON_SUBMIT; break;
+ case 'cancel':
+ if ($icon===false) $icon=ICON_ESCAPE; break;
+ }
+ }
+ }
$submit_str = "".set_icon($icon)."\n";
+ ." />".set_icon($icon)."\n";
}
else
return "$label";
+ echo check_cells(NULL, $name, $value, $submit_on_change, $title);
echo "\n";
}
@@ -439,6 +447,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 +516,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 +526,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 +625,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 +664,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 +696,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 +816,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";
}