[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/26 12:05:53

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

Log message:
        patch #5320

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.972&r2=1.973
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonStats.ml?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.163&r2=1.164

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.972
retrieving revision 1.973
diff -u -b -r1.972 -r1.973
--- distrib/ChangeLog   26 Aug 2006 12:04:26 -0000      1.972
+++ distrib/ChangeLog   26 Aug 2006 12:05:53 -0000      1.973
@@ -15,6 +15,7 @@
 =========
 
 2006/08/26
+5320: some html_mods tables & css improvements (Schlumpf)
 5322: Use CXXFLAGS present at configure when compiling (smimram)
 
 2006/08/21

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/daemon/common/commonMessages.ml 6 Aug 2006 13:57:32 -0000       1.54
+++ src/daemon/common/commonMessages.ml 26 Aug 2006 12:05:53 -0000      1.55
@@ -114,6 +114,7 @@
 td.srw { padding-top: 2px; padding-bottom: 2px; padding-left: 4px; 
padding-right: 4px; font-family: verdana; font-size: 10px; color: 
@color_general_text@; }
 td.srh { cursor: pointer; vertical-align: top; background: 
@color_table_header_background@; white-space: nowrap; padding-top: 2px; 
padding-bottom: 2px; padding-left: 4px; padding-right: 4px;
 font-family: verdana; font-size: 10px; color: @color_general_text@;  }
+td.total { border-top: @color_general_border@ solid 1px; border-bottom: 
@color_general_border@ solid 1px; }
 tr.dl-1, td.dl-1 { background: @color_dl1_back@; }
 tr.dl-2, td.dl-2 { background: @color_dl2_back@; }
 .mOvr1, tr.mOvr1 {background: @color_mOver1_back@; cursor: pointer; }

Index: src/daemon/common/commonStats.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonStats.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/daemon/common/commonStats.ml    14 Dec 2005 21:22:07 -0000      1.2
+++ src/daemon/common/commonStats.ml    26 Aug 2006 12:05:53 -0000      1.3
@@ -259,8 +259,7 @@
       let seen_percent = if is_total then 100.0 else percent_of_ints 
r.brand_seen r_all.brand_seen in
       let freq_percent = if is_total then 100.0 else percent_of_ints 
r.brand_filerequest r_all.brand_filerequest in
 
-      let banned_percent = if is_total then percent_of_ints r.brand_banned 
r_all.brand_seen
-                                       else percent_of_ints r.brand_banned 
r_all.brand_banned in
+      let banned_percent = if is_total then 100.0 else percent_of_ints 
r.brand_banned r_all.brand_banned in
 
       let upload_percent = if is_total then 100.0 else percent_of_int64s 
r.brand_upload r_all.brand_upload in
       let upload_akbs = (Int64.to_float r.brand_upload) /.  (float_of_int 
uptime) /. 1024.0 in
@@ -272,26 +271,26 @@
                   else (Int64.to_float r.brand_download) /. (Int64.to_float 
r.brand_upload) in
 
       html_mods_td buf [
-        ("", "sr", brandlist_int_to_string l i);
-        ("", "sr", ":");
-        ("", "sr ar", Printf.sprintf "%d" r.brand_seen );
-        ("", "srp", Printf.sprintf "(%.f%%)" seen_percent );
-        ("", "sr", "|");
-        ("", "sr ar", Printf.sprintf "%d" r.brand_filerequest);
-        ("", "srp", Printf.sprintf "(%.f%%)" freq_percent);
-        ("", "sr", "|");
-        ("", "sr ar", Printf.sprintf "%d" r.brand_banned);
-        ("", "srp", Printf.sprintf "(%.0f%%)" banned_percent);
-        ("", "sr", "|");
-        ("", "sr ar", size_of_int64 r.brand_upload);
-        ("", "srp", Printf.sprintf "(%.0f%%)" upload_percent);
-        ("", "sr ar", Printf.sprintf "%.1f" upload_akbs);
-        ("", "sr", "|");
-        ("", "sr ar", size_of_int64 r.brand_download);
-        ("", "srp", Printf.sprintf "(%.0f%%)" download_percent );
-        ("", "sr ar", Printf.sprintf "%.1f" download_akbs);
-        ("", "sr", "|");
-        ("", "sr", Printf.sprintf "1:%.2f" ratio);
+        ("", (if is_total then "sr total" else "sr"), brandlist_int_to_string 
l i);
+        ("", (if is_total then "sr total" else "sr"), ":");
+        ("", (if is_total then "sr ar total" else "sr ar"), Printf.sprintf 
"%d" r.brand_seen );
+        ("", (if is_total then "srp total" else "srp"), Printf.sprintf 
"(%.f%%)" seen_percent );
+        ("", (if is_total then "sr total" else "sr"), "|");
+        ("", (if is_total then "sr ar total" else "sr ar"), Printf.sprintf 
"%d" r.brand_filerequest);
+        ("", (if is_total then "srp total" else "srp"), Printf.sprintf 
"(%.f%%)" freq_percent);
+        ("", (if is_total then "sr total" else "sr"), "|");
+        ("", (if is_total then "sr ar total" else "sr ar"), Printf.sprintf 
"%d" r.brand_banned);
+        ("", (if is_total then "srp total" else "srp"), Printf.sprintf 
"(%.f%%)" banned_percent);
+        ("", (if is_total then "sr total" else "sr"), "|");
+        ("", (if is_total then "sr ar total" else "sr ar"), size_of_int64 
r.brand_upload);
+        ("", (if is_total then "srp total" else "srp"), Printf.sprintf 
"(%.0f%%)" upload_percent);
+        ("", (if is_total then "sr ar total" else "sr ar"), Printf.sprintf 
"%.1f" upload_akbs);
+        ("", (if is_total then "sr total" else "sr"), "|");
+        ("", (if is_total then "sr ar total" else "sr ar"), size_of_int64 
r.brand_download);
+        ("", (if is_total then "srp total" else "srp"), Printf.sprintf 
"(%.0f%%)" download_percent );
+        ("", (if is_total then "sr ar total" else "sr ar"), Printf.sprintf 
"%.1f" download_akbs);
+        ("", (if is_total then "sr total" else "sr"), "|");
+        ("", (if is_total then "sr total" else "sr"), Printf.sprintf "1:%.2f" 
ratio);
       ];
 
       Printf.bprintf buf "\\</tr\\>\n";

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- src/daemon/driver/driverCommands.ml 12 Aug 2006 20:36:14 -0000      1.163
+++ src/daemon/driver/driverCommands.ml 26 Aug 2006 12:05:53 -0000      1.164
@@ -3153,9 +3153,9 @@
        List.iter (fun (tablename, l) ->
          html_mods_cntr_init ();
          html_mods_table_header buf tablename "servers" [
-           ( "0", "srh br", "Description (" ^ tablename ^ ")", "Description (" 
^ tablename ^ ")") ;
-           ( "0", "srh", "Hits", "Hits") ;
-           ( "0", "srh", "Range", "Range")];
+           ( "0", "srh ac br", "Description (" ^ tablename ^ ")", "Description 
(" ^ tablename ^ ")") ;
+           ( "0", "srh ac br", "Hits", "Hits") ;
+           ( "0", "srh ac", "Range", "Range")];
           let nhits, nranges = 
            Ip_set.bl_fold_left (fun br (nhits, nranges) ->
              if br.Ip_set.blocking_hits > 0 then begin
@@ -3163,8 +3163,8 @@
                  (html_mods_cntr ());
                html_mods_td buf [
                  ("Description", "sr br", br.Ip_set.blocking_description);
-                 ("Hits", "sr br", string_of_int br.Ip_set.blocking_hits);
-                 ("Range", "sr br", Printf.sprintf "%s - %s"
+                 ("Hits", "sr ar br", string_of_int br.Ip_set.blocking_hits);
+                 ("Range", "sr", Printf.sprintf "%s - %s"
                    (Ip.to_string br.Ip_set.blocking_begin)
                    (Ip.to_string br.Ip_set.blocking_end))];
                Printf.bprintf buf "\\</tr\\>";
@@ -3175,14 +3175,14 @@
            (html_mods_cntr ());
          if nranges > 0 then
          html_mods_td buf [
-           ("Total ranges", "sr br", ("Total " ^ string_of_int nranges));
-           ("Hits", "sr br", ("Total " ^ string_of_int nhits));
-           ("", "sr br", "")]
+           ("Total ranges", "sr br total", ("Total ranges " ^ string_of_int 
nranges));
+           ("Hits", "sr ar br total", Printf.sprintf "%s" (string_of_int 
nhits));
+           ("", "sr br total", "")]
          else begin
          html_mods_td buf [
-           ("no " ^ tablename ^ " loaded", "sr br", "no " ^ tablename ^ " 
loaded");
-           ("", "sr br", "");
-           ("", "sr br", "")];
+           ("no " ^ tablename ^ " loaded", "sr", "no " ^ tablename ^ " 
loaded");
+           ("", "sr", "");
+           ("", "sr", "")];
          end;
          Printf.bprintf buf "\\</tr\\>\\</table\\>\\<P\\>";
        ) [