X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=d8d223ecb5fac65b76c0b84eaba9f1ca8004c528;hb=72be9c763f3b7f7df1fae4fe10011e45f9e2ad1d;hp=320c75ed218ca6f83a6ccdabe955f75436b4eddf;hpb=bd1e1e7d4bc019cc97b60d4a946531c356c45fde;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 320c75ed2..d8d223ecb 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -13,7 +13,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 ); } } @@ -277,8 +277,7 @@ sub date_tag { s/y+/\%Y/gi; } $::myconfig{"dateformat"}; - $params{cal_align} ||= 'BR'; - + my $cal_align = delete $params{cal_align} || 'BR'; my $str_value = blessed $value ? $value->to_lxoffice : $value; $self->input_tag($name, $str_value, @@ -290,12 +289,13 @@ sub date_tag { ) . ((!$params{no_cal}) ? $self->html_tag('img', undef, src => 'image/calendar.png', + alt => $::locale->text('Calendar'), id => "trigger$seq", title => _H($::myconfig{dateformat}), %params, ) . $self->javascript( - "Calendar.setup({ inputField: '$name_e', ifFormat: '$datefmt', align: '$params{cal_align}', button: 'trigger$seq' });" + "Calendar.setup({ inputField: '$name_e', ifFormat: '$datefmt', align: '$cal_align', button: 'trigger$seq' });" ) : ''); } @@ -507,7 +507,7 @@ sub online_help_tag { die 'malformed help tag' unless $tag =~ /^[a-zA-Z0-9_]+$/; return unless -f $file; - return $self->html_tag('a', $text, href => $file, target => '_blank'); + return $self->html_tag('a', $text, href => $file, class => 'jqModal') } sub dump {