Missing files form last commit.
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Wed, 2 Jan 2013 10:39:12 +0000 (11:39 +0100)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Wed, 2 Jan 2013 10:39:12 +0000 (11:39 +0100)
lib/RT/Pod/HTML.pm [new file with mode: 0644]
lib/RT/Pod/HTMLBatch.pm [new file with mode: 0644]
lib/RT/Pod/Search.pm [new file with mode: 0644]
sbin/rt-validate-aliases [new file with mode: 0755]
share/html/Elements/LoginRedirectWarning [new file with mode: 0644]
share/html/NoAuth/css/base/jquery-ui-timepicker-addon.css [new file with mode: 0644]
share/html/NoAuth/js/jquery-ui-timepicker-addon.js [new file with mode: 0644]

diff --git a/lib/RT/Pod/HTML.pm b/lib/RT/Pod/HTML.pm
new file mode 100644 (file)
index 0000000..8ddce42
--- /dev/null
@@ -0,0 +1,66 @@
+use strict;
+use warnings;
+
+package RT::Pod::HTML;
+use base 'Pod::Simple::XHTML';
+
+sub new {
+    my $self = shift->SUPER::new(@_);
+    $self->index(1);
+    $self->anchor_items(1);
+    return $self;
+}
+
+sub perldoc_url_prefix { "http://metacpan.org/module/" }
+
+sub html_header { '' }
+sub html_footer {
+    my $self = shift;
+    my $toc  = "../" x ($self->batch_mode_current_level - 1);
+    return '<a href="./' . $toc . '">&larr; Back to index</a>';
+}
+
+sub start_Verbatim { $_[0]{'scratch'} = "<pre>" }
+sub end_Verbatim   { $_[0]{'scratch'} .= "</pre>"; $_[0]->emit; }
+
+sub _end_head {
+    my $self = shift;
+    $self->{scratch} = '<a href="#___top">' . $self->{scratch} . '</a>';
+    return $self->SUPER::_end_head(@_);
+}
+
+sub resolve_pod_page_link {
+    my $self = shift;
+    my ($name, $section) = @_;
+
+    # Only try to resolve local links if we're in batch mode and are linking
+    # outside the current document.
+    return $self->SUPER::resolve_pod_page_link(@_)
+        unless $self->batch_mode and $name;
+
+    $section = defined $section
+        ? '#' . $self->idify($section, 1)
+        : '';
+
+    my $local;
+    if ($name =~ /^RT::/) {
+        $local = join "/",
+                  map { $self->encode_entities($_) }
+                split /::/, $name;
+    }
+    elsif ($name =~ /^rt-/) {
+        $local = $self->encode_entities($name);
+    }
+
+    if ($local) {
+        # Resolve links correctly by going up
+        my $depth = $self->batch_mode_current_level - 1;
+        return join "/",
+                    ($depth ? ".." x $depth : ()),
+                    "$local.html$section";
+    } else {
+        return $self->SUPER::resolve_pod_page_link(@_)
+    }
+}
+
+1;
diff --git a/lib/RT/Pod/HTMLBatch.pm b/lib/RT/Pod/HTMLBatch.pm
new file mode 100644 (file)
index 0000000..8d1b67f
--- /dev/null
@@ -0,0 +1,131 @@
+use strict;
+use warnings;
+
+package RT::Pod::HTMLBatch;
+use base 'Pod::Simple::HTMLBatch';
+
+use List::MoreUtils qw/all/;
+
+use RT::Pod::Search;
+use RT::Pod::HTML;
+
+sub new {
+    my $self = shift->SUPER::new(@_);
+    $self->verbose(0);
+
+    # Per-page output options
+    $self->css_flurry(0);          # No CSS
+    $self->javascript_flurry(0);   # No JS
+    $self->no_contents_links(1);   # No header/footer "Back to contents" links
+
+    # TOC options
+    $self->index(1);                    # Write a per-page TOC
+    $self->contents_file("index.html"); # Write a global TOC
+
+    $self->html_render_class('RT::Pod::HTML');
+    $self->search_class('RT::Pod::Search');
+
+    return $self;
+}
+
+sub classify {
+    my $self = shift;
+    my %info = (@_);
+
+    my $is_install_doc = sub {
+        my %page = @_;
+        local $_ = $page{name};
+        return 1 if /^(README|UPGRADING)/;
+        return 1 if $_ eq "RT_Config";
+        return 1 if $_ eq "web_deployment";
+        return 1 if $page{infile} =~ m{^configure(\.ac)?$};
+        return 0;
+    };
+
+    my $section = $info{infile} =~ m{/plugins/([^/]+)}      ? "05 Extension: $1"           :
+                  $info{infile} =~ m{/local/}               ? '04 Local Documenation'      :
+                  $is_install_doc->(%info)                  ? '00 Install and Upgrade '.
+                                                                 'Documentation'           :
+                  $info{infile} =~ m{/(docs|etc)/}          ? '01 User Documentation'      :
+                  $info{infile} =~ m{/bin/}                 ? '02 Utilities (bin)'         :
+                  $info{infile} =~ m{/sbin/}                ? '03 Utilities (sbin)'        :
+                  $info{name}   =~ /^RT::Action/            ? '08 Actions'                 :
+                  $info{name}   =~ /^RT::Condition/         ? '09 Conditions'              :
+                  $info{name}   =~ /^RT(::|$)/              ? '07 Developer Documentation' :
+                  $info{infile} =~ m{/devel/tools/}         ? '20 Utilities (devel/tools)' :
+                                                              '06 Miscellaneous'           ;
+
+    if ($info{infile} =~ m{/(docs|etc)/}) {
+        $info{name} =~ s/_/ /g;
+        $info{name} = join "/", map { ucfirst } split /::/, $info{name};
+    }
+
+    return ($info{name}, $section);
+}
+
+sub write_contents_file {
+    my ($self, $to) = @_;
+    return unless $self->contents_file;
+
+    my $file = join "/", $to, $self->contents_file;
+    open my $index, ">", $file
+        or warn "Unable to open index file '$file': $!\n", return;
+
+    my $pages = $self->_contents;
+    return unless @$pages;
+
+    # Classify
+    my %toc;
+    for my $page (@$pages) {
+        my ($name, $infile, $outfile, $pieces) = @$page;
+
+        my ($title, $section) = $self->classify(
+            name    => $name,
+            infile  => $infile,
+        );
+
+        (my $path = $outfile) =~ s{^\Q$to\E/?}{};
+
+        push @{ $toc{$section} }, {
+            name => $title,
+            path => $path,
+        };
+    }
+
+    # Write out index
+    print $index "<dl class='superindex'>\n";
+
+    for my $key (sort keys %toc) {
+        next unless @{ $toc{$key} };
+
+        (my $section = $key) =~ s/^\d+ //;
+        print $index "<dt>", esc($section), "</dt>\n";
+        print $index "<dd>\n";
+
+        my @sorted = sort {
+            my @names = map { $_->{name} } $a, $b;
+
+            # Sort just the upgrading docs descending within everything else
+            @names = reverse @names
+                if all { /^UPGRADING-/ } @names;
+
+            $names[0] cmp $names[1]
+        } @{ $toc{$key} };
+
+        for my $page (@sorted) {
+            print $index "  <a href='", esc($page->{path}), "'>",
+                                esc($page->{name}),
+                           "</a><br>\n";
+        }
+        print $index "</dd>\n";
+    }
+    print $index '</dl>';
+
+    close $index;
+}
+
+sub esc {
+    Pod::Simple::HTMLBatch::esc(@_);
+}
+
+1;
diff --git a/lib/RT/Pod/Search.pm b/lib/RT/Pod/Search.pm
new file mode 100644 (file)
index 0000000..d6ddd2d
--- /dev/null
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+package RT::Pod::Search;
+use base 'Pod::Simple::Search';
+
+sub new {
+    my $self = shift->SUPER::new(@_);
+       $self->laborious(1)              # Find scripts too
+            ->limit_re(qr/(?<!\.in)$/)  # Filter out .in files
+            ->inc(0);                   # Don't look in @INC
+    return $self;
+}
+
+1;
diff --git a/sbin/rt-validate-aliases b/sbin/rt-validate-aliases
new file mode 100755 (executable)
index 0000000..2484b41
--- /dev/null
@@ -0,0 +1,343 @@
+#!/usr/bin/perl
+# BEGIN BPS TAGGED BLOCK {{{
+#
+# COPYRIGHT:
+#
+# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
+# (Except where explicitly superseded by other copyright notices)
+#
+#
+# LICENSE:
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+#
+#
+# CONTRIBUTION SUBMISSION POLICY:
+#
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+#
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+#
+# END BPS TAGGED BLOCK }}}
+use strict;
+use warnings;
+use Text::ParseWords qw//;
+use Getopt::Long;
+
+BEGIN { # BEGIN RT CMD BOILERPLATE
+    require File::Spec;
+    require Cwd;
+    my @libs = ("lib", "local/lib");
+    my $bin_path;
+
+    for my $lib (@libs) {
+        unless ( File::Spec->file_name_is_absolute($lib) ) {
+            $bin_path ||= ( File::Spec->splitpath(Cwd::abs_path(__FILE__)) )[1];
+            $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
+        }
+        unshift @INC, $lib;
+    }
+}
+
+require RT;
+RT::LoadConfig();
+RT::Init();
+
+my ($PREFIX, $URL, $HOST) = ("");
+GetOptions(
+    "prefix|p=s" => \$PREFIX,
+    "url|u=s"    => \$URL,
+    "host|h=s"   => \$HOST,
+);
+
+unless (@ARGV) {
+    @ARGV = grep {-f} ("/etc/aliases",
+                       "/etc/mail/aliases",
+                       "/etc/postfix/aliases");
+    die "Can't determine aliases file to parse!"
+        unless @ARGV;
+}
+
+my %aliases = parse_lines();
+unless (%aliases) {
+    warn "No mailgate aliases found in @ARGV";
+    exit;
+}
+
+my %seen;
+my $global_mailgate;
+for my $address (sort keys %aliases) {
+    my ($mailgate, $opts, $extra) = @{$aliases{$address}};
+    my %opts = %{$opts};
+
+    next if $opts{url} and $URL and $opts{url} !~ /\Q$URL\E/;
+
+    if ($mailgate !~ /^\|/) {
+        warn "Missing the leading | on alias $address\n";
+        $mailgate = "|$mailgate";
+    }
+    if (($global_mailgate ||= $mailgate) ne $mailgate) {
+        warn "Unexpected mailgate for alias $address -- expected $global_mailgate, got $mailgate\n";
+    }
+
+    if (not defined $opts{action}) {
+        warn "Missing --action parameter for alias $address\n";
+    } elsif ($opts{action} !~ /^(correspond|comment)$/) {
+        warn "Invalid --action parameter for alias $address: $opts{action}\n"
+    }
+
+    my $queue = RT::Queue->new( RT->SystemUser );
+    if (not defined $opts{queue}) {
+        warn "Missing --queue parameter for alias $address\n";
+    } else {
+        $queue->Load( $opts{queue} );
+        if (not $queue->id) {
+            warn "Invalid --queue parameter for alias $address: $opts{queue}\n";
+        } elsif ($queue->Disabled) {
+            warn "Disabled --queue given for alias $address: $opts{queue}\n";
+        }
+    }
+
+    if (not defined $opts{url}) {
+        warn "Missing --url parameter for alias $address\n";
+    } #XXX: Test connectivity and/or https certs?
+
+    if ($queue->id and $opts{action} =~ /^(correspond|comment)$/) {
+        push @{$seen{lc $queue->Name}{$opts{action}}}, $address;
+    }
+
+    warn "Unknown extra arguments for alias $address: @{$extra}\n"
+        if @{$extra};
+}
+
+# Check the global settings
+my %global;
+for my $action (qw/correspond comment/) {
+    my $setting = ucfirst($action) . "Address";
+    my $value = RT->Config->Get($setting);
+    if (not defined $value) {
+        warn "$setting is not set!\n";
+        next;
+    }
+    my ($local,$host) = lc($value) =~ /(.*?)\@(.*)/;
+    next if $HOST and $host !~ /\Q$HOST\E/;
+    $local = "$PREFIX$local" unless exists $aliases{$local};
+
+    $global{$setting} = $local;
+    if (not exists $aliases{$local}) {
+        warn "$setting $value does not exist in aliases!\n"
+    } elsif ($aliases{$local}[1]{action} ne $action) {
+        warn "$setting $value is a $aliases{$local}[1]{action} in aliases!"
+    }
+}
+warn "CorrespondAddress and CommentAddress are the same!\n"
+    if RT->Config->Get("CorrespondAddress") eq RT->Config->Get("CommentAddress");
+
+
+# Go through the queues, one at a time
+my $queues = RT::Queues->new( RT->SystemUser );
+$queues->UnLimit;
+while (my $q = $queues->Next) {
+    my $qname = $q->Name;
+    for my $action (qw/correspond comment/) {
+        my $setting = ucfirst($action) . "Address";
+        my $value = $q->$setting;
+
+        if (not $value) {
+            my @other = grep {$_ ne $global{$setting}} @{$seen{lc $q->Name}{$action} || []};
+            warn "CorrespondAddress not set on $qname, but in aliases as "
+                .join(" and ", @other) . "\n" if @other;
+            next;
+        }
+
+        if ($action eq "comment" and $q->CorrespondAddress
+                and $q->CorrespondAddress eq $q->CommentAddress) {
+            warn "CorrespondAddress and CommentAddress are set the same on $qname\n";
+            next;
+        }
+
+        my ($local, $host) = lc($value) =~ /(.*?)\@(.*)/;
+        next if $HOST and $host !~ /\Q$HOST\E/;
+        $local = "$PREFIX$local" unless exists $aliases{$local};
+
+        my @other = @{$seen{lc $q->Name}{$action} || []};
+        if (not exists $aliases{$local}) {
+            if (@other) {
+                warn "$setting $value on $qname does not exist in aliases -- typo'd as "
+                    .join(" or ", @other) . "?\n";
+            } else {
+                warn "$setting $value on $qname does not exist in aliases!\n"
+            }
+            next;
+        }
+
+        my %opt = %{$aliases{$local}[1]};
+        if ($opt{action} ne $action) {
+            warn "$setting address $value on $qname is a $opt{action} in aliases!\n"
+        }
+        if (lc $opt{queue} ne lc $q->Name and $action ne "comment") {
+            warn "$setting address $value on $qname points to queue $opt{queue} in aliases!\n";
+        }
+
+        @other = grep {$_ ne $local} @other;
+        warn "Extra aliases for queue $qname: ".join(",",@other)."\n"
+            if @other;
+    }
+}
+
+
+sub parse_lines {
+    local @ARGV = @ARGV;
+
+    my %aliases;
+    my $line = "";
+    for (<>) {
+        next unless /\S/;
+        next if /^#/;
+        chomp;
+        if (/^\s+/) {
+            $line .= $_;
+        } else {
+            add_line($line, \%aliases);
+            $line = $_;
+        }
+    }
+    add_line($line, \%aliases);
+
+    expand(\%aliases);
+    filter_mailgate(\%aliases);
+
+    return %aliases;
+}
+
+sub expand {
+    my ($data) = @_;
+
+    for (1..100) {
+        my $expanded = 0;
+        for my $address (sort keys %{$data}) {
+            my @new;
+            for my $part (@{$data->{$address}}) {
+                if (m!^[|/]! or not $data->{$part}) {
+                    push @new, $part;
+                } else {
+                    $expanded++;
+                    push @new, @{$data->{$part}};
+                }
+            }
+            $data->{$address} = \@new;
+        }
+        return unless $expanded;
+    }
+    warn "Recursion limit exceeded -- cycle in aliases?\n";
+}
+
+sub filter_mailgate {
+    my ($data) = @_;
+
+    for my $address (sort keys %{$data}) {
+        my @parts = @{delete $data->{$address}};
+
+        my @pipes = grep {m!^\|?.*?/rt-mailgate\b!} @parts;
+        next unless @pipes;
+
+        my $pipe = shift @pipes;
+        warn "More than one rt-mailgate pipe for alias: $address\n"
+            if @pipes;
+
+        my @args = Text::ParseWords::shellwords($pipe);
+
+        # We allow "|/random-other-command /opt/rt4/bin/rt-mailgate ...",
+        # we just need to strip off enough
+        my $index = 0;
+        $index++ while $args[$index] !~ m!/rt-mailgate!;
+        my $mailgate = join(' ', splice(@args,0,$index+1));
+
+        my %opts;
+        local @ARGV = @args;
+        Getopt::Long::Configure( "pass_through" ); # Allow unknown options
+        my $ret = eval {
+            GetOptions( \%opts, "queue=s", "action=s", "url=s",
+                        "jar=s", "debug", "extension=s",
+                        "timeout=i", "verify-ssl!", "ca-file=s",
+                    );
+            1;
+        };
+        warn "Failed to parse options for $address: $@" unless $ret;
+        next unless %opts;
+
+        $data->{lc $address} = [$mailgate, \%opts, [@ARGV]];
+    }
+}
+
+sub add_line {
+    my ($line, $data) = @_;
+    return unless $line =~ /\S/;
+
+    my ($name, $parts) = parse_line($line);
+    return unless defined $name;
+
+    if (defined $data->{$name}) {
+        warn "Duplicate definition for alias $name\n";
+        return;
+    }
+
+    $data->{lc $name} = $parts;
+}
+
+sub parse_line {
+    my $re_name      = qr/\S+/;
+    # Intentionally accept pipe-like aliases with a missing | -- we deal with them later
+    my $re_quoted_pipe    = qr/"\|?[^\\"]*(?:\\[\\"][^\\"]*)*"/;
+    my $re_nonquoted_pipe = qr/\|[^\s,]+/;
+    my $re_pipe      = qr/(?:$re_quoted_pipe|$re_nonquoted_pipe)/;
+    my $re_path      = qr!/[^,\s]+!;
+    my $re_address   = qr![^|/,\s][^,\s]*!;
+    my $re_value     = qr/(?:$re_pipe|$re_path|$re_address)/;
+    my $re_values    = qr/(?:$re_value(?:\s*,\s*$re_value)*)/;
+
+    my ($line) = @_;
+    if ($line =~ /^($re_name):\s*($re_values)/) {
+        my ($name, $all_parts) = ($1, $2);
+        my @parts;
+        while ($all_parts =~ s/^(?:\s*,\s*)?($re_value)//) {
+            my $part = $1;
+            if ($part =~ /^"/) {
+                $part =~ s/^"//; $part =~ s/"$//;
+                $part =~ s/\\(.)/$1/g;
+            }
+            push @parts, $part;
+        }
+        return $name, [@parts];
+    } else {
+        warn "Parse failure, line $. of $ARGV: $line\n";
+        return ();
+    }
+}
diff --git a/share/html/Elements/LoginRedirectWarning b/share/html/Elements/LoginRedirectWarning
new file mode 100644 (file)
index 0000000..891e381
--- /dev/null
@@ -0,0 +1,20 @@
+<%args>
+$next => undef
+</%args>
+<%init>
+return unless $next;
+
+my $destination = RT::Interface::Web::FetchNextPage($next);
+return unless ref $destination and $destination->{'HasSideEffects'};
+
+my $consequence = RT::Interface::Web::PotentialPageAction($destination->{'url'}) || loc("perform actions");
+   $consequence = $m->interp->apply_escapes($consequence => "h");
+</%init>
+<div class="redirect-warning">
+  <p>
+    <&|/l&>After logging in you'll be sent to your original destination:</&>
+    <tt title="<% $destination->{'url'} %>"><% $destination->{'url'} %></tt>
+    <&|/l_unsafe, "<strong>$consequence</strong>" &>which may [_1] on your behalf.</&>
+  </p>
+  <p><&|/l&>If this is not what you expect, leave this page now without logging in.</&></p>
+</div>
diff --git a/share/html/NoAuth/css/base/jquery-ui-timepicker-addon.css b/share/html/NoAuth/css/base/jquery-ui-timepicker-addon.css
new file mode 100644 (file)
index 0000000..7eb8715
--- /dev/null
@@ -0,0 +1,7 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+.ui-datepicker-buttonpane button.ui-datepicker-current { opacity: 1.0; }
diff --git a/share/html/NoAuth/js/jquery-ui-timepicker-addon.js b/share/html/NoAuth/js/jquery-ui-timepicker-addon.js
new file mode 100644 (file)
index 0000000..0a4ff02
--- /dev/null
@@ -0,0 +1,1326 @@
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 1.0.0
+* Last Modified: 02/05/2012
+*
+* Copyright 2012 Trent Richardson
+* Dual licensed under the MIT and GPL licenses.
+* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+*
+* HERES THE CSS:
+* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+* .ui-timepicker-div dl { text-align: left; }
+* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+* .ui-timepicker-div td { font-size: 90%; }
+* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+*/
+
+(function($) {
+
+// Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+$.ui.timepicker = $.ui.timepicker || {};
+if ($.ui.timepicker.version) {
+       return;
+}
+
+$.extend($.ui, { timepicker: { version: "1.0.0" } });
+
+/* Time picker manager.
+   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+   Settings for (groups of) time pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Timepicker() {
+       this.regional = []; // Available regional settings, indexed by language code
+       this.regional[''] = { // Default regional settings
+               currentText: 'Now',
+               closeText: 'Done',
+               ampm: false,
+               amNames: ['AM', 'A'],
+               pmNames: ['PM', 'P'],
+               timeFormat: 'hh:mm tt',
+               timeSuffix: '',
+               timeOnlyTitle: 'Choose Time',
+               timeText: 'Time',
+               hourText: 'Hour',
+               minuteText: 'Minute',
+               secondText: 'Second',
+               millisecText: 'Millisecond',
+               timezoneText: 'Time Zone'
+       };
+       this._defaults = { // Global defaults for all the datetime picker instances
+               showButtonPanel: true,
+               timeOnly: false,
+               showHour: true,
+               showMinute: true,
+               showSecond: false,
+               showMillisec: false,
+               showTimezone: false,
+               showTime: true,
+               stepHour: 1,
+               stepMinute: 1,
+               stepSecond: 1,
+               stepMillisec: 1,
+               hour: 0,
+               minute: 0,
+               second: 0,
+               millisec: 0,
+               timezone: '+0000',
+               hourMin: 0,
+               minuteMin: 0,
+               secondMin: 0,
+               millisecMin: 0,
+               hourMax: 23,
+               minuteMax: 59,
+               secondMax: 59,
+               millisecMax: 999,
+               minDateTime: null,
+               maxDateTime: null,
+               onSelect: null,
+               hourGrid: 0,
+               minuteGrid: 0,
+               secondGrid: 0,
+               millisecGrid: 0,
+               alwaysSetTime: true,
+               separator: ' ',
+               altFieldTimeOnly: true,
+               showTimepicker: true,
+               timezoneIso8609: false,
+               timezoneList: null,
+               addSliderAccess: false,
+               sliderAccessArgs: null
+       };
+       $.extend(this._defaults, this.regional['']);
+};
+
+$.extend(Timepicker.prototype, {
+       $input: null,
+       $altInput: null,
+       $timeObj: null,
+       inst: null,
+       hour_slider: null,
+       minute_slider: null,
+       second_slider: null,
+       millisec_slider: null,
+       timezone_select: null,
+       hour: 0,
+       minute: 0,
+       second: 0,
+       millisec: 0,
+       timezone: '+0000',
+       hourMinOriginal: null,
+       minuteMinOriginal: null,
+       secondMinOriginal: null,
+       millisecMinOriginal: null,
+       hourMaxOriginal: null,
+       minuteMaxOriginal: null,
+       secondMaxOriginal: null,
+       millisecMaxOriginal: null,
+       ampm: '',
+       formattedDate: '',
+       formattedTime: '',
+       formattedDateTime: '',
+       timezoneList: null,
+
+       /* Override the default settings for all instances of the time picker.
+          @param  settings  object - the new settings to use as defaults (anonymous object)
+          @return the manager object */
+       setDefaults: function(settings) {
+               extendRemove(this._defaults, settings || {});
+               return this;
+       },
+
+       //########################################################################
+       // Create a new Timepicker instance
+       //########################################################################
+       _newInst: function($input, o) {
+               var tp_inst = new Timepicker(),
+                       inlineSettings = {};
+
+               for (var attrName in this._defaults) {
+                       var attrValue = $input.attr('time:' + attrName);
+                       if (attrValue) {
+                               try {
+                                       inlineSettings[attrName] = eval(attrValue);
+                               } catch (err) {
+                                       inlineSettings[attrName] = attrValue;
+                               }
+                       }
+               }
+               tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+                       beforeShow: function(input, dp_inst) {
+                               if ($.isFunction(o.beforeShow))
+                                       return o.beforeShow(input, dp_inst, tp_inst);
+                       },
+                       onChangeMonthYear: function(year, month, dp_inst) {
+                               // Update the time as well : this prevents the time from disappearing from the $input field.
+                               tp_inst._updateDateTime(dp_inst);
+                               if ($.isFunction(o.onChangeMonthYear))
+                                       o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+                       },
+                       onClose: function(dateText, dp_inst) {
+                               if (tp_inst.timeDefined === true && $input.val() != '')
+                                       tp_inst._updateDateTime(dp_inst);
+                               if ($.isFunction(o.onClose))
+                                       o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+                       },
+                       timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+               });
+               tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase(); });
+               tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase(); });
+
+               if (tp_inst._defaults.timezoneList === null) {
+                       var timezoneList = [];
+                       for (var i = -11; i <= 12; i++)
+                               timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
+                       if (tp_inst._defaults.timezoneIso8609)
+                               timezoneList = $.map(timezoneList, function(val) {
+                                       return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+                               });
+                       tp_inst._defaults.timezoneList = timezoneList;
+               }
+
+               tp_inst.hour = tp_inst._defaults.hour;
+               tp_inst.minute = tp_inst._defaults.minute;
+               tp_inst.second = tp_inst._defaults.second;
+               tp_inst.millisec = tp_inst._defaults.millisec;
+               tp_inst.ampm = '';
+               tp_inst.$input = $input;
+
+               if (o.altField)
+                       tp_inst.$altInput = $(o.altField)
+                               .css({ cursor: 'pointer' })
+                               .focus(function(){ $input.trigger("focus"); });
+
+               if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0)
+               {
+                       tp_inst._defaults.minDate=new Date();
+               }
+               if(tp_inst._defaults.maxDate==0 || tp_inst._defaults.maxDateTime==0)
+               {
+                       tp_inst._defaults.maxDate=new Date();
+               }
+
+               // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+               if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
+                       tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+               if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
+                       tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+               if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date)
+                       tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+               if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
+                       tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+               return tp_inst;
+       },
+
+       //########################################################################
+       // add our sliders to the calendar
+       //########################################################################
+       _addTimePicker: function(dp_inst) {
+               var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
+                               this.$input.val() + ' ' + this.$altInput.val() :
+                               this.$input.val();
+
+               this.timeDefined = this._parseTime(currDT);
+               this._limitMinMaxDateTime(dp_inst, false);
+               this._injectTimePicker();
+       },
+
+       //########################################################################
+       // parse the time string from input value or _setTime
+       //########################################################################
+       _parseTime: function(timeString, withDate) {
+               var regstr = this._defaults.timeFormat.toString()
+                               .replace(/h{1,2}/ig, '(\\d?\\d)')
+                               .replace(/m{1,2}/ig, '(\\d?\\d)')
+                               .replace(/s{1,2}/ig, '(\\d?\\d)')
+                               .replace(/l{1}/ig, '(\\d?\\d?\\d)')
+                               .replace(/t{1,2}/ig, this._getPatternAmpm())
+                               .replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
+                               .replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
+                       order = this._getFormatPositions(),
+                       ampm = '',
+                       treg;
+
+               if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+
+               if (withDate || !this._defaults.timeOnly) {
+                       // the time should come after x number of characters and a space.
+                       // x = at least the length of text specified by the date format
+                       var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+                       // escape special regex characters in the seperator
+                       var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
+                       regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
+               }
+
+               treg = timeString.match(new RegExp(regstr, 'i'));
+
+               if (treg) {
+                       if (order.t !== -1) {
+                               if (treg[order.t] === undefined || treg[order.t].length === 0) {
+                                       ampm = '';
+                                       this.ampm = '';
+                               } else {
+                                       ampm = $.inArray(treg[order.t].toUpperCase(), this.amNames) !== -1 ? 'AM' : 'PM';
+                                       this.ampm = this._defaults[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+                               }
+                       }
+
+                       if (order.h !== -1) {
+                               if (ampm == 'AM' && treg[order.h] == '12')
+                                       this.hour = 0; // 12am = 0 hour
+                               else if (ampm == 'PM' && treg[order.h] != '12')
+                                       this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12
+                               else this.hour = Number(treg[order.h]);
+                       }
+
+                       if (order.m !== -1) this.minute = Number(treg[order.m]);
+                       if (order.s !== -1) this.second = Number(treg[order.s]);
+                       if (order.l !== -1) this.millisec = Number(treg[order.l]);
+                       if (order.z !== -1 && treg[order.z] !== undefined) {
+                               var tz = treg[order.z].toUpperCase();
+                               switch (tz.length) {
+                               case 1: // Z
+                                       tz = this._defaults.timezoneIso8609 ? 'Z' : '+0000';
+                                       break;
+                               case 5: // +hhmm
+                                       if (this._defaults.timezoneIso8609)
+                                               tz = tz.substring(1) == '0000'
+                                                  ? 'Z'
+                                                  : tz.substring(0, 3) + ':' + tz.substring(3);
+                                       break;
+                               case 6: // +hh:mm
+                                       if (!this._defaults.timezoneIso8609)
+                                               tz = tz == 'Z' || tz.substring(1) == '00:00'
+                                                  ? '+0000'
+                                                  : tz.replace(/:/, '');
+                                       else if (tz.substring(1) == '00:00')
+                                               tz = 'Z';
+                                       break;
+                               }
+                               this.timezone = tz;
+                       }
+
+                       return true;
+
+               }
+               return false;
+       },
+
+       //########################################################################
+       // pattern for standard and localized AM/PM markers
+       //########################################################################
+       _getPatternAmpm: function() {
+               var markers = [],
+                       o = this._defaults;
+               if (o.amNames)
+                       $.merge(markers, o.amNames);
+               if (o.pmNames)
+                       $.merge(markers, o.pmNames);
+               markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&'); });
+               return '(' + markers.join('|') + ')?';
+       },
+
+       //########################################################################
+       // figure out position of time elements.. cause js cant do named captures
+       //########################################################################
+       _getFormatPositions: function() {
+               var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
+                       orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
+
+               if (finds)
+                       for (var i = 0; i < finds.length; i++)
+                               if (orders[finds[i].toString().charAt(0)] == -1)
+                                       orders[finds[i].toString().charAt(0)] = i + 1;
+
+               return orders;
+       },
+
+       //########################################################################
+       // generate and inject html for timepicker into ui datepicker
+       //########################################################################
+       _injectTimePicker: function() {
+               var $dp = this.inst.dpDiv,
+                       o = this._defaults,
+                       tp_inst = this,
+                       // Added by Peter Medeiros:
+                       // - Figure out what the hour/minute/second max should be based on the step values.
+                       // - Example: if stepMinute is 15, then minMax is 45.
+                       hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
+                       minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
+                       secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
+                       millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
+                       dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
+
+               // Prevent displaying twice
+               //if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
+               if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
+                       var noDisplay = ' style="display:none;"',
+                               html =  '<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
+                                               '<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
+                                               ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+                                               '<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
+                                               ((o.showTime) ? '' : noDisplay) + '></dd>' +
+                                               '<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
+                                               ((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
+                               hourGridSize = 0,
+                               minuteGridSize = 0,
+                               secondGridSize = 0,
+                               millisecGridSize = 0,
+                               size = null;
+
+                       // Hours
+                       html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
+                                               ((o.showHour) ? '' : noDisplay) + '></div>';
+                       if (o.showHour && o.hourGrid > 0) {
+                               html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+                               for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
+                                       hourGridSize++;
+                                       var tmph = (o.ampm && h > 12) ? h-12 : h;
+                                       if (tmph < 10) tmph = '0' + tmph;
+                                       if (o.ampm) {
+                                               if (h == 0) tmph = 12 +'a';
+                                               else if (h < 12) tmph += 'a';
+                                               else tmph += 'p';
+                                       }
+                                       html += '<td>' + tmph + '</td>';
+                               }
+
+                               html += '</tr></table></div>';
+                       }
+                       html += '</dd>';
+
+                       // Minutes
+                       html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
+                                       ((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
+                                       '<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
+                                                       ((o.showMinute) ? '' : noDisplay) + '></div>';
+
+                       if (o.showMinute && o.minuteGrid > 0) {
+                               html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+                               for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
+                                       minuteGridSize++;
+                                       html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+                               }
+
+                               html += '</tr></table></div>';
+                       }
+                       html += '</dd>';
+
+                       // Seconds
+                       html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
+                                       ((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
+                                       '<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
+                                                       ((o.showSecond) ? '' : noDisplay) + '></div>';
+
+                       if (o.showSecond && o.secondGrid > 0) {
+                               html += '<div style="padding-left: 1px"><table><tr>';
+
+                               for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
+                                       secondGridSize++;
+                                       html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+                               }
+
+                               html += '</tr></table></div>';
+                       }
+                       html += '</dd>';
+
+                       // Milliseconds
+                       html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
+                                       ((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
+                                       '<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
+                                                       ((o.showMillisec) ? '' : noDisplay) + '></div>';
+
+                       if (o.showMillisec && o.millisecGrid > 0) {
+                               html += '<div style="padding-left: 1px"><table><tr>';
+
+                               for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
+                                       millisecGridSize++;
+                                       html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+                               }
+
+                               html += '</tr></table></div>';
+                       }
+                       html += '</dd>';
+
+                       // Timezone
+                       html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
+                                       ((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+                       html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'        +
+                                                       ((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+                       html += '</dl></div>';
+                       $tp = $(html);
+
+                               // if we only want time picker...
+                       if (o.timeOnly === true) {
+                               $tp.prepend(
+                                       '<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
+                                               '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
+                                       '</div>');
+                               $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+                       }
+
+                       this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
+                               orientation: "horizontal",
+                               value: this.hour,
+                               min: o.hourMin,
+                               max: hourMax,
+                               step: o.stepHour,
+                               slide: function(event, ui) {
+                                       tp_inst.hour_slider.slider( "option", "value", ui.value);
+                                       tp_inst._onTimeChange();
+                               }
+                       });
+
+
+                       // Updated by Peter Medeiros:
+                       // - Pass in Event and UI instance into slide function
+                       this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
+                               orientation: "horizontal",
+                               value: this.minute,
+                               min: o.minuteMin,
+                               max: minMax,
+                               step: o.stepMinute,
+                               slide: function(event, ui) {
+                                       tp_inst.minute_slider.slider( "option", "value", ui.value);
+                                       tp_inst._onTimeChange();
+                               }
+                       });
+
+                       this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
+                               orientation: "horizontal",
+                               value: this.second,
+                               min: o.secondMin,
+                               max: secMax,
+                               step: o.stepSecond,
+                               slide: function(event, ui) {
+                                       tp_inst.second_slider.slider( "option", "value", ui.value);
+                                       tp_inst._onTimeChange();
+                               }
+                       });
+
+                       this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
+                               orientation: "horizontal",
+                               value: this.millisec,
+                               min: o.millisecMin,
+                               max: millisecMax,
+                               step: o.stepMillisec,
+                               slide: function(event, ui) {
+                                       tp_inst.millisec_slider.slider( "option", "value", ui.value);
+                                       tp_inst._onTimeChange();
+                               }
+                       });
+
+                       this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
+                       $.fn.append.apply(this.timezone_select,
+                               $.map(o.timezoneList, function(val, idx) {
+                                       return $("<option />")
+                                               .val(typeof val == "object" ? val.value : val)
+                                               .text(typeof val == "object" ? val.label : val);
+                               })
+                       );
+                       this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone);
+                       this.timezone_select.change(function() {
+                               tp_inst._onTimeChange();
+                       });
+
+                       // Add grid functionality
+                       if (o.showHour && o.hourGrid > 0) {
+                               size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
+
+                               $tp.find(".ui_tpicker_hour table").css({
+                                       width: size + "%",
+                                       marginLeft: (size / (-2 * hourGridSize)) + "%",
+                                       borderCollapse: 'collapse'
+                               }).find("td").each( function(index) {
+                                       $(this).click(function() {
+                                               var h = $(this).html();
+                                               if(o.ampm)      {
+                                                       var ap = h.substring(2).toLowerCase(),
+                                                               aph = parseInt(h.substring(0,2), 10);
+                                                       if (ap == 'a') {
+                                                               if (aph == 12) h = 0;
+                                                               else h = aph;
+                                                       } else if (aph == 12) h = 12;
+                                                       else h = aph + 12;
+                                               }
+                                               tp_inst.hour_slider.slider("option", "value", h);
+                                               tp_inst._onTimeChange();
+                                               tp_inst._onSelectHandler();
+                                       }).css({
+                                               cursor: 'pointer',
+                                               width: (100 / hourGridSize) + '%',
+                                               textAlign: 'center',
+                                               overflow: 'hidden'
+                                       });
+                               });
+                       }
+
+                       if (o.showMinute && o.minuteGrid > 0) {
+                               size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
+                               $tp.find(".ui_tpicker_minute table").css({
+                                       width: size + "%",
+                                       marginLeft: (size / (-2 * minuteGridSize)) + "%",
+                                       borderCollapse: 'collapse'
+                               }).find("td").each(function(index) {
+                                       $(this).click(function() {
+                                               tp_inst.minute_slider.slider("option", "value", $(this).html());
+                                               tp_inst._onTimeChange();
+                                               tp_inst._onSelectHandler();
+                                       }).css({
+                                               cursor: 'pointer',
+                                               width: (100 / minuteGridSize) + '%',
+                                               textAlign: 'center',
+                                               overflow: 'hidden'
+                                       });
+                               });
+                       }
+
+                       if (o.showSecond && o.secondGrid > 0) {
+                               $tp.find(".ui_tpicker_second table").css({
+                                       width: size + "%",
+                                       marginLeft: (size / (-2 * secondGridSize)) + "%",
+                                       borderCollapse: 'collapse'
+                               }).find("td").each(function(index) {
+                                       $(this).click(function() {
+                                               tp_inst.second_slider.slider("option", "value", $(this).html());
+                                               tp_inst._onTimeChange();
+                                               tp_inst._onSelectHandler();
+                                       }).css({
+                                               cursor: 'pointer',
+                                               width: (100 / secondGridSize) + '%',
+                                               textAlign: 'center',
+                                               overflow: 'hidden'
+                                       });
+                               });
+                       }
+
+                       if (o.showMillisec && o.millisecGrid > 0) {
+                               $tp.find(".ui_tpicker_millisec table").css({
+                                       width: size + "%",
+                                       marginLeft: (size / (-2 * millisecGridSize)) + "%",
+                                       borderCollapse: 'collapse'
+                               }).find("td").each(function(index) {
+                                       $(this).click(function() {
+                                               tp_inst.millisec_slider.slider("option", "value", $(this).html());
+                                               tp_inst._onTimeChange();
+                                               tp_inst._onSelectHandler();
+                                       }).css({
+                                               cursor: 'pointer',
+                                               width: (100 / millisecGridSize) + '%',
+                                               textAlign: 'center',
+                                               overflow: 'hidden'
+                                       });
+                               });
+                       }
+
+                       var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+                       if ($buttonPanel.length) $buttonPanel.before($tp);
+                       else $dp.append($tp);
+
+                       this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
+
+                       if (this.inst !== null) {
+                               var timeDefined = this.timeDefined;
+                               this._onTimeChange();
+                               this.timeDefined = timeDefined;
+                       }
+
+                       //Emulate datepicker onSelect behavior. Call on slidestop.
+                       var onSelectDelegate = function() {
+                               tp_inst._onSelectHandler();
+                       };
+                       this.hour_slider.bind('slidestop',onSelectDelegate);
+                       this.minute_slider.bind('slidestop',onSelectDelegate);
+                       this.second_slider.bind('slidestop',onSelectDelegate);
+                       this.millisec_slider.bind('slidestop',onSelectDelegate);
+
+                       // slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+                       if (this._defaults.addSliderAccess){
+                               var sliderAccessArgs = this._defaults.sliderAccessArgs;
+                               setTimeout(function(){ // fix for inline mode
+                                       if($tp.find('.ui-slider-access').length == 0){
+                                               $tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+                                               // fix any grids since sliders are shorter
+                                               var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+                                               if(sliderAccessWidth){
+                                                       $tp.find('table:visible').each(function(){
+                                                               var $g = $(this),
+                                                                       oldWidth = $g.outerWidth(),
+                                                                       oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
+                                                                       newWidth = oldWidth - sliderAccessWidth,
+                                                                       newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
+
+                                                               $g.css({ width: newWidth, marginLeft: newMarginLeft });
+                                                       });
+                                               }
+                                       }
+                               },0);
+                       }
+                       // end slideAccess integration
+
+               }
+       },
+
+       //########################################################################
+       // This function tries to limit the ability to go outside the
+       // min/max date range
+       //########################################################################
+       _limitMinMaxDateTime: function(dp_inst, adjustSliders){
+               var o = this._defaults,
+                       dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+               if(!this._defaults.showTimepicker) return; // No time so nothing to check here
+
+               if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
+                       var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+                               minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+                       if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
+                               this.hourMinOriginal = o.hourMin;
+                               this.minuteMinOriginal = o.minuteMin;
+                               this.secondMinOriginal = o.secondMin;
+                               this.millisecMinOriginal = o.millisecMin;
+                       }
+
+                       if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+                               this._defaults.hourMin = minDateTime.getHours();
+                               if (this.hour <= this._defaults.hourMin) {
+                                       this.hour = this._defaults.hourMin;
+                                       this._defaults.minuteMin = minDateTime.getMinutes();
+                                       if (this.minute <= this._defaults.minuteMin) {
+                                               this.minute = this._defaults.minuteMin;
+                                               this._defaults.secondMin = minDateTime.getSeconds();
+                                       } else if (this.second <= this._defaults.secondMin){
+                                               this.second = this._defaults.secondMin;
+                                               this._defaults.millisecMin = minDateTime.getMilliseconds();
+                                       } else {
+                                               if(this.millisec < this._defaults.millisecMin)
+                                                       this.millisec = this._defaults.millisecMin;
+                                               this._defaults.millisecMin = this.millisecMinOriginal;
+                                       }
+                               } else {
+                                       this._defaults.minuteMin = this.minuteMinOriginal;
+                                       this._defaults.secondMin = this.secondMinOriginal;
+                                       this._defaults.millisecMin = this.millisecMinOriginal;
+                               }
+                       }else{
+                               this._defaults.hourMin = this.hourMinOriginal;
+                               this._defaults.minuteMin = this.minuteMinOriginal;
+                               this._defaults.secondMin = this.secondMinOriginal;
+                               this._defaults.millisecMin = this.millisecMinOriginal;
+                       }
+               }
+
+               if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
+                       var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+                               maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+                       if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
+                               this.hourMaxOriginal = o.hourMax;
+                               this.minuteMaxOriginal = o.minuteMax;
+                               this.secondMaxOriginal = o.secondMax;
+                               this.millisecMaxOriginal = o.millisecMax;
+                       }
+
+                       if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
+                               this._defaults.hourMax = maxDateTime.getHours();
+                               if (this.hour >= this._defaults.hourMax) {
+                                       this.hour = this._defaults.hourMax;
+                                       this._defaults.minuteMax = maxDateTime.getMinutes();
+                                       if (this.minute >= this._defaults.minuteMax) {
+                                               this.minute = this._defaults.minuteMax;
+                                               this._defaults.secondMax = maxDateTime.getSeconds();
+                                       } else if (this.second >= this._defaults.secondMax) {
+                                               this.second = this._defaults.secondMax;
+                                               this._defaults.millisecMax = maxDateTime.getMilliseconds();
+                                       } else {
+                                               if(this.millisec > this._defaults.millisecMax) this.millisec = this._defaults.millisecMax;
+                                               this._defaults.millisecMax = this.millisecMaxOriginal;
+                                       }
+                               } else {
+                                       this._defaults.minuteMax = this.minuteMaxOriginal;
+                                       this._defaults.secondMax = this.secondMaxOriginal;
+                                       this._defaults.millisecMax = this.millisecMaxOriginal;
+                               }
+                       }else{
+                               this._defaults.hourMax = this.hourMaxOriginal;
+                               this._defaults.minuteMax = this.minuteMaxOriginal;
+                               this._defaults.secondMax = this.secondMaxOriginal;
+                               this._defaults.millisecMax = this.millisecMaxOriginal;
+                       }
+               }
+
+               if(adjustSliders !== undefined && adjustSliders === true){
+                       var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
+                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
+                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
+                               millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
+
+                       if(this.hour_slider)
+                               this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
+                       if(this.minute_slider)
+                               this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
+                       if(this.second_slider)
+                               this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
+                       if(this.millisec_slider)
+                               this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
+               }
+
+       },
+
+
+       //########################################################################
+       // when a slider moves, set the internal time...
+       // on time change is also called when the time is updated in the text field
+       //########################################################################
+       _onTimeChange: function() {
+               var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
+                       minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
+                       second = (this.second_slider) ? this.second_slider.slider('value') : false,
+                       millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
+                       timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+                       o = this._defaults;
+
+               if (typeof(hour) == 'object') hour = false;
+               if (typeof(minute) == 'object') minute = false;
+               if (typeof(second) == 'object') second = false;
+               if (typeof(millisec) == 'object') millisec = false;
+               if (typeof(timezone) == 'object') timezone = false;
+
+               if (hour !== false) hour = parseInt(hour,10);
+               if (minute !== false) minute = parseInt(minute,10);
+               if (second !== false) second = parseInt(second,10);
+               if (millisec !== false) millisec = parseInt(millisec,10);
+
+               var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+               // If the update was done in the input field, the input field should not be updated.
+               // If the update was done using the sliders, update the input field.
+               var hasChanged = (hour != this.hour || minute != this.minute
+                               || second != this.second || millisec != this.millisec
+                               || (this.ampm.length > 0
+                                   && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
+                               || timezone != this.timezone);
+
+               if (hasChanged) {
+
+                       if (hour !== false)this.hour = hour;
+                       if (minute !== false) this.minute = minute;
+                       if (second !== false) this.second = second;
+                       if (millisec !== false) this.millisec = millisec;
+                       if (timezone !== false) this.timezone = timezone;
+
+                       if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+
+                       this._limitMinMaxDateTime(this.inst, true);
+               }
+               if (o.ampm) this.ampm = ampm;
+
+               //this._formatTime();
+               this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
+               if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix);
+               this.timeDefined = true;
+               if (hasChanged) this._updateDateTime();
+       },
+
+       //########################################################################
+       // call custom onSelect.
+       // bind to sliders slidestop, and grid click.
+       //########################################################################
+       _onSelectHandler: function() {
+               var onSelect = this._defaults.onSelect;
+               var inputEl = this.$input ? this.$input[0] : null;
+               if (onSelect && inputEl) {
+                       onSelect.apply(inputEl, [this.formattedDateTime, this]);
+               }
+       },
+
+       //########################################################################
+       // left for any backwards compatibility
+       //########################################################################
+       _formatTime: function(time, format) {
+               time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
+               var tmptime = (format || this._defaults.timeFormat).toString();
+
+               tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
+
+               if (arguments.length) return tmptime;
+               else this.formattedTime = tmptime;
+       },
+
+       //########################################################################
+       // update our input with the new date time..
+       //########################################################################
+       _updateDateTime: function(dp_inst) {
+               dp_inst = this.inst || dp_inst;
+               var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+                       dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+                       formatCfg = $.datepicker._getFormatConfig(dp_inst),
+                       timeAvailable = dt !== null && this.timeDefined;
+               this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+               var formattedDateTime = this.formattedDate;
+               if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
+                       return;
+
+               if (this._defaults.timeOnly === true) {
+                       formattedDateTime = this.formattedTime;
+               } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+                       formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+               }
+
+               this.formattedDateTime = formattedDateTime;
+
+               if(!this._defaults.showTimepicker) {
+                       this.$input.val(this.formattedDate);
+               } else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+                       this.$altInput.val(this.formattedTime);
+                       this.$input.val(this.formattedDate);
+               } else if(this.$altInput) {
+                       this.$altInput.val(formattedDateTime);
+                       this.$input.val(formattedDateTime);
+               } else {
+                       this.$input.val(formattedDateTime);
+               }
+
+               this.$input.trigger("change");
+       }
+
+});
+
+$.fn.extend({
+       //########################################################################
+       // shorthand just to use timepicker..
+       //########################################################################
+       timepicker: function(o) {
+               o = o || {};
+               var tmp_args = arguments;
+
+               if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
+
+               return $(this).each(function() {
+                       $.fn.datetimepicker.apply($(this), tmp_args);
+               });
+       },
+
+       //########################################################################
+       // extend timepicker to datepicker
+       //########################################################################
+       datetimepicker: function(o) {
+               o = o || {};
+               tmp_args = arguments;
+
+               if (typeof(o) == 'string'){
+                       if(o == 'getDate')
+                               return $.fn.datepicker.apply($(this[0]), tmp_args);
+                       else
+                               return this.each(function() {
+                                       var $t = $(this);
+                                       $t.datepicker.apply($t, tmp_args);
+                               });
+               }
+               else
+                       return this.each(function() {
+                               var $t = $(this);
+                               $t.datepicker($.timepicker._newInst($t, o)._defaults);
+                       });
+       }
+});
+
+//########################################################################
+// format the time all pretty...
+// format = string format of the time
+// time = a {}, not a Date() for timezones
+// options = essentially the regional[].. amNames, pmNames, ampm
+//########################################################################
+$.datepicker.formatTime = function(format, time, options) {
+       options = options || {};
+       options = $.extend($.timepicker._defaults, options);
+       time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
+
+       var tmptime = format;
+       var ampmName = options['amNames'][0];
+
+       var hour = parseInt(time.hour, 10);
+       if (options.ampm) {
+               if (hour > 11){
+                       ampmName = options['pmNames'][0];
+                       if(hour > 12)
+                               hour = hour % 12;
+               }
+               if (hour === 0)
+                       hour = 12;
+       }
+       tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
+               switch (match.toLowerCase()) {
+                       case 'hh': return ('0' + hour).slice(-2);
+                       case 'h':  return hour;
+                       case 'mm': return ('0' + time.minute).slice(-2);
+                       case 'm':  return time.minute;
+                       case 'ss': return ('0' + time.second).slice(-2);
+                       case 's':  return time.second;
+                       case 'l':  return ('00' + time.millisec).slice(-3);
+                       case 'z':  return time.timezone;
+                       case 't': case 'tt':
+                               if (options.ampm) {
+                                       if (match.length == 1)
+                                               ampmName = ampmName.charAt(0);
+                                       return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
+                               }
+                               return '';
+               }
+       });
+
+       tmptime = $.trim(tmptime);
+       return tmptime;
+};
+
+//########################################################################
+// the bad hack :/ override datepicker so it doesnt close on select
+// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+//########################################################################
+$.datepicker._base_selectDate = $.datepicker._selectDate;
+$.datepicker._selectDate = function (id, dateStr) {
+       var inst = this._getInst($(id)[0]),
+               tp_inst = this._get(inst, 'timepicker');
+
+       if (tp_inst) {
+               tp_inst._limitMinMaxDateTime(inst, true);
+               inst.inline = inst.stay_open = true;
+               //This way the onSelect handler called from calendarpicker get the full dateTime
+               this._base_selectDate(id, dateStr);
+               inst.inline = inst.stay_open = false;
+               this._notifyChange(inst);
+               this._updateDatepicker(inst);
+       }
+       else this._base_selectDate(id, dateStr);
+};
+
+//#############################################################################################
+// second bad hack :/ override datepicker so it triggers an event when changing the input field
+// and does not redraw the datepicker on every selectDate event
+//#############################################################################################
+$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+$.datepicker._updateDatepicker = function(inst) {
+
+       // don't popup the datepicker if there is another instance already opened
+       var input = inst.input[0];
+       if($.datepicker._curInst &&
+          $.datepicker._curInst != inst &&
+          $.datepicker._datepickerShowing &&
+          $.datepicker._lastInput != input) {
+               return;
+       }
+
+       if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+               this._base_updateDatepicker(inst);
+
+               // Reload the time control when changing something in the input text field.
+               var tp_inst = this._get(inst, 'timepicker');
+               if(tp_inst) tp_inst._addTimePicker(inst);
+       }
+};
+
+//#######################################################################################
+// third bad hack :/ override datepicker so it allows spaces and colon in the input field
+//#######################################################################################
+$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+$.datepicker._doKeyPress = function(event) {
+       var inst = $.datepicker._getInst(event.target),
+               tp_inst = $.datepicker._get(inst, 'timepicker');
+
+       if (tp_inst) {
+               if ($.datepicker._get(inst, 'constrainInput')) {
+                       var ampm = tp_inst._defaults.ampm,
+                               dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+                               datetimeChars = tp_inst._defaults.timeFormat.toString()
+                                                               .replace(/[hms]/g, '')
+                                                               .replace(/TT/g, ampm ? 'APM' : '')
+                                                               .replace(/Tt/g, ampm ? 'AaPpMm' : '')
+                                                               .replace(/tT/g, ampm ? 'AaPpMm' : '')
+                                                               .replace(/T/g, ampm ? 'AP' : '')
+                                                               .replace(/tt/g, ampm ? 'apm' : '')
+                                                               .replace(/t/g, ampm ? 'ap' : '') +
+                                                               " " +
+                                                               tp_inst._defaults.separator +
+                                                               tp_inst._defaults.timeSuffix +
+                                                               (tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+                                                               (tp_inst._defaults.amNames.join('')) +
+                                                               (tp_inst._defaults.pmNames.join('')) +
+                                                               dateChars,
+                               chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+                       return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+               }
+       }
+
+       return $.datepicker._base_doKeyPress(event);
+};
+
+//#######################################################################################
+// Override key up event to sync manual input changes.
+//#######################################################################################
+$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+$.datepicker._doKeyUp = function (event) {
+       var inst = $.datepicker._getInst(event.target),
+               tp_inst = $.datepicker._get(inst, 'timepicker');
+
+       if (tp_inst) {
+               if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+                       try {
+                               $.datepicker._updateDatepicker(inst);
+                       }
+                       catch (err) {
+                               $.datepicker.log(err);
+                       }
+               }
+       }
+
+       return $.datepicker._base_doKeyUp(event);
+};
+
+//#######################################################################################
+// override "Today" button to also grab the time.
+//#######################################################################################
+$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+$.datepicker._gotoToday = function(id) {
+       var inst = this._getInst($(id)[0]),
+               $dp = inst.dpDiv;
+       this._base_gotoToday(id);
+       var now = new Date();
+       var tp_inst = this._get(inst, 'timepicker');
+       if (tp_inst && tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
+               var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
+               var tzsign = tzoffset > 0 ? '-' : '+';
+               tzoffset = Math.abs(tzoffset);
+               var tzmin = tzoffset % 60;
+               tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
+               if (tp_inst._defaults.timezoneIso8609)
+                       tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+               tp_inst.timezone_select.val(tzoffset);
+       }
+       this._setTime(inst, now);
+       $( '.ui-datepicker-today', $dp).click();
+};
+
+//#######################################################################################
+// Disable & enable the Time in the datetimepicker
+//#######################################################################################
+$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
+       var inst = this._getInst(target),
+       tp_inst = this._get(inst, 'timepicker');
+       $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+       if (tp_inst) {
+               tp_inst._defaults.showTimepicker = false;
+               tp_inst._updateDateTime(inst);
+       }
+};
+
+$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) {
+       var inst = this._getInst(target),
+       tp_inst = this._get(inst, 'timepicker');
+       $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+       if (tp_inst) {
+               tp_inst._defaults.showTimepicker = true;
+               tp_inst._addTimePicker(inst); // Could be disabled on page load
+               tp_inst._updateDateTime(inst);
+       }
+};
+
+//#######################################################################################
+// Create our own set time function
+//#######################################################################################
+$.datepicker._setTime = function(inst, date) {
+       var tp_inst = this._get(inst, 'timepicker');
+       if (tp_inst) {
+               var defaults = tp_inst._defaults,
+                       // calling _setTime with no date sets time to defaults
+                       hour = date ? date.getHours() : defaults.hour,
+                       minute = date ? date.getMinutes() : defaults.minute,
+                       second = date ? date.getSeconds() : defaults.second,
+                       millisec = date ? date.getMilliseconds() : defaults.millisec;
+
+               //check if within min/max times..
+               if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax) || (millisec < defaults.millisecMin || millisec > defaults.millisecMax)) {
+                       hour = defaults.hourMin;
+                       minute = defaults.minuteMin;
+                       second = defaults.secondMin;
+                       millisec = defaults.millisecMin;
+               }
+
+               tp_inst.hour = hour;
+               tp_inst.minute = minute;
+               tp_inst.second = second;
+               tp_inst.millisec = millisec;
+
+               if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+               if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+               if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+               if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
+
+               tp_inst._onTimeChange();
+               tp_inst._updateDateTime(inst);
+       }
+};
+
+//#######################################################################################
+// Create new public method to set only time, callable as $().datepicker('setTime', date)
+//#######################################################################################
+$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+       var inst = this._getInst(target),
+               tp_inst = this._get(inst, 'timepicker');
+
+       if (tp_inst) {
+               this._setDateFromField(inst);
+               var tp_date;
+               if (date) {
+                       if (typeof date == "string") {
+                               tp_inst._parseTime(date, withDate);
+                               tp_date = new Date();
+                               tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+                       }
+                       else tp_date = new Date(date.getTime());
+                       if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
+                       this._setTime(inst, tp_date);
+               }
+       }
+
+};
+
+//#######################################################################################
+// override setDate() to allow setting time too within Date object
+//#######################################################################################
+$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+$.datepicker._setDateDatepicker = function(target, date) {
+       var inst = this._getInst(target),
+       tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+       this._updateDatepicker(inst);
+       this._base_setDateDatepicker.apply(this, arguments);
+       this._setTimeDatepicker(target, tp_date, true);
+};
+
+//#######################################################################################
+// override getDate() to allow getting time too within Date object
+//#######################################################################################
+$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+$.datepicker._getDateDatepicker = function(target, noDefault) {
+       var inst = this._getInst(target),
+               tp_inst = this._get(inst, 'timepicker');
+
+       if (tp_inst) {
+               this._setDateFromField(inst, noDefault);
+               var date = this._getDate(inst);
+               if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+               return date;
+       }
+       return this._base_getDateDatepicker(target, noDefault);
+};
+
+//#######################################################################################
+// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+// An option in datapicker to ignore extra format characters would be nicer.
+//#######################################################################################
+$.datepicker._base_parseDate = $.datepicker.parseDate;
+$.datepicker.parseDate = function(format, value, settings) {
+       var date;
+       try {
+               date = this._base_parseDate(format, value, settings);
+       } catch (err) {
+               if (err.indexOf(":") >= 0) {
+                       // Hack!  The error message ends with a colon, a space, and
+                       // the "extra" characters.  We rely on that instead of
+                       // attempting to perfectly reproduce the parsing algorithm.
+                       date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
+               } else {
+                       // The underlying error was not related to the time
+                       throw err;
+               }
+       }
+       return date;
+};
+
+//#######################################################################################
+// override formatDate to set date with time to the input
+//#######################################################################################
+$.datepicker._base_formatDate = $.datepicker._formatDate;
+$.datepicker._formatDate = function(inst, day, month, year){
+       var tp_inst = this._get(inst, 'timepicker');
+       if(tp_inst) {
+               tp_inst._updateDateTime(inst);
+               return tp_inst.$input.val();
+       }
+       return this._base_formatDate(inst);
+};
+
+//#######################################################################################
+// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+//#######################################################################################
+$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+$.datepicker._optionDatepicker = function(target, name, value) {
+       var inst = this._getInst(target),
+               tp_inst = this._get(inst, 'timepicker');
+       if (tp_inst) {
+               var min = null, max = null, onselect = null;
+               if (typeof name == 'string') { // if min/max was set with the string
+                       if (name === 'minDate' || name === 'minDateTime' )
+                               min = value;
+                       else if (name === 'maxDate' || name === 'maxDateTime')
+                               max = value;
+                       else if (name === 'onSelect')
+                               onselect = value;
+               } else if (typeof name == 'object') { //if min/max was set with the JSON
+                       if (name.minDate)
+                               min = name.minDate;
+                       else if (name.minDateTime)
+                               min = name.minDateTime;
+                       else if (name.maxDate)
+                               max = name.maxDate;
+                       else if (name.maxDateTime)
+                               max = name.maxDateTime;
+               }
+               if(min) { //if min was set
+                       if (min == 0)
+                               min = new Date();
+                       else
+                               min = new Date(min);
+
+                       tp_inst._defaults.minDate = min;
+                       tp_inst._defaults.minDateTime = min;
+               } else if (max) { //if max was set
+                       if(max==0)
+                               max=new Date();
+                       else
+                               max= new Date(max);
+                       tp_inst._defaults.maxDate = max;
+                       tp_inst._defaults.maxDateTime = max;
+               } else if (onselect)
+                       tp_inst._defaults.onSelect = onselect;
+       }
+       if (value === undefined)
+               return this._base_optionDatepicker(target, name);
+       return this._base_optionDatepicker(target, name, value);
+};
+
+//#######################################################################################
+// jQuery extend now ignores nulls!
+//#######################################################################################
+function extendRemove(target, props) {
+       $.extend(target, props);
+       for (var name in props)
+               if (props[name] === null || props[name] === undefined)
+                       target[name] = props[name];
+       return target;
+};
+
+$.timepicker = new Timepicker(); // singleton instance
+$.timepicker.version = "1.0.0";
+
+})(jQuery);