X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/da2fecb453416b3731a896ab6d35e9992be3d9eb..82053b457be3de2ee5285dc13633222f4d30802c:/SL/Template/Plugin/L.pm diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 6db220296..3e157a366 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -2,11 +2,13 @@ package SL::Template::Plugin::L; use base qw( Template::Plugin ); use Template::Plugin; +use Data::Dumper; use List::MoreUtils qw(apply); use List::Util qw(max); use Scalar::Util qw(blessed); use SL::Presenter; +use SL::Util qw(_hashify); use strict; @@ -30,10 +32,6 @@ sub _J { return $string; } -sub _hashify { - return (@_ && (ref($_[0]) eq 'HASH')) ? %{ $_[0] } : @_; -} - sub new { my ($class, $context, @args) = @_; @@ -75,8 +73,7 @@ sub _set_id_attribute { } sub img_tag { - my ($self, @slurp) = @_; - my %options = _hashify(@slurp); + my ($self, %options) = _hashify(1, @_); $options{alt} ||= ''; @@ -84,8 +81,7 @@ sub img_tag { } sub textarea_tag { - my ($self, $name, $content, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, $content, %attributes) = _hashify(3, @_); _set_id_attribute(\%attributes, $name); $attributes{rows} *= 1; # required by standard @@ -96,8 +92,7 @@ sub textarea_tag { } sub checkbox_tag { - my ($self, $name, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, %attributes) = _hashify(2, @_); _set_id_attribute(\%attributes, $name); $attributes{value} = 1 unless defined $attributes{value}; @@ -118,12 +113,10 @@ sub checkbox_tag { } sub radio_button_tag { - my $self = shift; - my $name = shift; - my %attributes = _hashify(@_); + my ($self, $name, %attributes) = _hashify(2, @_); _set_id_attribute(\%attributes, $name); - $attributes{value} = 1 unless defined $attributes{value}; + $attributes{value} = 1 unless exists $attributes{value}; my $label = delete $attributes{label}; if ($attributes{checked}) { @@ -139,8 +132,8 @@ sub radio_button_tag { } sub hidden_tag { - my ($self, $name, $value, @slurp) = @_; - return $self->input_tag($name, $value, _hashify(@slurp), type => 'hidden'); + my ($self, $name, $value, %attributes) = _hashify(3, @_); + return $self->input_tag($name, $value, %attributes, type => 'hidden'); } sub div_tag { @@ -159,8 +152,7 @@ sub li_tag { } sub link { - my ($self, $href, $content, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $href, $content, %params) = _hashify(3, @_); $href ||= '#'; @@ -168,8 +160,7 @@ sub link { } sub submit_tag { - my ($self, $name, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, $value, %attributes) = _hashify(3, @_); if ( $attributes{confirm} ) { $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");'; @@ -179,8 +170,7 @@ sub submit_tag { } sub button_tag { - my ($self, $onclick, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $onclick, $value, %attributes) = _hashify(3, @_); _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name}; $attributes{type} ||= 'button'; @@ -195,14 +185,13 @@ sub ajax_submit_tag { $url = _J($url); $form_selector = _J($form_selector); - my $onclick = qq|submit_ajax_form('${url}', '${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) = splice @_, 0, 3; - my %attributes = _hashify(@_); + 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); } @@ -228,9 +217,8 @@ sub stylesheet_tag { my $date_tag_id_idx = 0; sub date_tag { - my ($self, $name, $value, @slurp) = @_; + my ($self, $name, $value, %params) = _hashify(3, @_); - my %params = _hashify(@slurp); _set_id_attribute(\%params, $name); my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : (); my @class = $params{no_cal} || $params{readonly} ? () : (class => 'datepicker'); @@ -299,8 +287,7 @@ sub javascript_tag { } sub tabbed { - my ($self, $tabs, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $tabs, %params) = _hashify(2, @_); my $id = $params{id} || 'tab_' . _tag_id(); $params{selected} *= 1; @@ -326,8 +313,7 @@ sub tabbed { } sub tab { - my ($self, $name, $src, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $name, $src, %params) = _hashify(3, @_); $params{method} ||= 'process'; @@ -348,8 +334,7 @@ sub tab { } sub areainput_tag { - my ($self, $name, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, $value, %attributes) = _hashify(3, @_); my ($rows, $cols); my $min = delete $attributes{min_rows} || 1; @@ -367,8 +352,7 @@ sub areainput_tag { } sub multiselect2side { - my ($self, $id, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $id, %params) = _hashify(2, @_); $params{labelsx} = "\"" . _J($params{labelsx} || $::locale->text('Available')) . "\""; $params{labeldx} = "\"" . _J($params{labeldx} || $::locale->text('Selected')) . "\""; @@ -387,8 +371,7 @@ EOCODE } sub sortable_element { - my ($self, $selector, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $selector, %params) = _hashify(2, @_); my %attributes = ( distance => 5, helper => <<'JAVASCRIPT' ); @@ -407,8 +390,10 @@ JAVASCRIPT my $filter = ".filter(function(idx) { return this.substr(0, " . length($params{with}) . ") == '$params{with}'; })"; $filter .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })"; + my $params_js = $params{params} ? qq| + ($params{params})| : ''; + $stop_event = <text('Help'); @@ -458,13 +442,11 @@ sub online_help_tag { sub dump { my $self = shift; - require Data::Dumper; return '
' . Data::Dumper::Dumper(@_) . '
'; } sub sortable_table_header { - my ($self, $by, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $by, %params) = _hashify(2, @_); my $controller = $self->{CONTEXT}->stash->get('SELF'); my $sort_spec = $controller->get_sort_spec; @@ -495,7 +477,7 @@ sub paginate_controls { my %template_params = ( pages => \%paginate_params, url_maker => sub { - my %url_params = _hashify(@_); + my %url_params = _hashify(0, @_); $url_params{ $paginate_spec->{FORM_PARAMS}->[0] } = delete $url_params{page}; $url_params{ $paginate_spec->{FORM_PARAMS}->[1] } = delete $url_params{per_page} if exists $url_params{per_page}; @@ -600,8 +582,8 @@ clicks the dialog's ok/yes button. 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>. +called for that is C in +C). The button's label will be C<$text>. =item C @@ -753,6 +735,11 @@ If trueish then the children will not be recolored. The default is to recolor the children by setting the class C on odd and C on even entries. +=item C + +An optional JavaScript string that is evaluated before sending the +POST request. The result must be a string that is appended to the URL. + =back Example: