X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=6db220296b9a318e9e068525f9c84ee9351343a4;hb=1b9d0f70b5e58c510ed2ab4337eb0f6512d779ca;hp=0ed2a8784718ce68e202b16c17be111b1b13321c;hpb=159556ca90d5aa0662964ea5f2db8f8f3a716ea8;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 0ed2a8784..6db220296 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -4,6 +4,9 @@ use base qw( Template::Plugin ); use Template::Plugin; use List::MoreUtils qw(apply); use List::Util qw(max); +use Scalar::Util qw(blessed); + +use SL::Presenter; use strict; @@ -12,7 +15,7 @@ use strict; # Do not use these id's to store information across requests. my $_id_sequence = int rand 1e7; sub _tag_id { - return $_id_sequence = ($_id_sequence + 1) % 1e7; + return "id_" . ( $_id_sequence = ($_id_sequence + 1) % 1e7 ); } } @@ -22,8 +25,8 @@ sub _H { } sub _J { - my $string = "" . shift; - $string =~ s/\"/\\\"/g; + my $string = shift; + $string =~ s/(\"|\'|\\)/\\$1/g; return $string; } @@ -44,56 +47,49 @@ sub _context { return $_[0]->{CONTEXT}; } -sub name_to_id { - my $self = shift; - my $name = shift; +sub _call_presenter { + my ($method, $self, @args) = @_; - $name =~ s/[^\w_]/_/g; - $name =~ s/_+/_/g; - - return $name; -} + my $presenter = $::request->presenter; -sub attributes { - my ($self, @slurp) = @_; - my %options = _hashify(@slurp); - - my @result = (); - while (my ($name, $value) = each %options) { - next unless $name; - next if $name eq 'disabled' && !$value; - $value = '' if !defined($value); - push @result, _H($name) . '="' . _H($value) . '"'; + if (!$presenter->can($method)) { + $::lxdebug->message(LXDebug::WARN(), "SL::Presenter has no method named '$method'!"); + return ''; } - return @result ? ' ' . join(' ', @result) : ''; + splice @args, -1, 1, %{ $args[-1] } if @args && (ref($args[-1]) eq 'HASH'); + + $presenter->$method(@args); } -sub html_tag { - my ($self, $tag, $content, @slurp) = @_; - my $attributes = $self->attributes(@slurp); +sub name_to_id { return _call_presenter('name_to_id', @_); } +sub html_tag { return _call_presenter('html_tag', @_); } +sub select_tag { return _call_presenter('select_tag', @_); } +sub input_tag { return _call_presenter('input_tag', @_); } +sub truncate { return _call_presenter('truncate', @_); } +sub simple_format { return _call_presenter('simple_format', @_); } - return "<${tag}${attributes}/>" unless defined($content); - return "<${tag}${attributes}>${content}${tag}>"; +sub _set_id_attribute { + my ($attributes, $name) = @_; + SL::Presenter::Tag::_set_id_attribute($attributes, $name); } -sub select_tag { - my $self = shift; - my $name = shift; - my $options_str = shift; - my %attributes = _hashify(@_); +sub img_tag { + my ($self, @slurp) = @_; + my %options = _hashify(@slurp); - $attributes{id} ||= $self->name_to_id($name); - $options_str = $self->options_for_select($options_str) if ref $options_str; + $options{alt} ||= ''; - return $self->html_tag('select', $options_str, %attributes, name => $name); + return $self->html_tag('img', undef, %options); } sub textarea_tag { my ($self, $name, $content, @slurp) = @_; my %attributes = _hashify(@slurp); - $attributes{id} ||= $self->name_to_id($name); + _set_id_attribute(\%attributes, $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); @@ -103,7 +99,7 @@ sub checkbox_tag { my ($self, $name, @slurp) = @_; my %attributes = _hashify(@slurp); - $attributes{id} ||= $self->name_to_id($name); + _set_id_attribute(\%attributes, $name); $attributes{value} = 1 unless defined $attributes{value}; my $label = delete $attributes{label}; my $checkall = delete $attributes{checkall}; @@ -126,8 +122,8 @@ sub radio_button_tag { my $name = shift; my %attributes = _hashify(@_); + _set_id_attribute(\%attributes, $name); $attributes{value} = 1 unless defined $attributes{value}; - $attributes{id} ||= $self->name_to_id($name . "_" . $attributes{value}); my $label = delete $attributes{label}; if ($attributes{checked}) { @@ -142,18 +138,9 @@ sub radio_button_tag { return $code; } -sub input_tag { - my ($self, $name, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); - - $attributes{id} ||= $self->name_to_id($name); - $attributes{type} ||= 'text'; - - return $self->html_tag('input', undef, %attributes, name => $name, value => $value); -} - sub hidden_tag { - return shift->input_tag(@_, type => 'hidden'); + my ($self, $name, $value, @slurp) = @_; + return $self->input_tag($name, $value, _hashify(@slurp), type => 'hidden'); } sub div_tag { @@ -184,7 +171,9 @@ sub submit_tag { my ($self, $name, $value, @slurp) = @_; my %attributes = _hashify(@slurp); - $attributes{onclick} = "if (confirm('" . delete($attributes{confirm}) . "')) return true; else return false;" if $attributes{confirm}; + if ( $attributes{confirm} ) { + $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");'; + } return $self->input_tag($name, $value, %attributes, type => 'submit', class => 'submit'); } @@ -193,52 +182,29 @@ sub button_tag { my ($self, $onclick, $value, @slurp) = @_; my %attributes = _hashify(@slurp); - return $self->input_tag(undef, $value, %attributes, type => 'button', onclick => $onclick); -} - -sub options_for_select { - my $self = shift; - my $collection = shift; - my %options = _hashify(@_); - - my $value_key = $options{value} || 'id'; - my $title_key = $options{title} || $value_key; + _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name}; + $attributes{type} ||= 'button'; - my $value_sub = $options{value_sub}; - my $title_sub = $options{title_sub}; + $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm}; - my $value_title_sub = $options{value_title_sub}; - - my %selected = map { ( $_ => 1 ) } @{ ref($options{default}) eq 'ARRAY' ? $options{default} : defined($options{default}) ? [ $options{default} ] : [] }; + return $self->html_tag('input', undef, %attributes, value => $value, onclick => $onclick); +} - my $access = sub { - my ($element, $index, $key, $sub) = @_; - my $ref = ref $element; - return $sub ? $sub->($element) - : !$ref ? $element - : $ref eq 'ARRAY' ? $element->[$index] - : $ref eq 'HASH' ? $element->{$key} - : $element->$key; - }; +sub ajax_submit_tag { + my ($self, $url, $form_selector, $text, @slurp) = @_; - my @elements = (); - push @elements, [ undef, $options{empty_title} || '' ] if $options{with_empty}; - push @elements, map [ - $value_title_sub ? @{ $value_title_sub->($_) } : ( - $access->($_, 0, $value_key, $value_sub), - $access->($_, 1, $title_key, $title_sub), - ) - ], @{ $collection } if $collection && ref $collection eq 'ARRAY'; + $url = _J($url); + $form_selector = _J($form_selector); + my $onclick = qq|submit_ajax_form('${url}', '${form_selector}')|; - my $code = ''; - foreach my $result (@elements) { - my %attributes = ( value => $result->[0] ); - $attributes{selected} = 'selected' if $selected{ defined($result->[0]) ? $result->[0] : '' }; + return $self->button_tag($onclick, $text, @slurp); +} - $code .= $self->html_tag('option', _H($result->[1]), %attributes); - } +sub yes_no_tag { + my ($self, $name, $value) = splice @_, 0, 3; + my %attributes = _hashify(@_); - return $code; + return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes); } sub javascript { @@ -260,37 +226,64 @@ sub stylesheet_tag { return $code; } +my $date_tag_id_idx = 0; sub date_tag { my ($self, $name, $value, @slurp) = @_; + my %params = _hashify(@slurp); - my $name_e = _H($name); - my $seq = _tag_id(); - my $datefmt = apply { - s/d+/\%d/gi; - s/m+/\%m/gi; - s/y+/\%Y/gi; - } $::myconfig{"dateformat"}; - - $params{cal_align} ||= 'BR'; - - $self->input_tag($name, $value, - id => $name_e, + _set_id_attribute(\%params, $name); + my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : (); + my @class = $params{no_cal} || $params{readonly} ? () : (class => 'datepicker'); + + return $self->input_tag( + $name, blessed($value) ? $value->to_lxoffice : $value, size => 11, - title => _H($::myconfig{dateformat}), - onBlur => 'check_right_date_format(this)', + onblur => "check_right_date_format(this);", %params, - ) . ((!$params{no_cal}) ? - $self->html_tag('img', undef, - src => 'image/calendar.png', - id => "trigger$seq", - title => _H($::myconfig{dateformat}), - %params, - ) . - $self->javascript( - "Calendar.setup({ inputField: '$name_e', ifFormat: '$datefmt', align: '$params{cal_align}', button: 'trigger$seq' });" - ) : ''); + @class, @onchange, + ); } +sub customer_picker { + my ($self, $name, $value, %params) = @_; + my $name_e = _H($name); + + $::request->{layout}->add_javascripts('autocomplete_customer.js'); + + $self->hidden_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => 'customer_autocomplete') . + $self->input_tag("$name_e\_name", (ref $value && $value->can('name')) ? $value->name : '', %params); +} + +# simple version with select_tag +sub vendor_selector { + my ($self, $name, $value, %params) = @_; + + my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) : + (ref $value && $value->can('id')) ? $value->id : ''; + + return $self->select_tag($name, SL::DB::Manager::Vendor->get_all(), + default => $actual_vendor_id, + title_sub => sub { $_[0]->vendornumber . " : " . $_[0]->name }, + 'with_empty' => 1, + %params); +} + + +# simple version with select_tag +sub part_selector { + my ($self, $name, $value, %params) = @_; + + my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) : + (ref $value && $value->can('id')) ? $value->id : ''; + + return $self->select_tag($name, SL::DB::Manager::Part->get_all(), + default => $actual_part_id, + title_sub => sub { $_[0]->partnumber . " : " . $_[0]->description }, + with_empty => 1, + %params); +} + + sub javascript_tag { my $self = shift; my $code = ''; @@ -321,27 +314,15 @@ sub tabbed { next if $tab eq ''; - my $selected = $params{selected} == $i; - my $tab_id = "__tab_id_$i"; - push @header, $self->li_tag( - $self->link('', $tab->{name}, rel => $tab_id), - ($selected ? (class => 'selected') : ()) - ); - push @blocks, $self->div_tag($tab->{data}, - id => $tab_id, class => 'tabcontent'); + my $tab_id = "__tab_id_$i"; + push @header, $self->li_tag($self->link('#' . $tab_id, $tab->{name})); + push @blocks, $self->div_tag($tab->{data}, id => $tab_id); } return '' unless @header; - return $self->ul_tag( - join('', @header), id => $id, class => 'shadetabs' - ) . - $self->div_tag( - join('', @blocks), class => 'tabcontentstyle' - ) . - $self->javascript( - qq|var $id = new ddtabcontent("$id");$id.setpersist(true);| . - qq|$id.setselectedClassTarget("link");$id.init();| - ); + + my $ul = $self->ul_tag(join('', @header), id => $id); + return $self->div_tag(join('', $ul, @blocks), class => 'tabwidget'); } sub tab { @@ -370,12 +351,19 @@ sub areainput_tag { my ($self, $name, $value, @slurp) = @_; my %attributes = _hashify(@slurp); - my $rows = delete $attributes{rows} || 1; + my ($rows, $cols); my $min = delete $attributes{min_rows} || 1; + if (exists $attributes{cols}) { + $cols = delete $attributes{cols}; + $rows = $::form->numtextrows($value, $cols); + } else { + $rows = delete $attributes{rows} || 1; + } + return $rows > 1 - ? $self->textarea_tag($name, $value, %attributes, rows => max $rows, $min) - : $self->input_tag($name, $value, %attributes); + ? $self->textarea_tag($name, $value, %attributes, rows => max($rows, $min), ($cols ? (cols => $cols) : ())) + : $self->input_tag($name, $value, %attributes, ($cols ? (size => $cols) : ())); } sub multiselect2side { @@ -465,7 +453,7 @@ sub online_help_tag { die 'malformed help tag' unless $tag =~ /^[a-zA-Z0-9_]+$/; return unless -f $file; - return $self->html_tag('a', $text, href => $file, target => '_blank'); + return $self->html_tag('a', $text, href => $file, class => 'jqModal') } sub dump { @@ -474,6 +462,50 @@ sub dump { return '
' . Data::Dumper::Dumper(@_) . ''; } +sub sortable_table_header { + my ($self, $by, @slurp) = @_; + my %params = _hashify(@slurp); + + my $controller = $self->{CONTEXT}->stash->get('SELF'); + my $sort_spec = $controller->get_sort_spec; + my $by_spec = $sort_spec->{$by}; + my %current_sort_params = $controller->get_current_sort_params; + my ($image, $new_dir) = ('', $current_sort_params{dir}); + my $title = delete($params{title}) || $::locale->text($by_spec->{title}); + + if ($current_sort_params{by} eq $by) { + my $current_dir = $current_sort_params{dir} ? 'up' : 'down'; + $image = '