X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fattachments.html;h=d51d826453cb6ff153dbe69d8ee7c6667709b7f8;hb=21ed0448f9f490cf9ffa9d74d7e70035025d5449;hp=53635fd6269385ba41c7d16122308dc7a885b959;hpb=ae898cc8e6de40fbecb30c973f91cd955434b159;p=freeside.git

diff --git a/httemplate/view/cust_main/attachments.html b/httemplate/view/cust_main/attachments.html
index 53635fd62..d51d82645 100755
--- a/httemplate/view/cust_main/attachments.html
+++ b/httemplate/view/cust_main/attachments.html
@@ -1,18 +1,19 @@
 % if ( scalar(@attachments) ) {
 
-  <% include('/elements/init_overlib.html') %>
+  <& /elements/init_overlib.html &>
 
-  <% include("/elements/table-grid.html") %>
+  <& /elements/table-grid.html &>
 
   <TR>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
 %   if ( $conf->exists('cust_main_note-display_times') ) {
-      <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Time') |h %></TH>
 %   }
-    <TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Filename</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Size</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Person') |h %></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Filename') |h %></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Type') |h %></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Size') |h %></TH>
     <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
   </TR>
 
@@ -47,46 +48,50 @@
 %       my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
 %                           "custnum=$custnum;attachnum=$attachnum;".
 %                           "undelete=1",
-%                           'Undelete attachment');
-%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(undelete)</A>!;
+%                           emt('Undelete attachment'));
+%       $edit .= linkstr($clickjs, emt('undelete'));
 %     }
 %     if ($curuser->access_right('Purge attachment')) {
 %       my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
 %                           "custnum=$custnum;attachnum=$attachnum;".
 %                           "purge=1",
-%                           'Purge attachment');
-%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(purge)</A>!;
+%                           emt('Purge attachment'),
+%                           emt('Permanently remove this file?') );
+%       $edit .= linkstr($clickjs,emt('purge'));
 %     }
 %   }
 %   else { # you can download or edit it
 %     if ($curuser->access_right('Edit attachment') ) {
 %       my $clickjs = popup('edit/cust_main_attach.cgi?'.
 %                           "custnum=$custnum;attachnum=$attachnum",
-%                           'Edit attachment properties');
-%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(edit)</A>!;
+%                           emt('Edit attachment properties'));
+%       $edit .= linkstr($clickjs,emt('edit'));
 %     }
 %     if($curuser->access_right('Delete attachment') ) {
 %       my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
-%                           "custnum=$custnum;attachnum=$attachnum;".
-%                           "delete=1",
-%                           'Delete attachment');
-%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(delete)</A>!;
+%                           "custnum=$custnum;attachnum=$attachnum;delete=1",
+%                           'Delete attachment',
+%                           'Delete this file?');
+%       $edit .= linkstr($clickjs,emt('delete'));
 %     }
 %     if ($curuser->access_right('Download attachment') ) {
-%       $edit .= qq!&nbsp; <A HREF="!.popurl(1).'attachment.html?'.$attachnum.qq!">(download)</A>!;
+%       $edit .= qq!&nbsp; <A HREF="!.popurl(1).'attachment.html?'.$attachnum.qq!">(!
+%                               . emt('download') .')</A>';
 %     }
 %   }
 
     <TR>
       <% note_datestr($attach,$conf,$bgcolor) %>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-        &nbsp;<% $attach->otaker%>
+        &nbsp;<% $attach->usernum ? $attach->access_user->name : $attach->otaker %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-       &nbsp;<% $attach->filename %>
+       &nbsp;<% $attach->filename |h %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-       &nbsp;<% $attach->mime_type %>
+       &nbsp;<% $attach->title |h %>
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+       &nbsp;<% $attach->mime_type |h %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
        &nbsp;<% size_units( $attach->size ) %>
@@ -105,7 +110,7 @@
 
 my $conf = new FS::Conf;
 my $curuser = $FS::CurrentUser::CurrentUser;
-
+die "access denied" if !$curuser->access_right('View attachments');
 my(%opt) = @_;
 
 my $custnum = $opt{'custnum'};
@@ -127,6 +132,11 @@ sub note_datestr {
   $strip;
 }
 
+sub linkstr {
+    my ($clickjs, $label) = (shift,shift);
+    '&nbsp; <A HREF="javascript:void(0);" '. $clickjs . '>(' . emt($label) . ')</A>';
+}
+
 sub size_units {
   my $bytes = shift;
   return $bytes if $bytes < 1024;
@@ -135,15 +145,16 @@ sub size_units {
 }
 
 sub popup {
-  my ($url, $label) = @_;
+  my ($url, $label, $confirm) = @_;
   my $onclick = 
     include('/elements/popup_link_onclick.html',
       'action'     => popurl(2).$url,
       'actionlabel' => $label,
-      'width'       => 616,
-      'height'      => 408,
+      'width'       => 510,
+      'height'      => 315,
       'frame'       => 'top',
     );
+  $onclick = qq!if(confirm('$confirm')) { $onclick }! if $confirm;
   return qq!onclick="$onclick"!;
 }