X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=bd3edda552a853c4dfb74f5a0c4e8f7f5fab01d2;hb=c7b0defb2a90a8eaa28b9e58ac3c108c27375a77;hp=7c53573033e306a6103c55be834bd141b7f4c957;hpb=ec3a4636c1d58339915614120cd82759150d7641;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 7c5357303..bd3edda55 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -62,15 +62,21 @@ sub _call_presenter { sub name_to_id { return _call_presenter('name_to_id', @_); } sub html_tag { return _call_presenter('html_tag', @_); } +sub hidden_tag { return _call_presenter('hidden_tag', @_); } sub select_tag { return _call_presenter('select_tag', @_); } +sub checkbox_tag { return _call_presenter('checkbox_tag', @_); } sub input_tag { return _call_presenter('input_tag', @_); } +sub javascript { return _call_presenter('javascript', @_); } sub truncate { return _call_presenter('truncate', @_); } sub simple_format { return _call_presenter('simple_format', @_); } sub part_picker { return _call_presenter('part_picker', @_); } +sub chart_picker { return _call_presenter('chart_picker', @_); } +sub customer_vendor_picker { return _call_presenter('customer_vendor_picker', @_); } +sub project_picker { return _call_presenter('project_picker', @_); } sub _set_id_attribute { - my ($attributes, $name) = @_; - SL::Presenter::Tag::_set_id_attribute($attributes, $name); + my ($attributes, $name, $unique) = @_; + SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique); } sub img_tag { @@ -92,34 +98,16 @@ sub textarea_tag { return $self->html_tag('textarea', $content, %attributes, name => $name); } -sub checkbox_tag { - my ($self, $name, %attributes) = _hashify(2, @_); - - _set_id_attribute(\%attributes, $name); - $attributes{value} = 1 unless defined $attributes{value}; - my $label = delete $attributes{label}; - my $checkall = delete $attributes{checkall}; - - if ($attributes{checked}) { - $attributes{checked} = 'checked'; - } else { - delete $attributes{checked}; - } - - 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; -} - sub radio_button_tag { my ($self, $name, %attributes) = _hashify(2, @_); - _set_id_attribute(\%attributes, $name); $attributes{value} = 1 unless exists $attributes{value}; + + _set_id_attribute(\%attributes, $name, 1); my $label = delete $attributes{label}; + _set_id_attribute(\%attributes, $name . '_' . $attributes{value}); + if ($attributes{checked}) { $attributes{checked} = 'checked'; } else { @@ -132,11 +120,6 @@ sub radio_button_tag { return $code; } -sub hidden_tag { - my ($self, $name, $value, %attributes) = _hashify(3, @_); - return $self->input_tag($name, $value, %attributes, type => 'hidden'); -} - sub div_tag { my ($self, $content, @slurp) = @_; return $self->html_tag('div', $content, @slurp); @@ -197,11 +180,6 @@ sub yes_no_tag { return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes); } -sub javascript { - my ($self, $data) = @_; - return $self->html_tag('script', $data, type => 'text/javascript'); -} - sub stylesheet_tag { my $self = shift; my $code = ''; @@ -237,19 +215,9 @@ sub date_tag { ); } -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 ($self, $name, $value, %params) = _hashify(3, @_); my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) : (ref $value && $value->can('id')) ? $value->id : ''; @@ -264,7 +232,7 @@ sub vendor_selector { # simple version with select_tag sub part_selector { - my ($self, $name, $value, %params) = @_; + my ($self, $name, $value, %params) = _hashify(3, @_); my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) : (ref $value && $value->can('id')) ? $value->id : ''; @@ -341,19 +309,14 @@ sub tab { sub areainput_tag { my ($self, $name, $value, %attributes) = _hashify(3, @_); - 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; - } + my $cols = delete $attributes{cols} || delete $attributes{size}; + my $minrows = delete $attributes{min_rows} || 1; + my $maxrows = delete $attributes{max_rows}; + my $rows = $::form->numtextrows($value, $cols, $maxrows, $minrows); return $rows > 1 - ? $self->textarea_tag($name, $value, %attributes, rows => max($rows, $min), ($cols ? (cols => $cols) : ())) - : $self->input_tag($name, $value, %attributes, ($cols ? (size => $cols) : ())); + ? $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) + : $self->input_tag($name, $value, %attributes, size => $cols); } sub multiselect2side { @@ -443,32 +406,34 @@ sub sortable_table_header { my ($self, $by, %params) = _hashify(2, @_); my $controller = $self->{CONTEXT}->stash->get('SELF'); - my $sort_spec = $controller->get_sort_spec; + my $models = $params{models} || $self->{CONTEXT}->stash->get('MODELS'); + my $sort_spec = $models->get_sort_spec; my $by_spec = $sort_spec->{$by}; - my %current_sort_params = $controller->get_current_sort_params; + my %current_sort_params = $models->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'; + if ($current_sort_params{sort_by} eq $by) { + my $current_dir = $current_sort_params{sort_dir} ? 'up' : 'down'; $image = ''; - $new_dir = 1 - ($current_sort_params{dir} || 0); + $new_dir = 1 - ($current_sort_params{sort_dir} || 0); } - $params{ $sort_spec->{FORM_PARAMS}->[0] } = $by; - $params{ $sort_spec->{FORM_PARAMS}->[1] } = ($new_dir ? '1' : '0'); + $params{ $models->sorted->form_params->[0] } = $by; + $params{ $models->sorted->form_params->[1] } = ($new_dir ? '1' : '0'); - return '' . _H($title) . $image . ''; + return '' . _H($title) . $image . ''; } sub paginate_controls { my ($self, %params) = _hashify(1, @_); my $controller = $self->{CONTEXT}->stash->get('SELF'); - my $pager = $params{models}->paginated; + my $models = $params{models} || $self->{CONTEXT}->stash->get('MODELS'); + my $pager = $models->paginated; # my $paginate_spec = $controller->get_paginate_spec; - my %paginate_params = $params{models}->get_paginate_args; + my %paginate_params = $models->get_paginate_args; my %template_params = ( pages => \%paginate_params, @@ -477,7 +442,7 @@ sub paginate_controls { $url_params{ $pager->form_params->[0] } = delete $url_params{page}; $url_params{ $pager->form_params->[1] } = delete $url_params{per_page} if exists $url_params{per_page}; - return $params{models}->get_callback(%url_params); + return $models->get_callback(%url_params); }, %params, );