1 files changed, 13 insertions, 2 deletions
diff --git a/rt/html/Elements/SelectDate b/rt/html/Elements/SelectDate
index b43f324..23df246 100644
--- a/rt/html/Elements/SelectDate
+++ b/rt/html/Elements/SelectDate
@@ -45,10 +45,21 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
+%# in PageLayout instead, once <% include('/elements/init_calendar.html') |n %>
+<input type="text" id="<% $Name %>" name="<% $Name %>" value="<% $Default %>" size="<% $Size %>" />
+<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $Name %>_date_button" STYLE="cursor: pointer" TITLE="Select date">
 <script type="text/javascript"><!--
-    onLoadHook('createCalendarLink("<% $Name %>");');
+Calendar.setup({
+    inputField: "<%$Name%>",
+% if ( defined($ShowTime) && $ShowTime ) {
+    ifFormat:   "%Y-%m-%d %H:%M",
+    showsTime:  true,
+% } else {
+    ifFormat:   "%Y-%m-%d",
+% }
+    button:     "<%$Name%>_date_button",
+});
 --></script>
-<input type="text" id="<% $Name %>" name="<% $Name %>" value="<% $Default %>" size="<% $Size %>" />
 <%init>
 unless ((defined $Default) or 
 	($current <= 0)) {