--- smeserver-tw-logonscript-1.3/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibayletters.pm.panelPrintGroupTable	2009-11-04 13:34:52.000000000 +1300
+++ smeserver-tw-logonscript-1.3/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibayletters.pm	2009-11-16 14:07:43.000000000 +1300
@@ -17,7 +17,6 @@
 use File::Basename;
 use Exporter;
 use Carp;
-use CGI::Carp qw(fatalsToBrowser) ;
 use Data::Dumper;
 our @ISA = qw(esmith::FormMagick Exporter);
 use CGI::Carp qw(warningsToBrowser fatalsToBrowser);
@@ -77,6 +76,31 @@
 
 *wherenext = \&CGI::FormMagick::wherenext;
 
+sub print_group_table {
+    my $self = shift;
+    my $q = $self->{cgi};
+    my $group  = $self->localise('Group');
+
+    my %groups = get_group_list();
+    print $q->br();
+    print $q->br();
+    print $self->localise('GROUP_LIST_DESCRIPTION');
+    print $q->br();
+    print $q->br();
+    print $q->end_table,"\n";
+    print $q->start_table({-CLASS => "sme-border"}),"\n";
+    print $q->Tr (
+                  esmith::cgi::genSmallCell($q, $group,"header"),
+                  esmith::cgi::genSmallCell($q, $self->localise('CUSTOM_BATCH_FILE'),"header")),"\n";
+    foreach my $group_name (keys %groups){
+	print $q->Tr (
+                  esmith::cgi::genSmallCell($q, $groups{$group_name}),
+                  esmith::cgi::genSmallCell($q, "<a href=\"ibayletters?page_stack=;page=0;groupname=$group_name&action=createcustombatchfile&wherenext=CustomBatchGroup\">$group_name.bat</a>","normal"));
+
+    }
+    print $q->end_table,"\n";
+    return "";
+}
 
 sub print_ibay_table {
     my $self = shift;
@@ -100,8 +124,7 @@
                   esmith::cgi::genSmallCell($q, $name,"header"),
                   esmith::cgi::genSmallCell($q, $description,"header"),
                   esmith::cgi::genSmallCell($q, $group,"header"),
-                  esmith::cgi::genSmallCell($q, $drive_letter,"header"),
-                  esmith::cgi::genSmallCell($q, $self->localise('CUSTOM_BATCH_FILE'),"header")),"\n";
+                  esmith::cgi::genSmallCell($q, $drive_letter,"header")),"\n";
     my $scriptname = basename($0);
 
     foreach my $i (@ibays) 
@@ -115,8 +138,7 @@
             esmith::cgi::genSmallCell($q, $ibayname,"normal"),
             esmith::cgi::genSmallCell($q, $ibaydesc,"normal"),
             esmith::cgi::genSmallCell($q, $group_list{$ibaygroup}|| $ibaygroup,"normal"),
-            esmith::cgi::genSmallCell($q, genSelect("$ibayname","$driveletter",\@names,\@values),"normal"),
-            esmith::cgi::genSmallCell($q, "<a href=\"ibayletters?page_stack=;page=0;groupname=$ibaygroup&action=createcustombatchfile&wherenext=CustomBatchGroup\">$ibaygroup.bat</a>","normal"));
+            esmith::cgi::genSmallCell($q, genSelect("$ibayname","$driveletter",\@names,\@values),"normal"));
     }
 
     my $db = esmith::ConfigDB->open_ro();