smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript-1.3-panelPrintGroupTable.patch

--- 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();
1	chriscosta	1.1	--- 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
2			+++ smeserver-tw-logonscript-1.3/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibayletters.pm 2009-11-16 14:07:43.000000000 +1300
3			@@ -17,7 +17,6 @@
4			use File::Basename;
5			use Exporter;
6			use Carp;
7			-use CGI::Carp qw(fatalsToBrowser) ;
8			use Data::Dumper;
9			our @ISA = qw(esmith::FormMagick Exporter);
10			use CGI::Carp qw(warningsToBrowser fatalsToBrowser);
11			@@ -77,6 +76,31 @@
12
13			*wherenext = \&CGI::FormMagick::wherenext;
14
15			+sub print_group_table {
16			+ my $self = shift;
17			+ my $q = $self->{cgi};
18			+ my $group = $self->localise('Group');
19			+
20			+ my %groups = get_group_list();
21			+ print $q->br();
22			+ print $q->br();
23			+ print $self->localise('GROUP_LIST_DESCRIPTION');
24			+ print $q->br();
25			+ print $q->br();
26			+ print $q->end_table,"\n";
27			+ print $q->start_table({-CLASS => "sme-border"}),"\n";
28			+ print $q->Tr (
29			+ esmith::cgi::genSmallCell($q, $group,"header"),
30			+ esmith::cgi::genSmallCell($q, $self->localise('CUSTOM_BATCH_FILE'),"header")),"\n";
31			+ foreach my $group_name (keys %groups){
32			+ print $q->Tr (
33			+ esmith::cgi::genSmallCell($q, $groups{$group_name}),
34			+ esmith::cgi::genSmallCell($q, "<a href=\"ibayletters?page_stack=;page=0;groupname=$group_name&action=createcustombatchfile&wherenext=CustomBatchGroup\">$group_name.bat</a>","normal"));
35			+
36			+ }
37			+ print $q->end_table,"\n";
38			+ return "";
39			+}
40
41			sub print_ibay_table {
42			my $self = shift;
43			@@ -100,8 +124,7 @@
44			esmith::cgi::genSmallCell($q, $name,"header"),
45			esmith::cgi::genSmallCell($q, $description,"header"),
46			esmith::cgi::genSmallCell($q, $group,"header"),
47			- esmith::cgi::genSmallCell($q, $drive_letter,"header"),
48			- esmith::cgi::genSmallCell($q, $self->localise('CUSTOM_BATCH_FILE'),"header")),"\n";
49			+ esmith::cgi::genSmallCell($q, $drive_letter,"header")),"\n";
50			my $scriptname = basename($0);
51
52			foreach my $i (@ibays)
53			@@ -115,8 +138,7 @@
54			esmith::cgi::genSmallCell($q, $ibayname,"normal"),
55			esmith::cgi::genSmallCell($q, $ibaydesc,"normal"),
56			esmith::cgi::genSmallCell($q, $group_list{$ibaygroup}\|\| $ibaygroup,"normal"),
57			- esmith::cgi::genSmallCell($q, genSelect("$ibayname","$driveletter",\@names,\@values),"normal"),
58			- esmith::cgi::genSmallCell($q, "<a href=\"ibayletters?page_stack=;page=0;groupname=$ibaygroup&action=createcustombatchfile&wherenext=CustomBatchGroup\">$ibaygroup.bat</a>","normal"));
59			+ esmith::cgi::genSmallCell($q, genSelect("$ibayname","$driveletter",\@names,\@values),"normal"));
60			}
61
62			my $db = esmith::ConfigDB->open_ro();