[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.42.2.6, 1.42.2.7

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv27042

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_pkg.cgi 
Log Message:
use popup_link...

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.42.2.6
retrieving revision 1.42.2.7
diff -u -d -r1.42.2.6 -r1.42.2.7
--- cust_pkg.cgi	14 Feb 2008 08:31:32 -0000	1.42.2.6
+++ cust_pkg.cgi	1 Apr 2008 04:37:27 -0000	1.42.2.7
@@ -210,29 +210,22 @@
    };
 }
 
-my $html_init = '';
-for (qw (overlibmws overlibmws_iframe overlibmws_draggable iframecontentmws))
-{
-  $html_init .=
-    qq!<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/$_.js"></SCRIPT>!;
-}
+my $html_init = include('/elements/init_overlib.html');
 
 my $extra_choices = sub {
   my $query = shift;
-  my $choices = '';
 
-  my $url = qq!overlib( OLiframeContent('!. popurl(2).
-            qq!misc/bulk_change_pkg.cgi?$query', 768, 336, !.
-            qq!'bulk_pkg_change_popup' ), CAPTION, 'Change Packages'!.
-            qq!, STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, !.
-            qq!CLOSECLICK ); return false;!;
-
-  if ($FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages')) {
-    $choices .= qq!<BR><A HREF="javascript:void(0);"!.
-                qq!onClick="$url">Change these packages</A>!;
-  }
-
-  return $choices;
+  return '' unless
+   $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+    
+  '<BR><BR>'.
+  include( '/elements/popup_link.html',
+             'label'       => 'Change these packages',
+             'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
+             'actionlabel' => 'Change Packages',
+             'width'       => 763,
+             'height'      => 336,
+         );
 };
 
 </%init>