X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=d6533f901722f5999ef7d81386932fea61d954df;hb=66a62190f99d83f958bb98195b5756b8b307e378;hp=54315e2cb306fe53f8c283955e7ca77092679e15;hpb=5c14c3f88cbdf81534508d046c76b1d1a361559b;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 54315e2c..d6533f90 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -56,6 +56,7 @@ function end_form($breaks=0)
 	if ($breaks)
 		br($breaks);
 	echo "<input type=\"hidden\" name=\"_focus\" value=\"".get_post('_focus')."\">\n";
+	echo "<input type=\"hidden\" name=\"_modified\" value=\"".get_post('_modified', 0)."\">\n";
 	echo "</form>\n";
 }
 
@@ -217,7 +218,6 @@ function viewer_link($label, $url='', $class='', $id='',  $icon=null)
 	}
 	else
 		$preview_str = $label;
-
  return $preview_str;
 }
 
@@ -237,12 +237,12 @@ function submenu_option($title, $url, $id=null)
 
 function submenu_view($title, $type, $number, $id=null)
 {
-	display_note(get_trans_view_str($type, $number, $title, false, 'menu_option', $id), 0, 1);
+	display_note(get_trans_view_str($type, $number, $title, false, 'viewlink', $id), 0, 1);
 }
 
 function submenu_print($title, $type, $number, $id=null, $email=0, $extra=0)
 {
-	display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id, $email, $extra), 0, 1);
+	display_note(print_document_link($number, $title, true, $type, false, 'printlink', $id, $email, $extra), 0, 1);
 }
 //-----------------------------------------------------------------------------------
 
@@ -380,14 +380,13 @@ function tabbed_content_start($name, $tabs, $dft='') {
     $selname = '_'.$name.'_sel';
 	$div = '_'.$name.'_div';
 
-	if ($dft=='')
-		$dft = key($tabs);
-    $sel = find_submit($name.'_', '');
+	$sel = find_submit($name.'_', false);
+	if($sel==null)
+		$sel = get_post($selname, (string)($dft==='' ? key($tabs) : $dft));
+
+	if ($sel!==@$_POST[$selname])
+		$Ajax->activate($name);
 
-	if ($sel != '') {
-			$Ajax->activate($name);
-	} else 
-		$sel = get_post($selname, $dft);
 	$_POST[$selname] = $sel;
 
 	div_start($name);
@@ -398,7 +397,7 @@ function tabbed_content_start($name, $tabs, $dft='') {
 		$disabled = (is_array($tab) && !$tab[1])  ? 'disabled ' : '';
 		$str .= ( "<li>"
 			."<button type='submit' name='{$name}_".$tab_no
-			."' class='".($tab_no===$sel ? 'current':'ajaxbutton')."' $acc[1] $disabled>"
+			."' class='".((string)$tab_no===$sel ? 'current':'ajaxbutton')."' $acc[1] $disabled>"
 			."<span>$acc[0]</span>"
 			."</button>\n"
 			."</li>\n" );
@@ -563,6 +562,35 @@ function confirm_dialog($submit, $msg) {
 		return 0;
 	} else
 		return get_post('DialogConfirm', 0);
-}	
+}
+
+/*
+	Block menu/shortcut links during transaction procesing.
+*/
+function page_processing($msg = false)
+{
+	global $Ajax;
+
+	if ($msg === true)
+		$msg = _('Entered data has not been saved yet.\nDo you want to abandon changes?');
+
+	$js = "_validate._processing=" . (
+		$msg ? '\''.strtr($msg, array("\n"=>'\\n')) . '\';' : 'null;');
+	if (in_ajax()) {
+		$Ajax->addScript(true, $js);
+	} else
+		add_js_source($js);
+}
+
+function page_modified($status = true)
+{
+	global $Ajax;
+
+	$js = "_validate._modified=" . ($status ? 1:0).';';
+	if (in_ajax()) {
+		$Ajax->addScript(true, $js);
+	} else
+		add_js_source($js);
+}
 
 ?>
\ No newline at end of file