X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FTemplate%2FPlugin%2FL.pm;h=320c75ed218ca6f83a6ccdabe955f75436b4eddf;hb=bd1e1e7d4bc019cc97b60d4a946531c356c45fde;hp=d28ecb44f43d9d0ffb723583ba345af88df240b5;hpb=b73839693bf70d20b8cf21a49cad3ded744c182f;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index d28ecb44f..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); @@ -106,6 +109,7 @@ sub checkbox_tag { $attributes{id} ||= $self->name_to_id($name); $attributes{value} = 1 unless defined $attributes{value}; my $label = delete $attributes{label}; + my $checkall = delete $attributes{checkall}; if ($attributes{checked}) { $attributes{checked} = 'checked'; @@ -115,6 +119,7 @@ sub checkbox_tag { my $code = $self->html_tag('input', undef, %attributes, name => $name, type => 'checkbox'); $code .= $self->html_tag('label', $label, for => $attributes{id}) if $label; + $code .= $self->javascript(qq|\$('#$attributes{id}').checkall('$checkall');|) if $checkall; return $code; } @@ -191,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 { @@ -222,7 +230,7 @@ sub options_for_select { my @elements = (); push @elements, [ undef, $options{empty_title} || '' ] if $options{with_empty}; push @elements, map [ - $value_title_sub ? $value_title_sub->($_) : ( + $value_title_sub ? @{ $value_title_sub->($_) } : ( $access->($_, 0, $value_key, $value_sub), $access->($_, 1, $title_key, $title_sub), ) @@ -271,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}), @@ -289,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(< < 5, + helper => <<'JAVASCRIPT' ); function(event, ui) { ui.children().each(function() { - \$(this).width(\$(this).width()); + $(this).width($(this).width()); }); return ui; } JAVASCRIPT + my $stop_event = ''; + if ($params{url} && $params{with}) { my $as = $params{as} || $params{with}; my $filter = ".filter(function(idx) { return this.substr(0, " . length($params{with}) . ") == '$params{with}'; })"; $filter .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })"; + $stop_event = <*:odd').removeClass('listrow1').removeClass('listrow0').addClass('listrow0'); + \$('${selector}>*:even').removeClass('listrow1').removeClass('listrow0').addClass('listrow1'); +JAVASCRIPT + } + + if ($stop_event) { $attributes{stop} = < \$(function() { - \$( "${selector}" ).sortable({ ${attr_str} }).disableSelection(); + \$( "${selector}" ).sortable({ ${attr_str} }) }); JAVASCRIPT @@ -559,6 +622,10 @@ If C<%attributes> contains a key C