X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FTemplate%2FPlugin%2FL.pm;h=7916b782a8e1846cb0945c44bf296cf75c7e057f;hb=b7afa934d4ce656536645a97253e4d7ec27e380c;hp=b78ebb01543715b4ef34e87353efb1e0c7b1e09d;hpb=7328cbd6ab400a613f6c160beffbdb3abb44c8ad;p=kivitendo-erp.git
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index b78ebb015..7916b782a 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -2,8 +2,15 @@ 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::Presenter::ALL;
+use SL::Presenter::Simple;
+use SL::Util qw(_hashify);
use strict;
@@ -12,7 +19,7 @@ use strict;
# Do not use these id's to store information across requests.
my $_id_sequence = int rand 1e7;
sub _tag_id {
- return $_id_sequence = ($_id_sequence + 1) % 1e7;
+ return "id_" . ( $_id_sequence = ($_id_sequence + 1) % 1e7 );
}
}
@@ -22,15 +29,11 @@ sub _H {
}
sub _J {
- my $string = "" . shift;
- $string =~ s/\"/\\\"/g;
+ my $string = shift;
+ $string =~ s/(\"|\'|\\)/\\$1/g;
return $string;
}
-sub _hashify {
- return (@_ && (ref($_[0]) eq 'HASH')) ? %{ $_[0] } : @_;
-}
-
sub new {
my ($class, $context, @args) = @_;
@@ -44,89 +47,65 @@ sub _context {
return $_[0]->{CONTEXT};
}
-sub name_to_id {
- my $self = shift;
- my $name = shift;
+sub _call_presenter {
+ my ($method, $self, @args) = @_;
- $name =~ s/[^\w_]/_/g;
- $name =~ s/_+/_/g;
+ my $presenter = $::request->presenter;
- return $name;
-}
+ splice @args, -1, 1, %{ $args[-1] } if @args && (ref($args[-1]) eq 'HASH');
-sub attributes {
- my ($self, @slurp) = @_;
- my %options = _hashify(@slurp);
+ if (my $sub = SL::Presenter::Simple->can($method)) {
+ return $sub->(@args);
+ }
- my @result = ();
- while (my ($name, $value) = each %options) {
- next unless $name;
- next if $name eq 'disabled' && !$value;
- $value = '' if !defined($value);
- push @result, _H($name) . '="' . _H($value) . '"';
+ if ($presenter->can($method)) {
+ return $presenter->$method(@args);
}
- return @result ? ' ' . join(' ', @result) : '';
+ $::lxdebug->message(LXDebug::WARN(), "SL::Presenter has no method named '$method'!");
+ return;
}
-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 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 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', @_); }
- return "<${tag}${attributes}/>" unless defined($content);
- return "<${tag}${attributes}>${content}${tag}>";
+sub _set_id_attribute {
+ my ($attributes, $name, $unique) = @_;
+ SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique);
}
-sub select_tag {
- my $self = shift;
- my $name = shift;
- my $options_str = shift;
- my %attributes = _hashify(@_);
+sub img_tag {
+ my ($self, %options) = _hashify(1, @_);
- $attributes{id} ||= $self->name_to_id($name);
- $options_str = $self->options_for_select($options_str) if ref $options_str;
+ $options{alt} ||= '';
- return $self->html_tag('select', $options_str, %attributes, name => $name);
+ return $self->html_tag('img', undef, %options);
}
-sub textarea_tag {
- my ($self, $name, $content, @slurp) = @_;
- my %attributes = _hashify(@slurp);
-
- $attributes{id} ||= $self->name_to_id($name);
- $content = $content ? _H($content) : '';
-
- return $self->html_tag('textarea', $content, %attributes, name => $name);
-}
+sub radio_button_tag {
+ my ($self, $name, %attributes) = _hashify(2, @_);
-sub checkbox_tag {
- my ($self, $name, @slurp) = @_;
- my %attributes = _hashify(@slurp);
+ $attributes{value} = 1 unless exists $attributes{value};
- $attributes{id} ||= $self->name_to_id($name);
- $attributes{value} = 1 unless defined $attributes{value};
+ _set_id_attribute(\%attributes, $name, 1);
my $label = delete $attributes{label};
- 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;
-
- return $code;
-}
-
-sub radio_button_tag {
- my $self = shift;
- my $name = shift;
- my %attributes = _hashify(@_);
-
- $attributes{value} = 1 unless defined $attributes{value};
- $attributes{id} ||= $self->name_to_id($name . "_" . $attributes{value});
- my $label = delete $attributes{label};
+ _set_id_attribute(\%attributes, $name . '_' . $attributes{value});
if ($attributes{checked}) {
$attributes{checked} = 'checked';
@@ -140,25 +119,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 {
- return shift->input_tag(@_, 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);
@@ -169,79 +129,10 @@ sub li_tag {
return $self->html_tag('li', $content, @slurp);
}
-sub link {
- my ($self, $href, $content, @slurp) = @_;
- my %params = _hashify(@slurp);
+sub yes_no_tag {
+ my ($self, $name, $value, %attributes) = _hashify(3, @_);
- $href ||= '#';
-
- return $self->html_tag('a', $content, %params, href => $href);
-}
-
-sub submit_tag {
- my ($self, $name, $value, @slurp) = @_;
- my %attributes = _hashify(@slurp);
-
- $attributes{onclick} = "if (confirm('" . delete($attributes{confirm}) . "')) return true; else return false;" if $attributes{confirm};
-
- return $self->input_tag($name, $value, %attributes, type => 'submit', class => 'submit');
-}
-
-sub button_tag {
- my ($self, $onclick, $value, @slurp) = @_;
- my %attributes = _hashify(@slurp);
-
- return $self->input_tag(undef, $value, %attributes, type => 'button', onclick => $onclick);
-}
-
-sub options_for_select {
- my $self = shift;
- my $collection = shift;
- my %options = _hashify(@_);
-
- my $value_key = $options{value} || 'id';
- my $title_key = $options{title} || $value_key;
-
- my $value_sub = $options{value_sub};
- my $title_sub = $options{title_sub};
-
- my $value_title_sub = $options{value_title_sub};
-
- my %selected = map { ( $_ => 1 ) } @{ ref($options{default}) eq 'ARRAY' ? $options{default} : defined($options{default}) ? [ $options{default} ] : [] };
-
- my $access = sub {
- my ($element, $index, $key, $sub) = @_;
- my $ref = ref $element;
- return $sub ? $sub->($element)
- : !$ref ? $element
- : $ref eq 'ARRAY' ? $element->[$index]
- : $ref eq 'HASH' ? $element->{$key}
- : $element->$key;
- };
-
- my @elements = ();
- push @elements, [ undef, $options{empty_title} || '' ] if $options{with_empty};
- push @elements, map [
- $value_title_sub ? $value_title_sub->($_) : (
- $access->($_, 0, $value_key, $value_sub),
- $access->($_, 1, $title_key, $title_sub),
- )
- ], @{ $collection } if $collection && ref $collection eq 'ARRAY';
-
- my $code = '';
- foreach my $result (@elements) {
- my %attributes = ( value => $result->[0] );
- $attributes{selected} = 'selected' if $selected{ defined($result->[0]) ? $result->[0] : '' };
-
- $code .= $self->html_tag('option', _H($result->[1]), %attributes);
- }
-
- return $code;
-}
-
-sub javascript {
- my ($self, $data) = @_;
- return $self->html_tag('script', $data, type => 'text/javascript');
+ return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes);
}
sub stylesheet_tag {
@@ -258,37 +149,37 @@ sub stylesheet_tag {
return $code;
}
-sub date_tag {
- my ($self, $name, $value, @slurp) = @_;
- my %params = _hashify(@slurp);
- my $name_e = _H($name);
- my $seq = _tag_id();
- my $datefmt = apply {
- s/d+/\%d/gi;
- s/m+/\%m/gi;
- s/y+/\%Y/gi;
- } $::myconfig{"dateformat"};
-
- $params{cal_align} ||= 'BR';
-
- $self->input_tag($name, $value,
- id => $name_e,
- size => 11,
- title => _H($::myconfig{dateformat}),
- onBlur => 'check_right_date_format(this)',
- %params,
- ) . ((!$params{no_cal}) ?
- $self->html_tag('img', undef,
- src => 'image/calendar.png',
- id => "trigger$seq",
- title => _H($::myconfig{dateformat}),
- %params,
- ) .
- $self->javascript(
- "Calendar.setup({ inputField: '$name_e', ifFormat: '$datefmt', align: '$params{cal_align}', button: 'trigger$seq' });"
- ) : '');
+
+# simple version with select_tag
+sub vendor_selector {
+ 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 : '';
+
+ return $self->select_tag($name, SL::DB::Manager::Vendor->get_all(),
+ default => $actual_vendor_id,
+ title_sub => sub { $_[0]->vendornumber . " : " . $_[0]->name },
+ 'with_empty' => 1,
+ %params);
+}
+
+
+# simple version with select_tag
+sub part_selector {
+ 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 : '';
+
+ return $self->select_tag($name, SL::DB::Manager::Part->get_all(),
+ default => $actual_part_id,
+ title_sub => sub { $_[0]->partnumber . " : " . $_[0]->description },
+ with_empty => 1,
+ %params);
}
+
sub javascript_tag {
my $self = shift;
my $code = '';
@@ -304,8 +195,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;
@@ -319,32 +209,19 @@ sub tabbed {
next if $tab eq '';
- my $selected = $params{selected} == $i;
- my $tab_id = "__tab_id_$i";
- push @header, $self->li_tag(
- $self->link('', $tab->{name}, rel => $tab_id),
- ($selected ? (class => 'selected') : ())
- );
- push @blocks, $self->div_tag($tab->{data},
- id => $tab_id, class => 'tabcontent');
+ my $tab_id = "__tab_id_$i";
+ push @header, $self->li_tag($self->link('#' . $tab_id, $tab->{name}));
+ push @blocks, $self->div_tag($tab->{data}, id => $tab_id);
}
return '' unless @header;
- return $self->ul_tag(
- join('', @header), id => $id, class => 'shadetabs'
- ) .
- $self->div_tag(
- join('', @blocks), class => 'tabcontentstyle'
- ) .
- $self->javascript(
- qq|var $id = new ddtabcontent("$id");$id.setpersist(true);| .
- qq|$id.setselectedClassTarget("link");$id.init();|
- );
+
+ my $ul = $self->ul_tag(join('', @header), id => $id);
+ return $self->div_tag(join('', $ul, @blocks), class => 'tabwidget');
}
sub tab {
- my ($self, $name, $src, @slurp) = @_;
- my %params = _hashify(@slurp);
+ my ($self, $name, $src, %params) = _hashify(3, @_);
$params{method} ||= 'process';
@@ -365,20 +242,26 @@ sub tab {
}
sub areainput_tag {
- my ($self, $name, $value, @slurp) = @_;
- my %attributes = _hashify(@slurp);
+ my ($self, $name, $value, %attributes) = _hashify(3, @_);
+
+ 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);
+
+ $attributes{id} ||= _tag_id();
+ my $id = $attributes{id};
- my $rows = delete $attributes{rows} || 1;
- my $min = delete $attributes{min_rows} || 1;
+ return $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) if $rows > 1;
- return $rows > 1
- ? $self->textarea_tag($name, $value, %attributes, rows => max $rows, $min)
- : $self->input_tag($name, $value, %attributes);
+ return ''
+ . $self->input_tag($name, $value, %attributes, size => $cols)
+ . ""
+ . '';
}
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')) . "\"";
@@ -397,8 +280,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' );
@@ -417,8 +299,14 @@ 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})| : '';
+ my $ajax_return = '';
+ if ($params{ajax_return}) {
+ $ajax_return = 'kivi.eval_json_result';
+ }
+
$stop_event = <text('Help');
-
- die 'malformed help tag' unless $tag =~ /^[a-zA-Z0-9_]+$/;
- return unless -f $file;
- return $self->html_tag('a', $text, href => $file, target => '_blank');
-}
-
sub dump {
my $self = shift;
- require Data::Dumper;
return '
' . Data::Dumper::Dumper(@_) . '
';
}
+sub sortable_table_header {
+ my ($self, $by, %params) = _hashify(2, @_);
+
+ my $controller = $self->{CONTEXT}->stash->get('SELF');
+ 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 = $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{sort_by} eq $by) {
+ my $current_dir = $current_sort_params{sort_dir} ? 'up' : 'down';
+ $image = '';
+ $new_dir = 1 - ($current_sort_params{sort_dir} || 0);
+ }
+
+ $params{ $models->sorted->form_params->[0] } = $by;
+ $params{ $models->sorted->form_params->[1] } = ($new_dir ? '1' : '0');
+
+ return '' . _H($title) . $image . '';
+}
+
+sub paginate_controls {
+ my ($self, %params) = _hashify(1, @_);
+
+ my $controller = $self->{CONTEXT}->stash->get('SELF');
+ my $models = $params{models} || $self->{CONTEXT}->stash->get('MODELS');
+ my $pager = $models->paginated;
+# my $paginate_spec = $controller->get_paginate_spec;
+
+ my %paginate_params = $models->get_paginate_args;
+
+ my %template_params = (
+ pages => \%paginate_params,
+ url_maker => sub {
+ my %url_params = _hashify(0, @_);
+ $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 $models->get_callback(%url_params);
+ },
+ %params,
+ );
+
+ return SL::Presenter->get->render('common/paginate', %template_params);
+}
+
1;
__END__
@@ -486,81 +409,69 @@ Usage from a template:
[% USE L %]
- [% L.select_tag('direction', [ [ 'left', 'To the left' ], [ 'right', 'To the right' ] ]) %]
+ [% L.select_tag('direction', [ [ 'left', 'To the left' ], [ 'right', 'To the right', 1 ] ]) %]
+
+ [% L.select_tag('direction', [ { direction => 'left', display => 'To the left' },
+ { direction => 'right', display => 'To the right' } ],
+ value_key => 'direction', title_key => 'display', default => 'right')) %]
- [% L.select_tag('direction', L.options_for_select([ { direction => 'left', display => 'To the left' },
- { direction => 'right', display => 'To the right' } ],
- value => 'direction', title => 'display', default => 'right')) %]
+ [% L.select_tag('direction', [ { direction => 'left', display => 'To the left' },
+ { direction => 'right', display => 'To the right', selected => 1 } ],
+ value_key => 'direction', title_key => 'display')) %]
=head1 DESCRIPTION
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
+The following items are just forwarded to L:
-=item C
-
-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
+The following functions are just forwarded to L:
-=item C
+=over 2
-Creates a HTML 'select' tag named C<$name> with the contents
-C<$options_string> and with arbitrary HTML attributes from
-C<%attributes>. The tag's C defaults to C.
+=item * C
-The C<$options_string> is usually created by the
-L function. If C<$options_string> is an array
-reference then it will be passed to L
-automatically.
+=item * C
-=item C
+=item * C
-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
-=item C
+=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.
+=back
-=item C
+Available high-level functions implemented in this module:
-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.
+=over 4
-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}>. If request is only submitted if the user
-clicks the dialog's ok/yes button.
+=item C
+
+Creates a HTML 'select' tag with the two entries C and C by
+calling L. C<$value> determines
+which entry is selected. The C<%attributes> are passed through to
+L.
=item C
@@ -568,23 +479,10 @@ 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