X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=0ed2a8784718ce68e202b16c17be111b1b13321c;hb=b27c05d659c377d0911e6b1bde6d4d92d6cc19e2;hp=068fc1a4829af91f750e8072c3f60b401b27209f;hpb=f5db53cd06c51ef10fea5aabfbee74f7f2b6d96f;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 068fc1a48..0ed2a8784 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -61,6 +61,7 @@ sub attributes { my @result = (); while (my ($name, $value) = each %options) { next unless $name; + next if $name eq 'disabled' && !$value; $value = '' if !defined($value); push @result, _H($name) . '="' . _H($value) . '"'; } @@ -105,6 +106,7 @@ sub checkbox_tag { $attributes{id} ||= $self->name_to_id($name); $attributes{value} = 1 unless defined $attributes{value}; my $label = delete $attributes{label}; + my $checkall = delete $attributes{checkall}; if ($attributes{checked}) { $attributes{checked} = 'checked'; @@ -114,6 +116,7 @@ sub checkbox_tag { 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; } @@ -206,7 +209,7 @@ sub options_for_select { my $value_title_sub = $options{value_title_sub}; - my %selected = map { ( $_ => 1 ) } @{ ref($options{default}) eq 'ARRAY' ? $options{default} : $options{default} ? [ $options{default} ] : [] }; + my %selected = map { ( $_ => 1 ) } @{ ref($options{default}) eq 'ARRAY' ? $options{default} : defined($options{default}) ? [ $options{default} ] : [] }; my $access = sub { my ($element, $index, $key, $sub) = @_; @@ -221,7 +224,7 @@ sub options_for_select { my @elements = (); push @elements, [ undef, $options{empty_title} || '' ] if $options{with_empty}; push @elements, map [ - $value_title_sub ? $value_title_sub->($_) : ( + $value_title_sub ? @{ $value_title_sub->($_) } : ( $access->($_, 0, $value_key, $value_sub), $access->($_, 1, $title_key, $title_sub), ) @@ -230,7 +233,7 @@ sub options_for_select { my $code = ''; foreach my $result (@elements) { my %attributes = ( value => $result->[0] ); - $attributes{selected} = 'selected' if $selected{ $result->[0] || '' }; + $attributes{selected} = 'selected' if $selected{ defined($result->[0]) ? $result->[0] : '' }; $code .= $self->html_tag('option', _H($result->[1]), %attributes); } @@ -286,6 +289,7 @@ sub date_tag { $self->javascript( "Calendar.setup({ inputField: '$name_e', ifFormat: '$datefmt', align: '$params{cal_align}', button: 'trigger$seq' });" ) : ''); +} sub javascript_tag { my $self = shift; @@ -394,6 +398,76 @@ EOCODE return $code; } +sub sortable_element { + my ($self, $selector, @slurp) = @_; + my %params = _hashify(@slurp); + + my %attributes = ( distance => 5, + helper => <<'JAVASCRIPT' ); + function(event, ui) { + ui.children().each(function() { + $(this).width($(this).width()); + }); + return ui; + } +JAVASCRIPT + + my $stop_event = ''; + + if ($params{url} && $params{with}) { + my $as = $params{as} || $params{with}; + my $filter = ".filter(function(idx) { return this.substr(0, " . length($params{with}) . ") == '$params{with}'; })"; + $filter .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })"; + + $stop_event = <*:odd').removeClass('listrow1').removeClass('listrow0').addClass('listrow0'); + \$('${selector}>*:even').removeClass('listrow1').removeClass('listrow0').addClass('listrow1'); +JAVASCRIPT + } + + if ($stop_event) { + $attributes{stop} = < + \$(function() { + \$( "${selector}" ).sortable({ ${attr_str} }) + }); + +JAVASCRIPT + + return $code; +} + +sub online_help_tag { + my ($self, $tag, @slurp) = @_; + my %params = _hashify(@slurp); + 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, target => '_blank'); +} + sub dump { my $self = shift; require Data::Dumper; @@ -506,6 +580,10 @@ If C<%attributes> contains a key C