ActionBar: Verwendung bei Kunden-/Lieferanten/Ansprechpersonensuche

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index a4243757b4d77f15920504b1e35f478f1ed71bc1..816e30292fb8acce10746d13005132818abc27d6 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -56,6 +56,7 @@ use SL::DB::Business;
 use SL::DB::Default;
 use SL::DB::DeliveryTerm;
 use SL::ReportGenerator;
 use SL::DB::Default;
 use SL::DB::DeliveryTerm;
 use SL::ReportGenerator;

+use SL::Locale::String qw(t8);

 use SL::MoreCommon qw(uri_encode);
 
 require "bin/mozilla/common.pl";
 use SL::MoreCommon qw(uri_encode);
 
 require "bin/mozilla/common.pl";


@@ -88,6 +89,8 @@ sub search {
 
   $form->{title}    = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors');
 
 
   $form->{title}    = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors');
 

+  setup_ct_search_action_bar();
+

   $form->header();
   print $form->parse_html_template('ct/search');
 
   $form->header();
   print $form->parse_html_template('ct/search');
 


@@ -106,6 +109,8 @@ sub search_contact {
                                                                            'include_value'  => 'Y');
 
   $::form->{title} = $::locale->text('Search contacts');
                                                                            'include_value'  => 'Y');
 
   $::form->{title} = $::locale->text('Search contacts');

+
+  setup_ct_search_contact_action_bar();

   $::form->header;
   print $::form->parse_html_template('ct/search_contact');
 
   $::form->header;
   print $::form->parse_html_template('ct/search_contact');
 


@@ -295,7 +300,8 @@ sub list_names {
     $report->add_data($row);
   }
 
     $report->add_data($row);
   }
 

-  $report->generate_with_headers();
+  setup_ct_list_names_action_bar();
+  $report->generate_with_headers(action_bar => 1);

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -426,9 +432,51 @@ sub list_contacts {
     $report->add_data($row);
   }
 
     $report->add_data($row);
   }
 

-  $report->generate_with_headers;
+  $report->generate_with_headers(action_bar => 1);

 
   $::lxdebug->leave_sub;
 }
 
 
   $::lxdebug->leave_sub;
 }
 

+sub setup_ct_search_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Continue'),
+        submit    => [ '#form', { action => 'list_names' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_ct_list_names_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        $::form->{db} eq 'customer' ? t8('New customer') : t8('New vendor'),
+        submit    => [ '#new_form', { action => 'CustomerVendor/add' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_ct_search_contact_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Continue'),
+        submit    => [ '#form', { action => 'list_contacts' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+

 sub continue { call_sub($main::form->{nextsub}); }
 sub continue { call_sub($main::form->{nextsub}); }

diff --git a/templates/webpages/ct/list_names_bottom.html b/templates/webpages/ct/list_names_bottom.html
index 9546101fa86ba4405a64e8f43bca04cf1d246290..cce6d2c1466bb44acf26857ca6f7d75c277002ec 100644 (file)
--- a/templates/webpages/ct/list_names_bottom.html
+++ b/templates/webpages/ct/list_names_bottom.html
@@ -1,10 +1,6 @@
 [% USE T8 %][% USE HTML %]
 
 [% USE T8 %][% USE HTML %]
 

-<form method="post" action="controller.pl?action=CustomerVendor/add">
+<form method="post" action="controller.pl" id="new_form">

   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
   <input name="db" type="hidden" value="[% HTML.escape(db) %]">
   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
   <input name="db" type="hidden" value="[% HTML.escape(db) %]">

-
-  [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]<br>
-
-  <input class="submit" type="submit" value="[%- 'Add' | $T8 %]">

 </form>
 </form>

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 10a6ceaaebaa23c9d23c916912cc5f8d8c35a004..df385c752a2a868ecc6ef09c4be4a6b52d019dd3 100644 (file)
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -3,7 +3,7 @@
 [%- USE HTML %]
 <h1>[% title %]</h1>
 
 [%- USE HTML %]
 <h1>[% title %]</h1>
 

- <form method="post" action="ct.pl" name="Form">
+ <form method="post" action="ct.pl" name="Form" id="form">

 
   <input type="hidden" name="db" value="[% HTML.escape(db) %]">
 
 
   <input type="hidden" name="db" value="[% HTML.escape(db) %]">
 


@@ -215,8 +215,4 @@
     </td>
    </tr>
   </table>
     </td>
    </tr>
   </table>

-
-  <input type="hidden" name="nextsub" value="list_names">
-
-  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">

  </form>
  </form>

diff --git a/templates/webpages/ct/search_contact.html b/templates/webpages/ct/search_contact.html
index de9ba8b0712348fe9125b98dce9f37f341446670..aa4f8ed4926bc19464fe9b961ba468d3b19f374a 100644 (file)
--- a/templates/webpages/ct/search_contact.html
+++ b/templates/webpages/ct/search_contact.html
@@ -4,7 +4,7 @@
 [%- USE LxERP %]
 <h1>[% 'Contacts' | $T8 %]</h1>
 
 [%- USE LxERP %]
 <h1>[% 'Contacts' | $T8 %]</h1>
 

- <form method="post" action="ct.pl" name="Form">
+ <form method="post" action="ct.pl" name="Form" id="form">

 
   <table>
    <tr>
 
   <table>
    <tr>


@@ -132,8 +132,4 @@
     </td>
    </tr>
   </table>
     </td>
    </tr>
   </table>

-
-  <input type="hidden" name="nextsub" value="list_contacts">
-
-  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">

  </form>
  </form>