X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=5c0cacd163818dde63bb504fb98c88d990357d2e;hb=87ac1ff401682a1ccbbbf01ece7afe8ff518d3fe;hp=0ffa0247a1cb688da9c5fa42a1f0c8516e314f1e;hpb=3a179c3c7d947efea18c1fb381b48d293b162499;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 0ffa0247..5c0cacd1 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -624,8 +624,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 = "<a tabindex='-1' href=\"javascript:date_picker(document.getElementsByName('$name')[0]);\">"
-		. "	<img src='$path_to_root/themes/default/images/cal.gif' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+		. "	<img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+	}	
 	else
 		$post_label = "";
 
@@ -641,7 +645,8 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 		$aspect .= ' style="color:#FF0000"';
 
 	default_focus($name);
-	echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"10\" maxlength=\"12\" value=\"" 
+	$size = (user_date_format()>3)?11:10; 
+	echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"$size\" maxlength=\"12\" value=\"" 
 	 . $_POST[$name]. "\""
 	 .($title ? " title='$title'": '')." > $post_label";
 	echo "</td>\n";
@@ -885,7 +890,7 @@ function inactive_control_cell($id, $value, $table, $key)
 			get_post('Update')) && (check_value('Inactive'.$id) != $value)) {
 			update_record_status($id, !$value, $table, $key);
 		}
-		echo '<td align="center">'. checkbox(null, $name, $value, true, '', "align='center'")
+		echo '<td align="center">'. checkbox(null, $name, $value, true, '')
  			. hidden("LInact[$id]", $value, false) . '</td>';	
 	}
 }