diff --git a/public/javascripts/lib/date_picker.js b/public/javascripts/lib/date_picker.js
index b9b555f..fa9098f 100755
--- a/public/javascripts/lib/date_picker.js
+++ b/public/javascripts/lib/date_picker.js
@@ -366,6 +366,33 @@ Simpltry.buildDateTimeField = function(element, options) {
   });
 };

+Simpltry.buildTimeField = function(element, options) {
+  options = options || {};
+  element.autoComplete = "false";
+  var timePart = "";
+  var handle = element;
+  if(options.handle) handle = $(options.handle);
+  var popup = Builder.node("div", {id: handle.id + "_tooltip", style: "display:none;"});
+  var timeDiv = Builder.node("div");
+  popup.appendChild(timeDiv);
+  document.body.appendChild(popup);
+  var toolTip = new Simpltry.ClickTooltip(handle, {offsetLeft:9,toggle:true,direction:"right"});
+  var tp = new Simpltry.TimePicker(timeDiv, {
+    timeString: timePart,
+    showClose: true,
+    onClose: function() {toolTip.close();},
+    onTimeSelected: function(hour, minute, amPm){
+      var currentDateString = "";
+      if(currentDateString) {
+        currentDateString += " at ";
+      } else {
+        currentDateString = "";
+      }
+      element.value = currentDateString + hour + ":" + minute + amPm;
+    }
+  });
+}
+
 if(Simpltry.Widgets) {
   Simpltry.Widgets.register('date_picker', function(element, options) {
     if(element.tagName == 'INPUT' && element.type == 'text') {
@@ -379,4 +406,10 @@ if(Simpltry.Widgets) {
       Simpltry.buildDateTimeField(element, options);
     }
   });
+  Simpltry.Widgets.register('time_picker', function(element, options) {
+    if(element.tagName == 'INPUT' && element.type == 'text') {
+      Simpltry.buildTimeField(element, options);
+    }
+  });
+
 }
diff --git a/public/stylesheets/date_picker.css b/public/stylesheets/date_picker.css
index 3c8d23e..c8b6124 100644
--- a/public/stylesheets/date_picker.css
+++ b/public/stylesheets/date_picker.css
@@ -76,7 +76,7 @@
 .timePicker {
   line-height: 1.6em;
   border: 1px solid #000;
-  border-top-width: 0;
+  border-top-width: 1;
 }
 .timePickerHourHeader,.timePickerMinuteHeader,.timePickerHours,.timePickerMinutes,.timePickerAmPm,.timePickerAM,.timePickerPM,.timePickerMinute,.timePickerHour {
   float: left;