projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
SL
/
Template
/
Plugin
/
L.pm
diff --git
a/SL/Template/Plugin/L.pm
b/SL/Template/Plugin/L.pm
index
320c75e
..
d8d223e
100644
(file)
--- 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 {
# 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"};
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,
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',
) . ((!$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(
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;
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 {
}
sub dump {