From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 5 Sep 2012 15:44:25 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~249^2~5
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/d08c706c8c3790ff09c5c9c97541c7936e74e6c9?ds=inline;hp=-c

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

d08c706c8c3790ff09c5c9c97541c7936e74e6c9
diff --combined SL/Template/Plugin/L.pm
index fd9961413,c3411305a..c5ac88abb
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@@ -83,6 -83,15 +83,15 @@@ sub html_tag 
    return "<${tag}${attributes}>${content}</${tag}>";
  }
  
+ sub img_tag {
+   my ($self, @slurp) = @_;
+   my %options = _hashify(@slurp);
+ 
+   $options{alt} ||= '';
+ 
+   return $self->html_tag('img', undef, %options);
+ }
+ 
  sub select_tag {
    my $self            = shift;
    my $name            = shift;
@@@ -591,7 -600,7 +600,7 @@@ sub sortable_table_header 
    my $by_spec             = $sort_spec->{$by};
    my %current_sort_params = $controller->get_current_sort_params;
    my ($image, $new_dir)   = ('', $current_sort_params{dir});
 -  my $title               = delete($params{title}) || $by_spec->{title};
 +  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';