Index: branches/RC/core/admin_templates/js/calendar/calendar-setup.js
===================================================================
diff -u -N -r8929 -r10656
--- branches/RC/core/admin_templates/js/calendar/calendar-setup.js	(.../calendar-setup.js)	(revision 8929)
+++ branches/RC/core/admin_templates/js/calendar/calendar-setup.js	(.../calendar-setup.js)	(revision 10656)
@@ -19,7 +19,7 @@
  * than modifying calendar.js itself).
  */
 
-// $Id: calendar-setup.js,v 1.2 2007-01-18 09:02:27 kostja Exp $
+// $Id: calendar-setup.js,v 1.2.2.1 2008-06-12 11:40:06 alex Exp $
 
 /**
  *  This function "patches" an input field (or other element) to use a calendar
@@ -153,6 +153,19 @@
 
 	var triggerEl = params.button || params.displayArea || params.inputField;
 	triggerEl["on" + params.eventName] = function() {
+		var $check_field = params.inputField;
+
+		if ($check_field.getAttribute('type') == 'hidden') {
+			// date + time control -> main field is hidden
+			$regex = /full_date_(.*)\[(.*)\]$/.exec($check_field.id);
+			$check_field = document.getElementById($regex[1] + '[' + $regex[2] + '_date]');
+		}
+
+		if ($check_field.disabled) {
+			// don't show calendar, when date/time field is disabled
+			return false;
+		}
+
 		var dateEl = params.inputField || params.displayArea;
 		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
 		var mustCreate = false;