[freeside-commits] freeside/httemplate/elements tr-cust_svc.html, 1.5, 1.6

[Mark Wells]

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

Modified Files:
	tr-cust_svc.html 
Log Message:
improve svc_broadband "manage device" link, #14696

Index: tr-cust_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-cust_svc.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- tr-cust_svc.html	22 Jun 2011 22:20:43 -0000	1.5
+++ tr-cust_svc.html	11 Nov 2011 03:13:07 -0000	1.6
@@ -12,7 +12,9 @@
                 '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,7 +27,11 @@
   <TD STYLE="padding-bottom:0px"><B><%
 FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc)
 %></B></TD>
-<TD><% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %></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 %>"><% $opt{'manage_link_text'} |h %></A>
+% }
+</TD>
 </TR>
 % if ( $cust_svc->overlimit ) {
 <TR>
@@ -55,16 +61,12 @@
 % # 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")) 
-      %>"><% mt('Manage Device') |h %></A>&nbsp;)</FONT>
+%   if ( $manage_link and $opt{'manage_link_loc'} eq 'bottom' ) {
+      <FONT SIZE="-2">(&nbsp;<A HREF="<% $manage_link %>"><% $opt{'manage_link_text'} |h %></A>&nbsp;)</FONT>
 %   }
 % } #svc_broadband
 % if ( $curuser->access_right('Unprovision customer service') ) {
@@ -91,4 +93,15 @@
   $cust_svc->svcnum .
   qq!', '!.emt('Permanently unprovision and delete this service?').qq!')">!.emt('Unprovision').'</A>';
 
+my $manage_link = $opt{'manage_link'};
+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';
+}
+else {
+  $manage_link = '';
+}
+
 </%init>