ActionBar: Verwendung bei Briefen standardisiert

• »Suchen« → »Erneuern«
• »Zurücksetzen« in Form verschoben

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 69e2bdf..d0ef0c9 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -724,15 +724,10 @@ sub setup_list_action_bar {
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        t8('Search'),
-        submit    => [ '#form', { action => 'Letter/list' } ],
-        checks    => [ 'kivi.SalesPurchase.check_required_email_fields' ],
+        t8('Update'),
+        submit    => [ '#search_form', { action => 'Letter/list' } ],
         accesskey => 'enter',
       ],
-      action => [
-        t8('Reset'),
-        call => [ 'kivi.call_jquery', '#form', 'resetForm' ],
-      ],
     );
   }
 }

diff --git a/templates/webpages/letter/report_bottom.html b/templates/webpages/letter/report_bottom.html
index f66e2d2..a27818a 100644 (file)
--- a/templates/webpages/letter/report_bottom.html
+++ b/templates/webpages/letter/report_bottom.html
@@ -1,6 +1,6 @@
 [% USE HTML%]
 [%- USE T8 %]
-[%- USE L %]
+[%- USE L %][%- USE LxERP -%]
  [% L.paginate_controls(models=SELF.models) %]
  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
  [%- FOREACH item = HIDDEN %]

diff --git a/templates/webpages/letter/search.html b/templates/webpages/letter/search.html
index 4ae4982..fa89fd6 100644 (file)
--- a/templates/webpages/letter/search.html
+++ b/templates/webpages/letter/search.html
@@ -2,7 +2,7 @@
 [% USE T8 %]
 [% USE L %]
 [% USE LxERP %]
-<form action="controller.pl" method="post" name="Form" id="form">
+<form action="controller.pl" method="post" name="Form" id="search_form">
 
 <div class='filter_toggle'>
 <a href='#' onClick='javascript:$(".filter_toggle").toggle()'>[% 'Show Filter' | $T8 %]</a>
@@ -55,6 +55,6 @@
  [% L.hidden_tag('sort_by', FORM.sort_by) %]
  [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
  [% L.hidden_tag('page', FORM.page) %]
+ [% L.button_tag("\$('#search_form').resetForm()", LxERP.t8("Reset")) %]
 </div>
-
 </form>