X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FPresenter%2FTag.pm;h=032b179b4c1855518da878aeba3d6b32e724fe60;hb=3a868c370f430267080ceaa2ea5d433447ec217b;hp=2b45d97d13ae960df1c8fc975ca64f6fb3355f25;hpb=737a6fd7365f560a5435008f6445416794764b20;p=kivitendo-erp.git

diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm
index 2b45d97d1..032b179b4 100644
--- a/SL/Presenter/Tag.pm
+++ b/SL/Presenter/Tag.pm
@@ -11,7 +11,7 @@ our @EXPORT_OK = qw(
   html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag
   checkbox_tag button_tag submit_tag ajax_submit_tag input_number_tag
   stringify_attributes restricted_html textarea_tag link_tag date_tag
-  div_tag);
+  div_tag radio_button_tag img_tag);
 our %EXPORT_TAGS = (ALL => \@EXPORT_OK);
 
 use Carp;
@@ -46,6 +46,15 @@ sub _J {
   return $string;
 }
 
+sub join_values {
+  my ($name, $value) = @_;
+  my $spacer = $name eq 'class' ? ' ' : ''; # join classes with spaces, everything else as is
+
+  ref $value && 'ARRAY' eq ref $value
+  ? join $spacer, map { join_values($name, $_) } @$value
+  : $value
+}
+
 sub stringify_attributes {
   my (%params) = @_;
 
@@ -54,6 +63,7 @@ sub stringify_attributes {
     next unless $name;
     next if $_valueless_attributes{$name} && !$value;
     $value = '' if !defined($value);
+    $value = join_values($name, $value) if ref $value && 'ARRAY' eq ref $value;
     push @result, $_valueless_attributes{$name} ? escape($name) : escape($name) . '="' . escape($value) . '"';
   }
 
@@ -259,6 +269,28 @@ sub checkbox_tag {
   return $code;
 }
 
+sub radio_button_tag {
+  my ($name, %attributes) = @_;
+
+  $attributes{value}   = 1 unless exists $attributes{value};
+
+  _set_id_attribute(\%attributes, $name, 1);
+  my $label            = delete $attributes{label};
+
+  _set_id_attribute(\%attributes, $name . '_' . $attributes{value});
+
+  if ($attributes{checked}) {
+    $attributes{checked} = 'checked';
+  } else {
+    delete $attributes{checked};
+  }
+
+  my $code  = html_tag('input', undef,  %attributes, name => $name, type => 'radio');
+  $code    .= html_tag('label', $label, for => $attributes{id}) if $label;
+
+  return $code;
+}
+
 sub button_tag {
   my ($onclick, $value, %attributes) = @_;
 
@@ -267,7 +299,7 @@ sub button_tag {
 
   $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm};
 
-  html_tag('input', undef, %attributes, value => $value, onclick => $onclick);
+  html_tag('input', undef, %attributes, value => $value, (onclick => $onclick)x!!$onclick);
 }
 
 sub submit_tag {
@@ -370,10 +402,11 @@ sub date_tag {
   $::request->layout->add_javascripts('kivi.Validator.js');
   $::request->presenter->need_reinit_widgets($params{id});
 
+  $params{'data-validate'} = join(' ', "date", grep { $_ } (delete $params{'data-validate'}));
+
   input_tag(
     $name, blessed($value) ? $value->to_lxoffice : $value,
     size   => 11,
-    "data-validate" => "date",
     %params,
     %class, @onchange,
   );
@@ -384,6 +417,14 @@ sub div_tag {
   return html_tag('div', $content, %params);
 }
 
+sub img_tag {
+  my (%params) = @_;
+
+  $params{alt} ||= '';
+
+  return html_tag('img', undef, %params);
+}
+
 1;
 __END__
 
@@ -539,6 +580,16 @@ If C<%attributes> contains a key C<checkall> then the value is taken as a
 JQuery selector and clicking this checkbox will also toggle all checkboxes
 matching the selector.
 
+=item C<radio_button_tag $name, %attributes>
+
+Creates a HTML 'input type=radio' tag named C<$name> with arbitrary
+HTML attributes from C<%attributes>. The tag's C<value> defaults to
+C<1>. The tag's C<id> defaults to C<name_to_id($name . "_" . $value)>.
+
+If C<%attributes> contains a key C<label> then a HTML 'label' tag is
+created with said C<label>. No attribute named C<label> is created in
+that case.
+
 =item C<select_tag $name, \@collection, %attributes>
 
 Creates an HTML 'select' tag named C<$name> with the contents of one