X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=6db220296b9a318e9e068525f9c84ee9351343a4;hb=1b9d0f70b5e58c510ed2ab4337eb0f6512d779ca;hp=8de38ab1708893dc4a1b851141a0cd414af1b118;hpb=072c82159a805189a5c6e39c6e5fb35f91cc01d0;p=kivitendo-erp.git
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index 8de38ab17..6db220296 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -19,11 +19,6 @@ sub _tag_id {
}
}
-my %_valueless_attributes = map { $_ => 1 } qw(
- checked compact declare defer disabled ismap multiple noresize noshade nowrap
- readonly selected
-);
-
sub _H {
my $string = shift;
return $::locale->quote_special_chars('HTML', $string);
@@ -53,48 +48,30 @@ sub _context {
}
sub _call_presenter {
- my ($method, @args) = @_;
+ my ($method, $self, @args) = @_;
- my $presenter = $::request->presenter;
+ my $presenter = $::request->presenter;
- return '' unless $presenter->can($method);
+ 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');
$presenter->$method(@args);
}
-sub name_to_id {
- my $self = shift;
- my $name = shift;
-
- $name =~ s/[^\w_]/_/g;
- $name =~ s/_+/_/g;
-
- return $name;
-}
-
-sub attributes {
- my ($self, @slurp) = @_;
- my %options = _hashify(@slurp);
-
- my @result = ();
- while (my ($name, $value) = each %options) {
- next unless $name;
- next if $_valueless_attributes{$name} && !$value;
- $value = '' if !defined($value);
- push @result, $_valueless_attributes{$name} ? _H($name) : _H($name) . '="' . _H($value) . '"';
- }
-
- return @result ? ' ' . join(' ', @result) : '';
-}
-
-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}";
+sub _set_id_attribute {
+ my ($attributes, $name) = @_;
+ SL::Presenter::Tag::_set_id_attribute($attributes, $name);
}
sub img_tag {
@@ -106,116 +83,11 @@ sub img_tag {
return $self->html_tag('img', undef, %options);
}
-sub select_tag {
- my $self = shift;
- my $name = shift;
- my $collection = shift;
- my %attributes = _hashify(@_);
-
- $attributes{id} ||= $self->name_to_id($name);
-
- my $value_key = delete($attributes{value_key}) || 'id';
- my $title_key = delete($attributes{title_key}) || $value_key;
- my $default_key = delete($attributes{default_key}) || 'selected';
-
-
- my $value_title_sub = delete($attributes{value_title_sub});
-
- my $value_sub = delete($attributes{value_sub});
- my $title_sub = delete($attributes{title_sub});
- my $default_sub = delete($attributes{default_sub});
-
- my $with_empty = delete($attributes{with_empty});
- my $empty_title = delete($attributes{empty_title});
-
- my $with_optgroups = delete($attributes{with_optgroups});
-
- my %selected;
-
- if ( ref($attributes{default}) eq 'ARRAY' ) {
-
- foreach my $entry (@{$attributes{default}}) {
- $selected{$entry} = 1;
- }
- } elsif ( defined($attributes{default}) ) {
- $selected{$attributes{default}} = 1;
- }
-
- delete($attributes{default});
-
-
- my @all_options;
- push @all_options, [undef, $empty_title || ''] if $with_empty;
-
- my $normalize_entry = sub {
- my ($type, $entry, $sub, $key) = @_;
-
- return $sub->($entry) if $sub;
-
- my $ref = ref($entry);
-
- if ( !$ref ) {
- return $entry if $type eq 'value' || $type eq 'title';
- return 0;
- }
-
- if ( $ref eq 'ARRAY' ) {
- return $entry->[ $type eq 'value' ? 0 : $type eq 'title' ? 1 : 2 ];
- }
-
- return $entry->{$key} if $ref eq 'HASH';
- return $entry->$key if $type ne 'default' || $entry->can($key);
- return undef;
- };
-
- my $list_to_code = sub {
- my ($sub_collection) = @_;
-
- my @options;
- foreach my $entry ( @{ $sub_collection } ) {
- my $value;
- my $title;
-
- if ( $value_title_sub ) {
- ($value, $title) = @{ $value_title_sub->($entry) };
- } else {
-
- $value = $normalize_entry->('value', $entry, $value_sub, $value_key);
- $title = $normalize_entry->('title', $entry, $title_sub, $title_key);
- }
-
- my $default = $normalize_entry->('default', $entry, $default_sub, $default_key);
-
- push(@options, [$value, $title, $default]);
- }
-
- foreach my $entry (@options) {
- $entry->[2] = 1 if $selected{$entry->[0]};
- }
-
- return join '', map { $self->html_tag('option', _H($_->[1]), value => $_->[0], selected => $_->[2]) } @options;
- };
-
- my $code;
-
- if (!$with_optgroups) {
- $code = $list_to_code->($collection);
-
- } else {
- $code = join '', map {
- my ($optgroup_title, $sub_collection) = @{ $_ };
- $self->html_tag('optgroup', $list_to_code->($sub_collection), label => $optgroup_title)
- } @{ $collection };
- }
-
- return $self->html_tag('select', $code, %attributes, name => $name);
-}
-
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) : '';
@@ -227,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};
@@ -250,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}) {
@@ -266,16 +138,6 @@ 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 {
my ($self, $name, $value, @slurp) = @_;
return $self->input_tag($name, $value, _hashify(@slurp), type => 'hidden');
@@ -320,12 +182,24 @@ sub button_tag {
my ($self, $onclick, $value, @slurp) = @_;
my %attributes = _hashify(@slurp);
- $attributes{id} ||= $self->name_to_id($attributes{name}) if $attributes{name};
+ _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|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(@_);
@@ -357,13 +231,12 @@ sub date_tag {
my ($self, $name, $value, @slurp) = @_;
my %params = _hashify(@slurp);
- my $id = $self->name_to_id($name) . _tag_id();
+ _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,
- id => $id,
size => 11,
onblur => "check_right_date_format(this);",
%params,
@@ -589,11 +462,6 @@ sub dump {
return '
' . Data::Dumper::Dumper(@_) . '
';
}
-sub truncate {
- my $self = shift;
- return _call_presenter('truncate', @_);
-}
-
sub sortable_table_header {
my ($self, $by, @slurp) = @_;
my %params = _hashify(@slurp);
@@ -638,11 +506,6 @@ sub paginate_controls {
return SL::Presenter->get->render('common/paginate', %template_params);
}
-sub simple_format {
- my $self = shift;
- return _call_presenter('simple_format', @_);
-}
-
1;
__END__
@@ -672,118 +535,42 @@ Usage from a template:
A module modeled a bit after Rails' ActionView helpers. Several small
functions that create HTML tags from various kinds of data sources.
+The C attribute is usually calculated automatically. This can be
+overridden by either specifying an C attribute or by setting
+C to trueish.
+
=head1 FUNCTIONS
=head2 LOW-LEVEL FUNCTIONS
-=over 4
-
-=item C
+The following items are just forwarded to L:
-Converts a name to a HTML id by replacing various characters.
-
-=item C
-
-Creates a string from all elements in C<%items> suitable for usage as
-HTML tag attributes. Keys and values are HTML escaped even though keys
-must not contain non-ASCII characters for browsers to accept them.
+=over 2
-=item C
+=item * C
-Creates an opening and closing HTML tag for C<$tag_name> and puts
-C<$content_string> between the two. If C<$content_string> is undefined
-or empty then only a Etag/E tag will be created. Attributes
-are key/value pairs added to the opening tag.
+=item * C
-C<$content_string> is not HTML escaped.
+=item * C
=back
=head2 HIGH-LEVEL FUNCTIONS
-=over 4
-
-=item C
-
-Creates a HTML 'select' tag named C<$name> with the contents of one
-'EoptionE' tag for each element in C<\@collection> and with arbitrary
-HTML attributes from C<%attributes>. The value
-to use and the title to display are extracted from the elements in
-C<\@collection>. Each element can be one of four things:
+The following functions are just forwarded to L:
-=over 12
-
-=item 1. An array reference with at least two elements. The first element is
-the value, the second element is its title. The third element is optional and and should contain a boolean.
-If it is true, than the element will be used as default.
-
-=item 2. A scalar. The scalar is both the value and the title.
+=over 2
-=item 3. A hash reference. In this case C<%attributes> must contain
-I, I and may contain I keys that name the keys in the element to use
-for the value, title and default respectively.
+=item * C
-=item 4. A blessed reference. In this case C<%attributes> must contain
-I, I and may contain I keys that name functions called on the blessed
-reference whose return values are used as the value, title and default
-respectively.
+=item * C
=back
-For cases 3 and 4 C<$attributes{value_key}> defaults to C,
-C<$attributes{title_key}> defaults to C<$attributes{value_key}>
-and C<$attributes{default_key}> defaults to C.
-
-In addition to pure keys/method you can also provide coderefs as I
-and/or I and/or I. If present, these take precedence over keys or methods,
-and are called with the element as first argument. It must return the value, title or default.
-
-Lastly a joint coderef I may be provided, which in turn takes
-precedence over the C and C subs. It will only be called once for each
-element and must return a list of value and title.
-
-If the option C is set then an empty element (value
-C) will be used as the first element. The title to display for
-this element can be set with the option C and defaults to
-an empty string.
-
-The option C can be either a scalar or an array reference
-containing the values of the options which should be set to be
-selected.
-
-The tag's C defaults to C.
-
-If the option C is set then this function expects
-C<\@collection> to be one level deeper. The upper-most level is
-translated into a HTML C