X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FTag.pm;h=8929dc5e28f32b5bdf6479a083523662c01d3ed8;hb=cd274d3f3c0600fedf42cca0830179cbeb81a535;hp=141be6cacd8548ae1c5b39dc4b39a8e037eede7e;hpb=c4f7ec713f3fcfcb9fab2d0c0adb086809134fcc;p=kivitendo-erp.git diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm index 141be6cac..8929dc5e2 100644 --- a/SL/Presenter/Tag.pm +++ b/SL/Presenter/Tag.pm @@ -4,13 +4,14 @@ use strict; use SL::HTML::Restrict; use SL::Presenter::EscapedText qw(escape); +use Scalar::Util qw(blessed); use Exporter qw(import); our @EXPORT_OK = qw( html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag checkbox_tag button_tag submit_tag ajax_submit_tag input_number_tag - stringify_attributes restricted_html link -); + stringify_attributes restricted_html textarea_tag link_tag date_tag + div_tag); our %EXPORT_TAGS = (ALL => \@EXPORT_OK); use Carp; @@ -110,6 +111,10 @@ sub select_tag { _set_id_attribute(\%attributes, $name); + $collection = [] if defined($collection) && !ref($collection) && ($collection eq ''); + + my $with_filter = delete($attributes{with_filter}); + my $fil_placeholder = delete($attributes{filter_placeholder}); my $value_key = delete($attributes{value_key}) || 'id'; my $title_key = delete($attributes{title_key}) || $value_key; my $default_key = delete($attributes{default_key}) || 'selected'; @@ -205,7 +210,28 @@ sub select_tag { } @{ $collection }; } - html_tag('select', $code, %attributes, name => $name); + my $select_html = html_tag('select', $code, %attributes, name => $name); + + if ($with_filter) { + my $input_style; + + if (($attributes{style} // '') =~ m{width: *(\d+) *px}i) { + $input_style = "width: " . ($1 - 22) . "px"; + } + + my $input_html = html_tag( + 'input', undef, + autocomplete => 'off', + type => 'text', + id => $attributes{id} . '_filter', + 'data-select-id' => $attributes{id}, + (placeholder => $fil_placeholder) x !!$fil_placeholder, + (style => $input_style) x !!$input_style, + ); + $select_html = html_tag('div', $input_html . $select_html, class => "filtered_select"); + } + + return $select_html; } sub checkbox_tag { @@ -312,13 +338,52 @@ sub restricted_html { return $html_restricter->process($value); } -sub link { +sub textarea_tag { + my ($name, $content, %attributes) = @_; + + _set_id_attribute(\%attributes, $name); + $attributes{rows} *= 1; # required by standard + $attributes{cols} *= 1; # required by standard + + html_tag('textarea', $content, %attributes, name => $name); +} + +sub link_tag { my ($href, $content, %params) = @_; $href ||= '#'; html_tag('a', $content, %params, href => $href); } +# alias for compatibility +sub link { goto &link_tag } + +sub date_tag { + my ($name, $value, %params) = @_; + + _set_id_attribute(\%params, $name); + my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : (); + my @classes = $params{no_cal} || $params{readonly} ? () : ('datepicker'); + push @classes, delete($params{class}) if $params{class}; + my %class = @classes ? (class => join(' ', @classes)) : (); + + $::request->layout->add_javascripts('kivi.Validator.js'); + $::request->presenter->need_reinit_widgets($params{id}); + + $params{'data-validate'} = join(' ', "date", grep { $_ } (delete $params{'data-validate'})); + + input_tag( + $name, blessed($value) ? $value->to_lxoffice : $value, + size => 11, + %params, + %class, @onchange, + ); +} + +sub div_tag { + my ($content, %params) = @_; + return html_tag('div', $content, %params); +} 1; __END__