X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FTemplate%2FPlugin%2FL.pm;fp=SL%2FTemplate%2FPlugin%2FL.pm;h=abb6046936e536139b641f65976acd10b994405b;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=48960097ab0f15cfcd2b31f637c9c794b08e35f8;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 48960097a..abb604693 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -8,6 +8,8 @@ use List::Util qw(max); use Scalar::Util qw(blessed); use SL::Presenter; +use SL::Presenter::ALL; +use SL::Presenter::Simple; use SL::Util qw(_hashify); use strict; @@ -50,107 +52,47 @@ sub _call_presenter { my $presenter = $::request->presenter; - if (!$presenter->can($method)) { - $::lxdebug->message(LXDebug::WARN(), "SL::Presenter has no method named '$method'!"); - return ''; + splice @args, -1, 1, %{ $args[-1] } if @args && (ref($args[-1]) eq 'HASH'); + + if (my $sub = SL::Presenter::Simple->can($method)) { + return $sub->(@args); } - splice @args, -1, 1, %{ $args[-1] } if @args && (ref($args[-1]) eq 'HASH'); + if ($presenter->can($method)) { + return $presenter->$method(@args); + } - $presenter->$method(@args); + $::lxdebug->message(LXDebug::WARN(), "SL::Presenter has no method named '$method'!"); + return; } 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 button_tag { return _call_presenter('button_tag', @_); } +sub submit_tag { return _call_presenter('submit_tag', @_); } +sub ajax_submit_tag { return _call_presenter('ajax_submit_tag', @_); } +sub link { return _call_presenter('link_tag', @_); } +sub input_number_tag { return _call_presenter('input_number_tag', @_); } +sub textarea_tag { return _call_presenter('textarea_tag', @_); } +sub date_tag { return _call_presenter('date_tag', @_); } +sub div_tag { return _call_presenter('div_tag', @_); } +sub radio_button_tag { return _call_presenter('radio_button_tag', @_); } +sub img_tag { return _call_presenter('img_tag', @_); } +sub restricted_html { return _call_presenter('restricted_html', @_); } +sub stripped_html { return _call_presenter('stripped_html', @_); } sub _set_id_attribute { my ($attributes, $name, $unique) = @_; SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique); } -sub img_tag { - my ($self, %options) = _hashify(1, @_); - - $options{alt} ||= ''; - - return $self->html_tag('img', undef, %options); -} - -sub textarea_tag { - my ($self, $name, $content, %attributes) = _hashify(3, @_); - - _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); -} - -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}; - my $for_submit = delete $attributes{for_submit}; - - if ($attributes{checked}) { - $attributes{checked} = 'checked'; - } else { - delete $attributes{checked}; - } - - my $code = ''; - $code .= $self->hidden_tag($name, 0, %attributes, id => $attributes{id} . '_hidden') if $for_submit; - $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, @_); - - $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 { - delete $attributes{checked}; - } - - my $code = $self->html_tag('input', undef, %attributes, name => $name, type => 'radio'); - $code .= $self->html_tag('label', $label, for => $attributes{id}) if $label; - - 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); -} - sub ul_tag { my ($self, $content, @slurp) = @_; return $self->html_tag('ul', $content, @slurp); @@ -161,56 +103,12 @@ sub li_tag { return $self->html_tag('li', $content, @slurp); } -sub link { - my ($self, $href, $content, %params) = _hashify(3, @_); - - $href ||= '#'; - - return $self->html_tag('a', $content, %params, href => $href); -} - -sub submit_tag { - my ($self, $name, $value, %attributes) = _hashify(3, @_); - - if ( $attributes{confirm} ) { - $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");'; - } - - return $self->input_tag($name, $value, %attributes, type => 'submit', class => 'submit'); -} - -sub button_tag { - my ($self, $onclick, $value, %attributes) = _hashify(3, @_); - - _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name}; - $attributes{type} ||= 'button'; - - $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm}; - - return $self->html_tag('input', undef, %attributes, value => $value, onclick => $onclick); -} - -sub ajax_submit_tag { - my ($self, $url, $form_selector, $text, @slurp) = @_; - - $url = _J($url); - $form_selector = _J($form_selector); - my $onclick = qq|kivi.submit_ajax_form('${url}', '${form_selector}')|; - - return $self->button_tag($onclick, $text, @slurp); -} - sub yes_no_tag { my ($self, $name, $value, %attributes) = _hashify(3, @_); 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 = ''; @@ -225,26 +123,6 @@ sub stylesheet_tag { return $code; } -my $date_tag_id_idx = 0; -sub date_tag { - my ($self, $name, $value, %params) = _hashify(3, @_); - - _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->presenter->need_reinit_widgets($params{id}); - - return $self->input_tag( - $name, blessed($value) ? $value->to_lxoffice : $value, - size => 11, - onblur => "check_right_date_format(this);", - %params, - %class, @onchange, - ); -} # simple version with select_tag sub vendor_selector { @@ -345,9 +223,15 @@ sub areainput_tag { my $maxrows = delete $attributes{max_rows}; my $rows = $::form->numtextrows($value, $cols, $maxrows, $minrows); - return $rows > 1 - ? $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) - : $self->input_tag($name, $value, %attributes, size => $cols); + $attributes{id} ||= _tag_id(); + my $id = $attributes{id}; + + return $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) if $rows > 1; + + return '' + . $self->input_tag($name, $value, %attributes, size => $cols) + . "" + . ''; } sub multiselect2side { @@ -390,9 +274,13 @@ JAVASCRIPT $filter .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })"; my $params_js = $params{params} ? qq| + ($params{params})| : ''; + my $ajax_return = ''; + if ($params{ajax_return}) { + $ajax_return = 'kivi.eval_json_result'; + } $stop_event = <: =item * C +=item * C + +=item * C + =item * C +=item * C + =back Available high-level functions implemented in this module: @@ -553,77 +447,17 @@ calling L. C<$value> determines which entry is selected. The C<%attributes> are passed through to L. -=item C - -Creates a HTML 'input type=hidden' tag named C<$name> with the value -C<$value> and with arbitrary HTML attributes from C<%attributes>. The -tag's C defaults to C. - -=item C - -Creates a HTML 'input type=submit class=submit' tag named C<$name> with the -value C<$value> and with arbitrary HTML attributes from C<%attributes>. The -tag's C defaults to C. - -If C<$attributes{confirm}> is set then a JavaScript popup dialog will -be added via the C handler asking the question given with -C<$attributes{confirm}>. The request is only submitted if the user -clicks the dialog's ok/yes button. - -=item C - -Creates a HTML 'input type="button"' tag with a very specific onclick -handler that submits the form given by the jQuery selector -C<$form_selector> to the URL C<$url> (the actual JavaScript function -called for that is C in -C). The button's label will be C<$text>. - -=item C - -Creates a HTML 'input type="button"' tag with an onclick handler -C<$onclick> and a value of C<$text>. The button does not have a name -nor an ID by default. - -If C<$attributes{confirm}> is set then a JavaScript popup dialog will -be prepended to the C<$onclick> handler asking the question given with -C<$attributes{confirm}>. The request is only submitted if the user -clicks the dialog's "ok/yes" button. - =item C Creates a HTML 'textarea' tag named C<$name> with the content C<$value> and with arbitrary HTML attributes from C<%attributes>. The tag's C defaults to C. -=item C - -Creates a HTML 'input type=checkbox' tag named C<$name> with arbitrary -HTML attributes from C<%attributes>. The tag's C defaults to -C. The tag's C defaults to C<1>. - -If C<%attributes> contains a key C