X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=320c75ed218ca6f83a6ccdabe955f75436b4eddf;hb=bd1e1e7d4bc019cc97b60d4a946531c356c45fde;hp=0ed2a8784718ce68e202b16c17be111b1b13321c;hpb=89834c120b851abcfa5e9ccb41750c4c81b2ed5f;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 0ed2a8784..320c75ed2 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -4,6 +4,7 @@ use base qw( Template::Plugin ); use Template::Plugin; use List::MoreUtils qw(apply); use List::Util qw(max); +use Scalar::Util qw(blessed); use strict; @@ -73,7 +74,7 @@ sub html_tag { my ($self, $tag, $content, @slurp) = @_; my $attributes = $self->attributes(@slurp); - return "<${tag}${attributes}/>" unless defined($content); + return "<${tag}${attributes}>" unless defined($content); return "<${tag}${attributes}>${content}"; } @@ -94,6 +95,8 @@ sub textarea_tag { my %attributes = _hashify(@slurp); $attributes{id} ||= $self->name_to_id($name); + $attributes{rows} *= 1; # required by standard + $attributes{cols} *= 1; # required by standard $content = $content ? _H($content) : ''; return $self->html_tag('textarea', $content, %attributes, name => $name); @@ -193,7 +196,10 @@ sub button_tag { my ($self, $onclick, $value, @slurp) = @_; my %attributes = _hashify(@slurp); - return $self->input_tag(undef, $value, %attributes, type => 'button', onclick => $onclick); + $attributes{id} ||= $self->name_to_id($attributes{name}) if $attributes{name}; + $attributes{type} ||= 'button'; + + return $self->html_tag('input', undef, %attributes, value => $value, onclick => $onclick); } sub options_for_select { @@ -273,7 +279,9 @@ sub date_tag { $params{cal_align} ||= 'BR'; - $self->input_tag($name, $value, + my $str_value = blessed $value ? $value->to_lxoffice : $value; + + $self->input_tag($name, $str_value, id => $name_e, size => 11, title => _H($::myconfig{dateformat}), @@ -291,6 +299,40 @@ sub date_tag { ) : ''); } +sub customer_picker { + my ($self, $name, $value, %params) = @_; + my $name_e = _H($name); + + $self->hidden_tag($name, (ref $value && $value->can('id')) ? $value->id : '') . + $self->input_tag("$name_e\_name", (ref $value && $value->can('name')) ? $value->name : '', %params) . + $self->javascript(<