[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/11 21:24:41

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml 

Log message:
        patch #5087

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.817&tr2=1.818&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.137&tr2=1.138&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.817 mldonkey/distrib/ChangeLog:1.818
--- mldonkey/distrib/ChangeLog:1.817    Wed May 10 09:45:46 2006
+++ mldonkey/distrib/ChangeLog  Thu May 11 21:24:41 2006
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/05/11
+5087: HTML, upstats: new tooltip with complete filename,
+      respect max_name_len for filename
+
 2006/05/10
 5083: HTML: Update EDK file history links (unease)
 
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.137 
mldonkey/src/daemon/driver/driverCommands.ml:1.138
--- mldonkey/src/daemon/driver/driverCommands.ml:1.137  Tue May  9 10:05:25 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Thu May 11 21:24:41 2006
@@ -2226,6 +2226,11 @@
         let buf = o.conn_buf in
 
         if use_html_mods o then begin
+
+if !!html_mods_use_js_tooltips then Printf.bprintf buf 
+"\\<div id=\\\"object1\\\" style=\\\"position:absolute; 
background-color:FFFFDD;color:black;border-color:black;border-width:20;font-size:8pt;
 visibility:show; left:25px; top:
+-100px; z-index:+1\\\" onmouseover=\\\"overdiv=1;\\\"  
onmouseout=\\\"overdiv=0; 
setTimeout(\\\'hideLayer()\\\',1000)\\\"\\>\\&nbsp;\\</div\\>";
+
             Printf.bprintf buf "\\<div class=\\\"upstats\\\"\\>";
             html_mods_table_one_row buf "upstatsTable" "upstats" [
               ("", "srh", Printf.sprintf "Session: %s uploaded | Shared(%d): 
%s\n"
@@ -2274,9 +2279,21 @@
                   (Int64.to_string impl.impl_shared_size)
                   (Md4.to_string impl.impl_shared_id) in
 
-                Printf.bprintf buf "\\<tr class=\\\"%s\\\"\\>"
+                Printf.bprintf buf "\\<tr class=\\\"%s\\\""
                   (if (!counter mod 2 == 0) then "dl-1" else "dl-2";);
 
+          (if !!html_mods_use_js_tooltips then
+                        Printf.bprintf buf " 
onMouseOver=\\\"mOvr(this);setTimeout('popLayer(\\\\\'%s<br>%s\\\\\')',%d);setTimeout('hideLayer()',%d);return
 true;\\\" 
onMouseOut=\\\"mOut(this);hideLayer();setTimeout('hideLayer()',%d)\\\"\\>"
+                        (Http_server.html_real_escaped (Filename.basename 
impl.impl_shared_codedname))
+(*                     (match file_magic (file_find file.file_num) with
+                          None -> ""
+                        | Some magic -> "File type: " ^ magic ^ "<br>") *)
+                        ""
+                       !!html_mods_js_tooltips_wait
+                       !!html_mods_js_tooltips_timeout
+                       !!html_mods_js_tooltips_wait
+                        else Printf.bprintf buf " 
onMouseOver=\\\"mOvr(this);return true;\\\" onMouseOut=\\\"mOut(this);\\\"\\>");
+
                 let uploaded = Int64.to_float impl.impl_shared_uploaded in
                 let size = Int64.to_float impl.impl_shared_size in
 
@@ -2290,7 +2307,7 @@
                     (Filename.basename impl.impl_shared_codedname)
                   else
                     Printf.sprintf "\\<a href=\\\"%s\\\"\\>%s\\</a\\>"
-                      ed2k (Filename.basename impl.impl_shared_codedname)));
+                      ed2k (shorten (Filename.basename 
impl.impl_shared_codedname) !!max_name_len)));
                   ("", "sr", (if impl.impl_shared_id = Md4.null then "" else
                     Printf.sprintf "\\<a 
href=\\\"http://stats.razorback2.com/ed2khistory?ed2k=%s\\\"\\>%s\\</a\\>
                                     \\<a 
href=\\\"http://bitzi.com/lookup/ed2k:%s\\\"\\>%s\\</a\\>"