X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FTemplate%2FPlugin%2FL.pm;h=0ed2a8784718ce68e202b16c17be111b1b13321c;hb=b27c05d659c377d0911e6b1bde6d4d92d6cc19e2;hp=d6c8ca2b7d24d0522003f6d214027683d4988268;hpb=82dcbe710985c9d99331e5c876f60b448ec3bfda;p=kivitendo-erp.git

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index d6c8ca2b7..0ed2a8784 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -106,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';
@@ -115,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;
 }
@@ -222,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),
     )
@@ -400,34 +402,53 @@ sub sortable_element {
   my ($self, $selector, @slurp) = @_;
   my %params                    = _hashify(@slurp);
 
-  my %attributes = ( helper => <<JAVASCRIPT );
+  my %attributes = ( distance => 5,
+                     helper   => <<'JAVASCRIPT' );
     function(event, ui) {
       ui.children().each(function() {
-        \$(this).width(\$(this).width());
+        $(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 = <<JAVASCRIPT;
+        \$.post('$params{url}', { '${as}[]': \$(\$('${selector}').sortable('toArray'))${filter}.toArray() });
+JAVASCRIPT
+  }
+
+  if (!$params{dont_recolor}) {
+    $stop_event .= <<JAVASCRIPT;
+        \$('${selector}>*:odd').removeClass('listrow1').removeClass('listrow0').addClass('listrow0');
+        \$('${selector}>*:even').removeClass('listrow1').removeClass('listrow0').addClass('listrow1');
+JAVASCRIPT
+  }
+
+  if ($stop_event) {
     $attributes{stop} = <<JAVASCRIPT;
       function(event, ui) {
-        \$.post('$params{url}', { '${as}[]': \$(\$('${selector}').sortable('toArray'))${filter}.toArray() });
+        ${stop_event}
         return ui;
       }
 JAVASCRIPT
   }
 
+  $params{handle}     = '.dragdrop' unless exists $params{handle};
+  $attributes{handle} = "'$params{handle}'" if $params{handle};
+
   my $attr_str = join(', ', map { "${_}: $attributes{$_}" } keys %attributes);
 
   my $code = <<JAVASCRIPT;
 <script type="text/javascript">
   \$(function() {
-    \$( "${selector}" ).sortable({ ${attr_str} }).disableSelection();
+    \$( "${selector}" ).sortable({ ${attr_str} })
   });
 </script>
 JAVASCRIPT
@@ -559,6 +580,10 @@ 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.
 
+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<date_tag $name, $value, cal_align =E<gt> $align_code, %attributes>
 
 Creates a date input field, with an attached javascript that will open a
@@ -676,6 +701,21 @@ C<$params{as}> or, missing that, C<$params{with}>.
 Sets the POST parameter name for AJAX request after dropping an
 element (see C<$params{with}>).
 
+=item C<handle>
+
+An optional jQuery selector specifying which part of the child element
+is dragable. If the parameter is not given then it defaults to
+C<.dragdrop> matching DOM elements with the class C<dragdrop>.  If the
+parameter is set and empty then the whole child element is dragable,
+and clicks through to underlying elements like inputs or links might
+not work.
+
+=item C<dont_recolor>
+
+If trueish then the children will not be recolored. The default is to
+recolor the children by setting the class C<listrow0> on odd and
+C<listrow1> on even entries.
+
 =back
 
 Example:
@@ -694,9 +734,10 @@ Example:
   <table>
 
   [% L.sortable_element('#thing_list tbody',
-                        'url'  => 'controller.pl?action=SystemThings/reorder',
-                        'with' => 'thingy',
-                        'as'   => 'thing_ids') %]
+                        url          => 'controller.pl?action=SystemThings/reorder',
+                        with         => 'thingy',
+                        as           => 'thing_ids',
+                        recolor_rows => 1) %]
 
 After dropping e.g. the third element at the top of the list a POST
 request would be made to the C<reorder> action of the C<SystemThings>