Changeset 4865

Timestamp:

Mar 31, 2009, 9:31:04 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1284: Viev and download icons for file should show file size

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (2 diffs)
• www/filemanager/files/list_files.jsp (modified) (3 diffs)
• www/filemanager/files/view_file.jsp (modified) (4 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -1599 +1599 @@
       String downloadIcon = "download";
       String separator = " | ";
+      String bytes = Values.formatBytes(file.getSize(), 1);
       if (root != null)
       {
@@ -1606 +1607 @@
       }
       link += " [<a href=\"javascript:Main.viewFile('" + ID + "', " + file.getId() + ")\"" + 
-        " title=\"View the contents of this file\">" + viewIcon + "</a>" + 
+        " title=\"View the contents of this file (" + bytes + ")\">" + viewIcon + "</a>" + 
         separator + 
         "<a href=\"javascript:Main.downloadFile('" + ID + "', " + file.getId() + ")\"" + "" +
-        " title=\"Download the contents of this file\">" + downloadIcon + "</a>]";
+        " title=\"Download the contents of this file (" + bytes + ")\">" + downloadIcon + "</a>]";
     }
     return link;

trunk/www/filemanager/files/list_files.jsp

@@ -787 +787 @@
               String tagPath = HTML.encodeTags(path);
               String icon = item.isCompressed() ? "file_compressed.gif" : "file.gif";
+              String fileSize = Values.formatBytes(item.getSize(), numDecimals);
               index++;
               numListed++;
@@ -835 +836 @@
                   onclick="fileOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
-                <tbl:cell column="size"><%=Values.formatBytes(item.getSize(), numDecimals)%></tbl:cell>
-                <tbl:cell column="compressedSize"><%=Values.formatBytes(item.getCompressedSize(), numDecimals)%></tbl:cell>
+                <tbl:cell column="size"><span title="<%=item.getSize()%> bytes"><%=fileSize%></span></tbl:cell>
+                <tbl:cell column="compressedSize"><span title="<%=item.getCompressedSize()%> bytes"><%=Values.formatBytes(item.getCompressedSize(), numDecimals)%></span></tbl:cell>
                 <tbl:cell column="compressed"><%=item.isCompressed() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="writeProtected"><%=item.isWriteProtected() ? "yes" : "no"%></tbl:cell>
@@ -865 +866 @@
                   {
                     %>
-                    <a href="javascript:Main.viewFile('<%=ID%>', <%=itemId%>)"><base:icon image="view.gif" tooltip="View the contents of this file" /></a>
-                    <a href="javascript:Main.downloadFile('<%=ID%>', <%=itemId%>)"><base:icon image="download.gif" tooltip="Download the contents of this file" /></a>
+                    <a href="javascript:Main.viewFile('<%=ID%>', <%=itemId%>)"><base:icon image="view.gif" tooltip="<%="View the contents of this file (" + fileSize + ")"%>" /></a>
+                    <a href="javascript:Main.downloadFile('<%=ID%>', <%=itemId%>)"><base:icon image="download.gif" tooltip="<%="Download the contents of this file (" + fileSize + ")"%>" /></a>
                     <%
                   }

trunk/www/filemanager/files/view_file.jsp

@@ -76 +76 @@
   String path = file.getPath().toString();
   String urlPath = HTML.urlEncode(path);
+  String bytes = Values.formatBytes(file.getSize(), 2);
   
   final boolean writePermission = file.hasPermission(Permission.WRITE);
@@ -302 +303 @@
         {
           %>
-          [<a href="javascript:Main.viewFile('<%=ID%>', <%=itemId%>)"><base:icon image="view.gif" tooltip="View the contents of this file" /></a>
-          <a href="javascript:Main.downloadFile('<%=ID%>', <%=itemId%>)"><base:icon image="download.gif" tooltip="Download the contents of this file" /></a>
+          [<a href="javascript:Main.viewFile('<%=ID%>', <%=itemId%>)"><base:icon image="view.gif" tooltip="<%="View the contents of this file (" + bytes + ")"%>" /></a>
+          <a href="javascript:Main.downloadFile('<%=ID%>', <%=itemId%>)"><base:icon image="download.gif" tooltip="<%="Download the contents of this file (" + bytes + ")"%>" /></a>
           <%
           if (file.hasPermission(Permission.WRITE) && !file.isWriteProtected())
@@ -363 +364 @@
       <tr>
         <td class="prompt">Size</td>
-        <td><%=Values.formatBytes(file.getSize())%></td>
+        <td title="<%=file.getSize()%> bytes"><%=bytes%></td>
       </tr>
       <%
@@ -371 +372 @@
         <tr>
           <td class="prompt">Compressed Size</td>
-          <td><%=Values.formatBytes(file.getCompressedSize())%></td>
+          <td title="<%=file.getCompressedSize()%> bytes"><%=Values.formatBytes(file.getCompressedSize())%></td>
         </tr>
         <%