X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=dcd7fe68e0f71438800f8697dafae3be1839572d;hb=2bdaed7f7332c9aefaf23a467a63bb08cca78c96;hp=0d4d0bfebfdebca788e2111a6086e6b7e7eed94a;hpb=b0de618b47d6ca975589b517217b862189e66780;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 0d4d0bfe..dcd7fe68 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -159,6 +159,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
if ($icon===false) $icon=ICON_ESCAPE; break;
case 'nonajax':
+ case 'download':
$atype = false;
}
}
@@ -202,6 +203,7 @@ function submit_center_last($name, $value, $title=false, $async=false, $icon=fal
/*
For following controls:
'both' - use both Ctrl-Enter and Escape hotkeys
+ 'upgrade' - use Ctrl-Enter with progress ajax indicator and Escape hotkeys. Nonajax request for OK option is performed.
'cancel' - apply to 'RESET' button
*/
function submit_add_or_update($add=true, $title=false, $async=false, $clone=false)
@@ -210,10 +212,13 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
if ($async === 'both') {
$async = 'default'; $cancel = 'cancel';
- }
- else if ($async === 'default')
+ }
+ elseif ($async === 'upgrade') {
+ $async = 'default nonajax process'; $cancel = 'cancel';
+ }
+ elseif ($async === 'default')
$cancel = true;
- else if ($async === 'cancel')
+ elseif ($async === 'cancel')
$async = true;
if ($add)
@@ -283,7 +288,7 @@ function set_icon($icon, $title=false)
global $path_to_root;
if (basename($icon) === $icon) // standard icons does not contain path separator
$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
- return "
\n";
+ return "
\n";
}
function button($name, $value, $title=false, $icon=false, $aspect='')
@@ -300,7 +305,7 @@ function button($name, $value, $title=false, $icon=false, $aspect='')
if ($value == _("Delete")) // Helper during implementation
$icon = ICON_DELETE;
return "