X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=871e683bf19eda39e6cd76f131712d09c589bc73;hb=a3cf1d2381e1db5ab972e6f0c74ff157012b221a;hp=95d2254417047d9a46424e9a585dbfc2ae0d839c;hpb=0d38094bb64db774429bc6f036d2f3b0ec074595;p=kivitendo-erp.git

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index 95d225441..871e683bf 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -6,6 +6,8 @@ use List::MoreUtils qw(apply);
 use List::Util qw(max);
 use Scalar::Util qw(blessed);
 
+use SL::Presenter;
+
 use strict;
 
 { # This will give you an id for identifying html tags and such.
@@ -281,7 +283,8 @@ sub input_tag {
 }
 
 sub hidden_tag {
-  return shift->input_tag(@_, type => 'hidden');
+  my ($self, $name, $value, @slurp) = @_;
+  return $self->input_tag($name, $value, _hashify(@slurp), type => 'hidden');
 }
 
 sub div_tag {
@@ -396,34 +399,10 @@ sub customer_picker {
   my ($self, $name, $value, %params) = @_;
   my $name_e    = _H($name);
 
-  $self->hidden_tag($name, (ref $value && $value->can('id')) ? $value->id : '') .
-  $self->input_tag("$name_e\_name", (ref $value && $value->can('name')) ? $value->name : '', %params) .
-  $self->javascript(<<JS);
-function autocomplete_customer (selector, column) {
-  \$(function(){ \$(selector).autocomplete({
-    source: function(req, rsp) {
-      \$.ajax({
-        url: 'controller.pl?action=Customer/ajax_autocomplete',
-        dataType: "json",
-        data: {
-          column: column,
-          term: req.term,
-          current: function() { \$('#$name_e').val() },
-          obsolete: 0,
-        },
-        success: function (data){ rsp(data) }
-      });
-    },
-    limit: 20,
-    delay: 50,
-    select: function(event, ui) {
-      \$('#$name_e').val(ui.item.id);
-      \$('#$name_e\_name').val(ui.item.name);
-    },
-  })});
-}
-autocomplete_customer('#$name_e\_name');
-JS
+  $::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
@@ -486,27 +465,15 @@ 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 {
@@ -689,11 +656,7 @@ sub paginate_controls {
   my %paginate_params = $controller->get_current_paginate_params;
 
   my %template_params = (
-    pages             => {
-      cur             => $paginate_params{page},
-      max             => $paginate_params{num_pages},
-      common          => $paginate_params{common_pages},
-    },
+    pages             => \%paginate_params,
     url_maker         => sub {
       my %url_params                                    = _hashify(@_);
       $url_params{ $paginate_spec->{FORM_PARAMS}->[0] } = delete $url_params{page};
@@ -703,9 +666,7 @@ sub paginate_controls {
     },
   );
 
-  my $output;
-  $controller->_template_obj->process('templates/webpages/common/paginate.html', \%template_params, \$output);
-  return $output;
+  return SL::Presenter->get->render('common/paginate', %template_params);
 }
 
 1;
@@ -918,9 +879,6 @@ C<tab>. Example:
     L.tab(LxERP.t8('Custom Variables'), 'part/_cvar_tab.html', if => SELF.display_cvar_tab),
   ]) %]
 
-An optional attribute is C<selected>, which accepts the ordinal of a tab which
-should be selected by default.
-
 =item C<areainput_tag $name, $content, %PARAMS>
 
 Creates a generic input tag or textarea tag, depending on content size. The