[Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml

[mldonkey-commits]

Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.42 
mldonkey/src/daemon/driver/driverInteractive.ml:1.43
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.42        Sun Jul 17 
16:06:25 2005
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Sun Jul 17 23:15:04 2005
@@ -505,6 +505,8 @@
 //--\\>\\</script\\>
 
 \\<div class=main\\>
+\\<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)\\\"\\>pop up 
description layer\\</div\\>
 \\<form id=\\\"selectForm\\\" name=\\\"selectForm\\\" action=\\\"files\\\"\\>
 \\<table class=main cellspacing=0 cellpadding=0\\>
 
@@ -576,18 +578,22 @@
         [|
           (if downloading file then
               Printf.sprintf "
-                               onMouseOver=\\\"mOvr(this);return true;\\\" 
onMouseOut=\\\"mOut(this);\\\"\\>
+                               
onMouseOver=\\\"mOvr(this);popLayer('%s<br>Network: %s');return true;\\\" 
onMouseOut=\\\"mOut(this);hideLayer()\\\"\\>
                 \\<td class=\\\"dl al np\\\"\\>\\<input class=checkbox 
name=pause type=checkbox value=%d\\>\\</td\\>
                 \\<td class=\\\"dl al np\\\"\\>R\\</td\\>
                 \\<td class=\\\"dl al brs\\\"\\>\\<input class=checkbox 
name=cancel type=checkbox value=%d\\>\\</td\\>"
+               (Http_server.html_real_escaped file.file_name)
+               (net_name file)
                 file.file_num
                 file.file_num
             else
               Printf.sprintf "
-                               onMouseOver=\\\"mOvr(this);return true;\\\" 
onMouseOut=\\\"mOut(this);\\\"\\>
+                               
onMouseOver=\\\"mOvr(this);popLayer('%s<br>Network: %s');return true;\\\" 
onMouseOut=\\\"mOut(this);hideLayer()\\\"\\>
                 \\<td class=\\\"dl al np\\\"\\>P\\</td\\>
                 \\<td class=\\\"dl al np\\\"\\>\\<input class=checkbox 
name=resume type=checkbox value=%d\\>\\</td\\>
                 \\<td class=\\\"dl al brs\\\"\\>\\<input class=checkbox 
name=cancel type=checkbox value=%d\\>\\</td\\>"
+               (Http_server.html_real_escaped file.file_name)
+               (net_name file)
                 file.file_num
                 file.file_num);
 
@@ -600,15 +606,12 @@
             let downloaded = Int64.to_float file.file_downloaded in
             let size = if size < 1. then 1. else size in
             Printf.sprintf "\\<TD 
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\"
-                       title=\\\"[File#: %d] [Net: %s]%s\\\" class=\\\"dl 
al\\\"\\>%s\\<br\\>
+                       class=\\\"dl al\\\"\\>%s\\<br\\>
                        \\<table cellpadding=0 cellspacing=0 
width=100%%\\>\\<tr\\>
                        \\<td class=\\\"loaded\\\" style=\\\"height:%dpx\\\" 
width=\\\"%d%%\\\"\\> \\</td\\>
                        \\<td class=\\\"remain\\\" style=\\\"height:%dpx\\\" 
width=\\\"%d%%\\\"\\> \\</td\\>
                        \\</tr\\>\\</table\\>\\</td\\>"
             file.file_num
-            file.file_num
-                       (net_name file)
-                       (if !!max_name_len < String.length file.file_name then 
" " ^ file.file_name else "")
             (short_name file)
            (!!html_vd_barheight)
             (truncate (downloaded /. size *. 100.))
@@ -959,7 +962,7 @@
   let counter = ref 0 in
   if use_html_mods o then
   begin
-    Printf.bprintf buf "\\<div id=\\\"object1\\\" style=\\\"position:absolute; 
background-color:FFFFDD;color:black;border-color:black;border-width:20; 
visibility:show; left:25px; top:-100px; z-index:+1\\\" 
onmouseover=\\\"overdiv=1;\\\"  onmouseout=\\\"overdiv=0; 
setTimeout(\\\'hideLayer()\\\',1000)\\\"\\>pop up description 
layer\\</div\\>\n";
+    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)\\\"\\>pop up description 
layer\\</div\\>\n";
     html_mods_table_header buf "resultsTable" "results" [
       ( "0", "srh", "Network", "Network" ) ;
       ( "0", "srh", "File", "File (mouseover)" ) ;
@@ -1003,10 +1006,10 @@
                         match r.result_names with
                           [] -> ()
                         | name :: names ->
-                           Printf.bprintf buf "%s" (Http_server.html_escaped 
name);
+                           Printf.bprintf buf "%s" 
(Http_server.html_real_escaped name);
                             List.iter (fun s ->
                                if use_html_mods o then Printf.bprintf buf 
"\\<BR\\>";
-                                Printf.bprintf buf "       %s" 
(Http_server.html_escaped s)
+                                Printf.bprintf buf "       %s" 
(Http_server.html_real_escaped s)
                             ) names;
                         if use_html_mods o then Printf.bprintf buf "\\<BR\\>";
                       end;
@@ -1016,8 +1019,7 @@
                           | Field_UNKNOWN "FTH" | Field_UNKNOWN "urn" -> ()
                           | _ ->
                               Buffer.add_string buf ((if !nl then "<br>" else 
begin nl := true;"" end) ^
-                                  "|| (" ^
-                                escaped_string_of_field t ^ "): " ^ 
get_tag_value t);
+                                escaped_string_of_field t ^ ": " ^ 
get_tag_value t);
                       ) r.result_tags;
                       Printf.bprintf buf "')\\\" class=\\\"sr\\\"\\>\\<a 
href=results\\?d=%d target=\\\"$S\\\"\\>" r.result_num
                     end