X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FTemplate%2FPlugin%2FL.pm;h=b38365bf314af2f16bc67547af76cb3e1556e23f;hb=0ebb8f829ac2d23b65e8d993c7d03aa0b172b637;hp=ff507d10792cd5c8510e363f03af6ecefb83ab85;hpb=43bcf835ebe883d3ba2e9bf23b7ca3d2bb215e9c;p=kivitendo-erp.git
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index ff507d107..b38365bf3 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,26 +52,40 @@ 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 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 _set_id_attribute {
- my ($attributes, $name) = @_;
- SL::Presenter::Tag::_set_id_attribute($attributes, $name);
+ my ($attributes, $name, $unique) = @_;
+ SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique);
}
sub img_tag {
@@ -80,45 +96,16 @@ sub img_tag {
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};
-
- 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;
- $code .= $self->javascript(qq|\$('#$attributes{id}').checkall('$checkall');|) if $checkall;
-
- return $code;
-}
-
sub radio_button_tag {
my ($self, $name, %attributes) = _hashify(2, @_);
- _set_id_attribute(\%attributes, $name);
$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 {
@@ -131,11 +118,6 @@ sub radio_button_tag {
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);
@@ -151,56 +133,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 = '';
@@ -215,36 +153,10 @@ 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 @class = $params{no_cal} || $params{readonly} ? () : (class => 'datepicker');
-
- return $self->input_tag(
- $name, blessed($value) ? $value->to_lxoffice : $value,
- size => 11,
- onblur => "check_right_date_format(this);",
- %params,
- @class, @onchange,
- );
-}
-
-sub customer_picker {
- my ($self, $name, $value, %params) = @_;
- my $name_e = _H($name);
-
- $::request->{layout}->add_javascripts('autocomplete_customer.js');
-
- $self->hidden_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => 'customer_autocomplete') .
- $self->input_tag("$name_e\_name", (ref $value && $value->can('name')) ? $value->name : '', %params);
-}
# simple version with select_tag
sub vendor_selector {
- my ($self, $name, $value, %params) = @_;
+ 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 : '';
@@ -259,7 +171,7 @@ sub vendor_selector {
# simple version with select_tag
sub part_selector {
- my ($self, $name, $value, %params) = @_;
+ 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 : '';
@@ -336,19 +248,20 @@ sub tab {
sub areainput_tag {
my ($self, $name, $value, %attributes) = _hashify(3, @_);
- my ($rows, $cols);
- my $min = delete $attributes{min_rows} || 1;
+ 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);
- if (exists $attributes{cols}) {
- $cols = delete $attributes{cols};
- $rows = $::form->numtextrows($value, $cols);
- } else {
- $rows = delete $attributes{rows} || 1;
- }
+ $attributes{id} ||= _tag_id();
+ my $id = $attributes{id};
+
+ 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), ($cols ? (cols => $cols) : ()))
- : $self->input_tag($name, $value, %attributes, ($cols ? (size => $cols) : ()));
+ return ''
+ . $self->input_tag($name, $value, %attributes, size => $cols)
+ . ""
+ . '';
}
sub multiselect2side {
@@ -429,17 +342,6 @@ JAVASCRIPT
return $code;
}
-sub online_help_tag {
- my ($self, $tag, %params) = _hashify(2, @_);
- my $cc = $::myconfig{countrycode};
- my $file = "doc/online/$cc/$tag.html";
- my $text = $params{text} || $::locale->text('Help');
-
- die 'malformed help tag' unless $tag =~ /^[a-zA-Z0-9_]+$/;
- return unless -f $file;
- return $self->html_tag('a', $text, href => $file, class => 'jqModal')
-}
-
sub dump {
my $self = shift;
return '
' . Data::Dumper::Dumper(@_) . ''; @@ -449,39 +351,43 @@ sub sortable_table_header { my ($self, $by, %params) = _hashify(2, @_); my $controller = $self->{CONTEXT}->stash->get('SELF'); - my $sort_spec = $controller->get_sort_spec; + 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 = $controller->get_current_sort_params; + 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{by} eq $by) { - my $current_dir = $current_sort_params{dir} ? 'up' : 'down'; + if ($current_sort_params{sort_by} eq $by) { + my $current_dir = $current_sort_params{sort_dir} ? 'up' : 'down'; $image = '