X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftr-input-date-field.html;h=f2a570b997b44a1725a1bd18f6a5a527ff7cbf09;hp=5400fcb808cebc6a161fc2d8808882ecda1a91ce;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984

diff --git a/httemplate/elements/tr-input-date-field.html b/httemplate/elements/tr-input-date-field.html
index 5400fcb80..f2a570b99 100644
--- a/httemplate/elements/tr-input-date-field.html
+++ b/httemplate/elements/tr-input-date-field.html
@@ -1,3 +1,23 @@
+<%doc>
+
+Example:
+
+  <& /elements/tr-input_date-field,
+       {
+          'name'  => 'field_name',
+          'value' => $current_value,
+          'label' => 'Label',
+
+          #optional
+          'format'      => '%m/%d/%Y', #overrides date_format config
+          'usedatetime' => 1, #use DateTime->strftime to format the date
+                              # instead of Date::Format->time2str
+          'noinit'      => 1,          #first one on the page is enough
+          'required'    => 1,
+       },
+  &>
+
+</%doc>
 % unless ( $noinit ) {
 <LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
 <SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar_stripped.js"></SCRIPT>
@@ -5,11 +25,12 @@
 <SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-setup.js"></SCRIPT>
 % }
 
-<TR>
-  <TD ALIGN="right"><% $label %></TD>
-  <TD>
+<% include('/elements/tr-td-label.html',
+     'label'    => $label,
+     'required' => $required ) %>
+  <TD COLSPAN=<% $colspan %>>
     <INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
-    <IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name  %>_button" STYLE="cursor: pointer" TITLE="Select date">
+    <IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name  %>_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
   </TD>
 </TR>
 
@@ -19,12 +40,17 @@
     ifFormat:   "<% $format %>",
     button:     "<% $name %>_button",
     align:      "BR"
+%   if ( $format =~ /\%r/ ) {
+      ,
+      showsTime: true,
+      timeFormat: 12
+%   }
   });
 </SCRIPT>
 
 <%init>
 
-my($name, $value, $label, $format, $usedatetime, $noinit);
+my($name, $value, $label, $format, $usedatetime, $noinit, $colspan, $required);
 if ( ref($_[0]) ) {
   my $opt = shift;
   $name        = $opt->{'name'};
@@ -33,8 +59,11 @@ if ( ref($_[0]) ) {
   $format      = $opt->{'format'};
   $usedatetime = $opt->{'usedatetime'};
   $noinit      = $opt->{'noinit'};
+  $colspan     = $opt->{'colspan'} || 1;
+  $required    = $opt->{'required'};
 } else {
   ($name, $value, $label, $format, $usedatetime) = @_;
+  $colspan = 1;
 }
 
 my $conf = new FS::Conf;