X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Fui%2Fui_input.inc;h=a6537a83c8bd2a06ae407c980154ecaf1a6f3a6a;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=272d515b9965283b1770fc8ce02f65ba077b0b00;hpb=40ee20a833a502a0914202b56473fb330d5774cf;p=fa-stable.git diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index 272d515b..a6537a83 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 @@ -112,6 +113,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 @@ -141,6 +143,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; } } } @@ -247,17 +252,24 @@ function submit_return($name, $value, $title=false) } } -function submit_js_confirm($name, $msg) { - add_js_source( - "_validate.$name=function(){ return confirm('" - . strtr($msg, array("\n"=>'\\n')) . "');};"); -}; +function submit_js_confirm($name, $msg, $set = true) { + global $Ajax; + $js = "_validate.$name=".($set ? "function(){ return confirm('" + . strtr($msg, array("\n"=>'\\n')) . "');};" + : 'null;'); + if (in_ajax()) { + $Ajax->addScript(true, $js); + } else + add_js_source($js); +} //----------------------------------------------------------------------------------- function set_icon($icon, $title=false) { global $path_to_root; - return "\n"; + if (basename($icon) === $icon) // standard icons does not contain path separator + $icon = "$path_to_root/themes/".user_theme()."/images/$icon"; + return "\n"; } function button($name, $value, $title=false, $icon=false, $aspect='') @@ -372,7 +384,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 = @@ -610,8 +625,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 = "" - . " \n"; + . " \n"; + } else $post_label = ""; @@ -620,15 +639,15 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0, echo "