X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FTag.pm;h=4ed1d92bd98044bd90286f6ee81f3984a48323e6;hb=0e5e350124f7eec8f67109fe4777bc2dae6c0ea6;hp=e1a041d090d1d506f95bf41f8b74537b1fe69a16;hpb=b5f4fac196509681df791bc5e4ee3d8c7d2a4a41;p=kivitendo-erp.git diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm index e1a041d09..4ed1d92bd 100644 --- a/SL/Presenter/Tag.pm +++ b/SL/Presenter/Tag.pm @@ -3,11 +3,15 @@ package SL::Presenter::Tag; use strict; use SL::HTML::Restrict; - -use parent qw(Exporter); +use SL::Presenter::EscapedText qw(escape); use Exporter qw(import); -our @EXPORT = qw(html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag checkbox_tag stringify_attributes restricted_html); +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 +); +our %EXPORT_TAGS = (ALL => \@EXPORT_OK); use Carp; @@ -30,59 +34,64 @@ sub _id { } } +sub _J { + my $string = shift; + $string =~ s/(\"|\'|\\)/\\$1/g; + return $string; +} sub stringify_attributes { - my ($self, %params) = @_; + my (%params) = @_; my @result = (); while (my ($name, $value) = each %params) { next unless $name; next if $_valueless_attributes{$name} && !$value; $value = '' if !defined($value); - push @result, $_valueless_attributes{$name} ? $self->escape($name) : $self->escape($name) . '="' . $self->escape($value) . '"'; + push @result, $_valueless_attributes{$name} ? escape($name) : escape($name) . '="' . escape($value) . '"'; } return @result ? ' ' . join(' ', @result) : ''; } sub html_tag { - my ($self, $tag, $content, %params) = @_; - my $attributes = $self->stringify_attributes(%params); + my ($tag, $content, %params) = @_; + my $attributes = stringify_attributes(%params); return "<${tag}${attributes}>" unless defined($content); return "<${tag}${attributes}>${content}"; } sub input_tag { - my ($self, $name, $value, %attributes) = @_; + my ($name, $value, %attributes) = @_; _set_id_attribute(\%attributes, $name); $attributes{type} ||= 'text'; - return $self->html_tag('input', undef, %attributes, name => $name, value => $value); + html_tag('input', undef, %attributes, name => $name, value => $value); } sub hidden_tag { - my ($self, $name, $value, %attributes) = @_; - return $self->input_tag($name, $value, %attributes, type => 'hidden'); + my ($name, $value, %attributes) = @_; + input_tag($name, $value, %attributes, type => 'hidden'); } sub man_days_tag { - my ($self, $name, $object, %attributes) = @_; + my ($name, $object, %attributes) = @_; my $size = delete($attributes{size}) || 5; my $method = $name; $method =~ s/^.*\.//; - my $time_selection = $self->input_tag( "${name}_as_man_days_string", _call_on($object, "${method}_as_man_days_string"), %attributes, size => $size); - my $unit_selection = $self->select_tag("${name}_as_man_days_unit", [[ 'h', $::locale->text('h') ], [ 'man_day', $::locale->text('MD') ]], + my $time_selection = input_tag("${name}_as_man_days_string", _call_on($object, "${method}_as_man_days_string"), %attributes, size => $size); + my $unit_selection = select_tag("${name}_as_man_days_unit", [[ 'h', $::locale->text('h') ], [ 'man_day', $::locale->text('MD') ]], %attributes, default => _call_on($object, "${method}_as_man_days_unit")); return $time_selection . $unit_selection; } sub name_to_id { - my ($self, $name) = @_; + my ($name) = @_; $name =~ s/\[\+?\]/ _id() /ge; # give constructs with [] or [+] unique ids $name =~ s/[^\w_]/_/g; @@ -92,7 +101,7 @@ sub name_to_id { } sub select_tag { - my ($self, $name, $collection, %attributes) = @_; + my ($name, $collection, %attributes) = @_; _set_id_attribute(\%attributes, $name); @@ -175,11 +184,11 @@ sub select_tag { push(@options, [$value, $title, $selected{$value} || $default]); } - return join '', map { $self->html_tag('option', $self->escape($_->[1]), value => $_->[0], selected => $_->[2]) } @options; + return join '', map { html_tag('option', escape($_->[1]), value => $_->[0], selected => $_->[2]) } @options; }; my $code = ''; - $code .= $self->html_tag('option', $self->escape($empty_title || ''), value => '') if $with_empty; + $code .= html_tag('option', escape($empty_title || ''), value => '') if $with_empty; if (!$with_optgroups) { $code .= $list_to_code->($collection); @@ -187,15 +196,15 @@ sub select_tag { } else { $code .= join '', map { my ($optgroup_title, $sub_collection) = @{ $_ }; - $self->html_tag('optgroup', $list_to_code->($sub_collection), label => $optgroup_title) + html_tag('optgroup', $list_to_code->($sub_collection), label => $optgroup_title) } @{ $collection }; } - return $self->html_tag('select', $code, %attributes, name => $name); + html_tag('select', $code, %attributes, name => $name); } sub checkbox_tag { - my ($self, $name, %attributes) = @_; + my ($name, %attributes) = @_; _set_id_attribute(\%attributes, $name); @@ -211,39 +220,101 @@ sub checkbox_tag { } 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; + $code .= hidden_tag($name, 0, %attributes, id => $attributes{id} . '_hidden') if $for_submit; + $code .= html_tag('input', undef, %attributes, name => $name, type => 'checkbox'); + $code .= html_tag('label', $label, for => $attributes{id}) if $label; + $code .= javascript(qq|\$('#$attributes{id}').checkall('$checkall');|) if $checkall; return $code; } +sub button_tag { + my ($onclick, $value, %attributes) = @_; + + _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}; + + html_tag('input', undef, %attributes, value => $value, onclick => $onclick); +} + +sub submit_tag { + my ($name, $value, %attributes) = @_; + + _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name}; + + if ( $attributes{confirm} ) { + $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");'; + } + + input_tag($name, $value, %attributes, type => 'submit', class => 'submit'); +} + +sub ajax_submit_tag { + my ($url, $form_selector, $text, %attributes) = @_; + + $url = _J($url); + $form_selector = _J($form_selector); + my $onclick = qq|kivi.submit_ajax_form('${url}', '${form_selector}')|; + + button_tag($onclick, $text, %attributes); +} + +sub input_number_tag { + my ($name, $value, %params) = @_; + + _set_id_attribute(\%params, $name); + my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : (); + my @classes = ('numeric'); + 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}); + + input_tag( + $name, $::form->foramt_amount(\%::myconfig, $value), + "data-validate" => "number", + %params, + %class, @onchange, + ); +} + + sub javascript { - my ($self, $data) = @_; - return $self->html_tag('script', $data, type => 'text/javascript'); + my ($data) = @_; + html_tag('script', $data, type => 'text/javascript'); } sub _set_id_attribute { my ($attributes, $name, $unique) = @_; if (!delete($attributes->{no_id}) && !$attributes->{id}) { - $attributes->{id} = name_to_id(undef, $name); + $attributes->{id} = name_to_id($name); $attributes->{id} .= '_' . $attributes->{value} if $unique; } - return %{ $attributes }; + %{ $attributes }; } my $html_restricter; sub restricted_html { - my ($self, $value) = @_; + my ($value) = @_; $html_restricter ||= SL::HTML::Restrict->create; return $html_restricter->process($value); } +sub link { + my ($href, $content, %params) = @_; + + $href ||= '#'; + + html_tag('a', $content, %params, href => $href); +} + 1; __END__ @@ -329,6 +400,36 @@ Creates a HTML 'input type=text' 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 two HTML inputs: a text input for entering a number and a drop @@ -349,6 +450,26 @@ makes it possible to write statements like e.g. The attribute C can be used to set the text input's size. It defaults to 5. +=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=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