X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Ftr-input-date-field.html;h=f2a570b997b44a1725a1bd18f6a5a527ff7cbf09;hb=ded6a5654efd56d2f271970c992133600e0223b1;hp=40162f0fda342e2df64f15cbee2cd238c1792860;hpb=a794f08248abbb8d2f0efb617d3e83babdfe0e09;p=freeside.git
diff --git a/httemplate/elements/tr-input-date-field.html b/httemplate/elements/tr-input-date-field.html
index 40162f0fd..f2a570b99 100644
--- a/httemplate/elements/tr-input-date-field.html
+++ b/httemplate/elements/tr-input-date-field.html
@@ -13,6 +13,7 @@ Example:
'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,
},
&>
@@ -24,9 +25,10 @@ Example:
% }
-
- <% $label %> |
-
+<% include('/elements/tr-td-label.html',
+ 'label' => $label,
+ 'required' => $required ) %>
+ | >
|
@@ -38,12 +40,17 @@ Example:
ifFormat: "<% $format %>",
button: "<% $name %>_button",
align: "BR"
+% if ( $format =~ /\%r/ ) {
+ ,
+ showsTime: true,
+ timeFormat: 12
+% }
});
<%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'};
@@ -52,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;