More changes to quickstats.

diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index ee2d2f4..ef67882 100755 (executable)
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -160,6 +160,8 @@ sub Body($) {
 
   MakeButtons $type;
 
+  print start_div {-id => 'highlightrow'};
+
   print start_table({-align        => 'center',
                      -id           => $table_name,
                      -border       => 0,
@@ -169,7 +171,7 @@ sub Body($) {
 
   print
     Tr [
-      td {-class  => 'tablebordertopleft'},  ' ',
+      th {-class  => 'tablebordertopleft'},  '',
       th {-class  => 'tableborder'},         'Sender',
       th {-class  => 'tableborder'},         'List',
       th {-class  => 'tableborder'},         'Hit Count',
@@ -357,10 +359,12 @@ sub Body($) {
   } # for
 
   print end_table;
-  print end_form;
+  print end_div;
 
   MakeButtons $type;
 
+  print end_form;
+
   return;
 } # Body
 

diff --git a/maps/bin/stats.cgi b/maps/bin/stats.cgi
index 4b3cdfb..8163c41 100755 (executable)
--- a/maps/bin/stats.cgi
+++ b/maps/bin/stats.cgi
@@ -28,7 +28,7 @@ use MAPSLog;
 use MAPSWeb;
 use DateUtils;
 
-use CGI qw (:standard *table start_Tr end_Tr);
+use CGI qw (:standard *table start_Tr end_Tr start_div end_div);
 use CGI::Carp 'fatalsToBrowser';
 
 my $nbr_days = param('nbr_days');
@@ -41,6 +41,8 @@ $date = defined $date ? $date : Today2SQLDatetime;
 sub Body($) {
   my ($userid) = @_;
 
+  print start_div {-id => 'highlightrow'};
+
   print start_table ({-align       => 'center',
                       -id          => $table_name,
                       -border      => 0,
@@ -117,6 +119,7 @@ sub Body($) {
 
   print end_Tr;
   print end_table;
+  print end_div;
 
   return;
 } # Body

diff --git a/maps/css/MAPSStyle.css b/maps/css/MAPSStyle.css
index cc790d5..5849c91 100644 (file)
--- a/maps/css/MAPSStyle.css
+++ b/maps/css/MAPSStyle.css
@@ -75,6 +75,49 @@ body {
   width:        125px;
 }
 
+#highlightrow table tr:hover td {
+  background:      #c1dffc;
+  color:           steelblue;
+}
+
+#quickstats {
+    background-color: #579;
+}
+#quickstats table {
+  width:            100%;
+  overflow:         hidden;
+  border-collapse:  collapse;
+}
+#quickstats tr {
+    color:          white;
+    display:        block;
+}
+#quickstats tr:hover {
+  background:       #c1dffc;
+  color:            steelblue;
+}
+#quickstats a {
+  color:            white;
+  text-decoration:  none;
+}
+#quickstats td a:hover {
+  background:       #c1dffc;
+  color:            steelblue;
+}
+#quickstats tr td:first-child {
+  position:         relative;
+}
+#quickstats a:before {
+  content:          '';
+  position:         absolute;
+  left:             0;
+  top:              0;
+  bottom:           0;
+  display:          block;
+  width:            142px;
+}
+
+
 #quickwrap {
   width: 130px;
 }
@@ -95,11 +138,12 @@ body {
   font-size:       12px;
   font-weight:     bold;
 }
+
 #quickwrap td.link a:hover {
   background:      #c1dffc;
   color:           steelblue;
 }
-table tr:hover td {
+#quickwrap table tr:hover td {
   background:      #c1dffc;
   color:           steelblue;
 }
@@ -159,12 +203,16 @@ table tr:hover td {
   font-weight: bold;
   line-height: 12px;
   font-size:   12px;
+  text-align:  left;
+  width:       68px;
 }
 
 .smallnumber {
   color:       white;
   line-height: 12px;
   font-size:   12px;
+  text-align:  right;
+  width:       25px;
 }
 
 .header {
@@ -504,6 +552,7 @@ img {
   background:    White;
   border-left:   1px dotted #ccc;
   border-bottom: 1px dotted #ccc;
+  border-top:    1px dotted #ccc;
   font-size:     14px;
 }
 

diff --git a/maps/lib/MAPSWeb.pm b/maps/lib/MAPSWeb.pm
index 5097b77..5425480 100644 (file)
--- a/maps/lib/MAPSWeb.pm
+++ b/maps/lib/MAPSWeb.pm
@@ -70,7 +70,7 @@ sub displayquickstats($) {
   print p {-align     => 'center'},
     b ('as of ' . FormatTime($time));
 
-  print start_div {-id => 'quickwrap'};
+  print start_div {-id => 'quickstats'};
 
   print start_table {
     -cellspacing => 0,

diff --git a/maps/php/MAPS.php b/maps/php/MAPS.php
index 6ccc76d..6f1a8ba 100755 (executable)
--- a/maps/php/MAPS.php
+++ b/maps/php/MAPS.php
@@ -254,40 +254,40 @@ function displayquickstats() {
     "<a href=\"/maps/bin/detail.cgi?type=nulllist;date=$today\">";
 
 print <<<EOT
-<div id="quickwrap">
+<div id="quickstats">
 <table cellpadding="2" border="0" align="center" cellspacing="0">
   <tr align="right">
-    <td align="right" class="smalllabel">Processed</td>
+    <td align="left" class="smalllabel">Processed</td>
     <td align="right" class="smallnumber">$processed</td>
     <td align="right" class="smallnumber">n/a</td>
   </tr>
   <tr align="right">
-    <td class="link">${nulllist_link}Nulllist</a></td>
+    <td class="smalllabel">${nulllist_link}Nulllist</a></td>
     <td class="smallnumber">$nulllist</td>
     <td class="smallnumber">$nulllist_pct%</td>
   </tr>
   <tr align="right">
-    <td class="link">${returned_link}Returned</a></td>
+    <td class="smalllabel">${returned_link}Returned</a></td>
     <td class=smallnumber>$returned</td>
     <td class="smallnumber">$returned_pct%</td>
   </tr>
   <tr align="right">
-    <td class="link">${whitelist_link}Whitelist</a></td>
+    <td class="smalllabel">${whitelist_link}Whitelist</a></td>
     <td class="smallnumber">$whitelist</td>
     <td class="smallnumber">$whitelist_pct%</td>
   </tr>
   <tr align="right">
-    <td class="link">${blacklist_link}Blacklist</a></td>
+    <td class="smalllabel">${blacklist_link}Blacklist</a></td>
     <td class="smallnumber">$blacklist</td>
     <td class="smallnumber">$blacklist_pct%</td>
   </tr>
   <tr align="right">
-    <td class="link">${registered_link}Registered</a></td>
+    <td class="smalllabel">${registered_link}Registered</a></td>
     <td class="smallnumber">$registered</td>
     <td class="smallnumber">n/a</td>
   </tr>
   <tr align="right">
-    <td class="link">${mailloop_link}Mailloop</a></td>
+    <td class="smalllabel">${mailloop_link}Mailloop</a></td>
     <td class="smallnumber">$mailloop</td>
     <td class="smallnumber">n/a</td>
   </tr>
@@ -479,11 +479,11 @@ function ListDomains($top = 10) {
   $result = mysqli_query($db, $statement)
     or DBError("ListDomains: Unable to execute query: ", $statement);
 
+  print "<div id=highlightrow>";
   print <<<END
   <table border="0" cellspacing="0" cellpadding="4" align="center" name="domainlist">
     <tr>
-      <th class="tableleftend">Mark</th>
-      <th class="tableheader">Ranking</th>
+      <th class="tableleftend">&nbsp;</th>
       <th class="tableheader">Domain</th>
       <th class="tablerightend">Returns</th>
     </tr>
@@ -491,21 +491,19 @@ END;
 
   // Get results
   for ($i = 0; $i < $top; $i++) {
-    $row = mysqli_fetch_array ($result);
+    $row = mysqli_fetch_array($result);
     $domain = $row["domain"];
     $nbr    = $row["nbr"];
 
     print "<tr>";
     $ranking = $i + 1;
     if ($i < $top - 1) {
-      print "<td class=tableleftdata align=center><input type=checkbox name=action" . $i . " value=on></td>\n";
-      print "<td align=center class=tabledata>" . $ranking . "</td>";
+      print "<td align=center class=tableleftdata>" . $ranking . "<input type=checkbox name=action" . $i . " value=on></td>\n";
       print "<td class=tabledata><a href=\"http://$domain\">$domain</as></td>";
       print "<input type=hidden name=email$i value=\"@$domain\">";
       print "<td align=center class=tablerightdata>$nbr</td>";
     } else {
-      print "<td class=tablebottomleft align=center><input type=checkbox name=action" . $i . " value=on></td>\n";
-      print "<td align=center class=tablebottomdata>" . $ranking . "</td>";
+      print "<td align=center class=tablebottomleft>" . $ranking . "<input type=checkbox name=action" . $i . " value=on></td>\n";
       print "<td class=tablebottomdata><a href=\"http://$domain\">$domain</a></td>";
       print "<input type=hidden name=email$i value=\"@$domain\">";
       print "<td align=center class=tablebottomright>$nbr</td>";
@@ -519,6 +517,7 @@ END;
     </td>
   </tr>
 <table>
+</div>
 END;
 } // ListDomains
 

diff --git a/maps/php/list.php b/maps/php/list.php
index 964f061..04ba543 100755 (executable)
--- a/maps/php/list.php
+++ b/maps/php/list.php
@@ -60,7 +60,7 @@ $this_page = $next / $lines + 1;
 </div>
 
 <div class="content">
-  <?php NavigationBar ($userid)?>
+  <?php NavigationBar($userid)?>
   <form method="post" action="/maps/bin/processaction.cgi" name="list">
   <div align="center">
   <?php
@@ -101,6 +101,7 @@ $this_page = $next / $lines + 1;
       onclick="return ClearAll (document.list);">
     <?php print $next_button?>
   </div>
+  <div id="highlightrow">
   <table border="0" cellspacing="0" cellpadding="4" width="100%" align="center" name="list">
     <tr>
       <th class="tableleftend">&nbsp;</th>
@@ -118,6 +119,7 @@ $this_page = $next / $lines + 1;
   </table>
   <br>
   </form>
+  </div>
   <div align=center>
     <form method="post" enctype="multipart/form-data"
       action="/maps/bin/importlist.cgi?type=<?php echo $type?>">

diff --git a/maps/world.gif b/maps/world.gif
deleted file mode 100644 (file)
index d4e1a93..0000000
Binary files a/maps/world.gif and /dev/null differ