X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-cust_svc.html;h=ca5de86b4d119b1644823d74d3ef9692e2256161;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=79a3b298c21c03be4d8cd6984281b2efc997b166;hpb=0301d1273aae53a35f428cff5a501849768befc8;p=freeside.git

diff --git a/httemplate/elements/tr-cust_svc.html b/httemplate/elements/tr-cust_svc.html
index 79a3b298c..ca5de86b4 100644
--- a/httemplate/elements/tr-cust_svc.html
+++ b/httemplate/elements/tr-cust_svc.html
@@ -12,7 +12,9 @@ Usage:
                 'cust_pkg' => $cust_pkg,
                 #optional
                 'cust_pkg-display_times'    => '', #bool
-                'svc_broadband-manage_link' => '',
+                'manage_link'               => '', #for svc_broadband
+                'manage_link_text'          => '', #default 'Manage Device'
+                'manage_link_loc'           => '', #default 'bottom', or 'right'
                 'maestro-status_test'       => '',
             )
   %>
@@ -25,6 +27,11 @@ FS::UI::Web::svc_link($m, $part_svc, $cust_svc)
   <TD STYLE="padding-bottom:0px"><B><%
 FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc)
 %></B></TD>
+<TD ALIGN="right"><% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %>
+%   if ( $manage_link and $opt{'manage_link_loc'} eq 'right' ) {
+      <A HREF="<% $manage_link %>" <% $manage_target %>><% $opt{'manage_link_text'} |h %></A>
+% }
+</TD>
 </TR>
 % if ( $cust_svc->overlimit ) {
 <TR>
@@ -54,16 +61,12 @@ $cust_svc->overlimit )
 % # second column: all other action links
   <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px; padding-top:0px">
 % if ( $part_svc->svcdb eq 'svc_broadband' ) {
-    <FONT SIZE="-1" STYLE="float:left">(&nbsp;<%
+    <FONT SIZE="-2">(&nbsp;<%
       include('/elements/popup_link-ping.html',
               'ip' => $svc_x->ip_addr
       ) %>&nbsp;)</FONT>
-%   my $manage_link = $opt{'svc_broadband-manage_link'};
-%   if ( $manage_link ) {
-%     my $ip_addr = $svc_x->ip_addr; #substitution for $manage_link
-      <FONT SIZE="-1" STYLE="float:left">(&nbsp;<A HREF="<% 
-        eval(qq("$manage_link")) 
-      %>">Manage Device</A>&nbsp;)</FONT>
+%   if ( $manage_link and $opt{'manage_link_loc'} eq 'bottom' ) {
+      <FONT SIZE="-2">(&nbsp;<A HREF="<% $manage_link %>" <% $manage_target %>><% $opt{'manage_link_text'} |h %></A>&nbsp;)</FONT>
 %   }
 % } #svc_broadband
 % if ( $curuser->access_right('Unprovision customer service') ) {
@@ -88,6 +91,19 @@ my $svc_x = $cust_svc->svc_x;
 my $svc_unprovision_link = 
   qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?! .
   $cust_svc->svcnum .
-  qq!', 'Permanently unprovision and delete this service?')">Unprovision</A>!;
+  qq!', '!.emt('Permanently unprovision and delete this service?').qq!')">!.emt('Unprovision').'</A>';
+
+my $manage_link = $opt{'manage_link'};
+my $manage_target = '';
+if ( $part_svc->svcdb eq 'svc_broadband' and $manage_link ) {
+  my $ip_addr = $svc_x->ip_addr; #substitution for $manage_link
+  $manage_link = eval(qq("$manage_link"));
+  $opt{'manage_link_text'} ||= mt('Manage Device');
+  $opt{'manage_link_loc'}  ||= 'bottom';
+  $manage_target = ' target="_blank"' if $opt{'manage_link-new_window'};
+}
+else {
+  $manage_link = '';
+}
 
 </%init>