nicer tables

diff --git a/calls.pl b/calls.pl
index b56a639e41aac5ba77e0c820baf47a43376c2bbe..9c3c3e0a1f68ad714e0a5bcba33bad1aef630272 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -26,7 +26,7 @@ my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Defense Calls');
 
-die "You don't have access" unless isBC();
+die "You don't have access" unless isDC();
 
 my $call;
 if (param('call') =~ /^(\d+)$/){

diff --git a/covop.pl b/covop.pl
index 180a0a4f05412cb4c814e641cd033c520e189504..9c8284d33ddeba4ec3f11b654268045e8d885bec 100644 (file)
--- a/covop.pl
+++ b/covop.pl
@@ -57,10 +57,12 @@ FROM covop_targets c JOIN current_planet_stats p ON p.id = c.planet
 $query->execute($ND::PLANET);
 
 my @targets;
+my $i = 0;
 while (my ($id,$coords,$metal,$crystal,$eonium,$seccents,$dists,$lastcovop,$user,$max) = $query->fetchrow){
        push @targets,{Username => $user, Target => $id, Coords => $coords
                , Metal => $metal, Crystal => $crystal, Eonium => $eonium, SecCents => $seccents
-               , Dists => $dists, MaxResHack => $max, LastCovOp => $lastcovop, List => $list};
+               , Dists => $dists, MaxResHack => $max, LastCovOp => $lastcovop, List => $list, ODD => $i % 2};
+       $i++;
 }
 $BODY->param(Targets => \@targets);
 

diff --git a/intel.pl b/intel.pl
index 65f847a46921823807a09f90eed602c74c95f12c..c1beff473da2c6281a714af4d1fe9e2d4d9ed25d 100644 (file)
--- a/intel.pl
+++ b/intel.pl
@@ -136,26 +136,32 @@ if ($planet){
        $query->execute($planet->{id}) or $error .= $DBH->errstr;
        my @intellists;
        my @intel;
+       my $i = 0;
        while (my $intel = $query->fetchrow_hashref){
                if ($intel->{ingal}){
                        $intel->{missionclass} = 'ingal';
                }else{
                        $intel->{missionclass} = $intel->{mission};
                }
+               $intel->{ODD} = $i % 2;
                push @intel,$intel;
+               $i++;
        }
        push @intellists,{Message => 'Incoming fleets', Intel => \@intel, Origin => 1};
 
        my $query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks"));
        $query->execute($planet->{id}) or $error .= $DBH->errstr;
        my @intel;
+       my $i = 0;
        while (my $intel = $query->fetchrow_hashref){
                if ($intel->{ingal}){
                        $intel->{missionclass} = 'ingal';
                }else{
                        $intel->{missionclass} = $intel->{mission};
                }
+               $intel->{ODD} = $i % 2;
                push @intel,$intel;
+               $i++;
        }
        push @intellists,{Message => 'Outgoing Fleets', Intel => \@intel, Target => 1};
 
@@ -171,13 +177,16 @@ if ($planet){
 
        my @intellists;
        my @intel;
+       my $i = 0;
        while (my $intel = $query->fetchrow_hashref){
                if ($intel->{ingal}){
                        $intel->{missionclass} = 'ingal';
                }else{
                        $intel->{missionclass} = $intel->{mission};
                }
+               $intel->{ODD} = $i % 2;
                push @intel,$intel;
+               $i++;
        }
        push @intellists,{Message => q{Intel where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1};
        $BODY->param(IntelLIsts => \@intellists);

diff --git a/points.pl b/points.pl
index c75130c361fbab5390f54d065d3b17c67045ac33..464ad18f79efe85872e0a941dc0f430a74a86491 100644 (file)
--- a/points.pl
+++ b/points.pl
@@ -43,9 +43,11 @@ my $query = $DBH->prepare("SELECT username,defense_points,attack_points,scan_poi
 $query->execute;
 
 my @members;
+my $i = 0;
 while (my ($username,$defense,$attack,$scan,$humor,$total,$rank) = $query->fetchrow){
        push @members,{Username => $username, Defense => $defense, Attack => $attack
-               , Scan => $scan, Humor => $humor, Total => $total, Rank => $rank};
+               , Scan => $scan, Humor => $humor, Total => $total, Rank => $rank, ODD => $i % 2};
+       $i++;
 }
 $BODY->param(Members => \@members);
 

diff --git a/templates/covop.tmpl b/templates/covop.tmpl
index 29d36b1625239e0135aa4da40bf20e0f600aaeef..aef3e6a0b043321faafdd9db346e1d04e9a7129b 100644 (file)
--- a/templates/covop.tmpl
+++ b/templates/covop.tmpl
@@ -1,9 +1,9 @@
-<table border="1">
+<table>
        <tr>
        <th>Coords</th><th>Metal</th><th>Crystal</th><th>Eonium</th><th>% Sec Centres</th><th>Dists</th><th>Max (15 agents)</th><th>Last covop (tick)</th>
        </tr>
        <TMPL_LOOP Targets>
-       <tr align="center">
+       <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
        <td><TMPL_VAR NAME=Metal></td>
        <td><TMPL_VAR NAME=Crystal></td>

diff --git a/templates/intel.tmpl b/templates/intel.tmpl
index 5649740aed80e3ce5cc0de243654a15601566672..7233ff204b683f72c471a8f9002bff95ddc926c6 100644 (file)
--- a/templates/intel.tmpl
+++ b/templates/intel.tmpl
@@ -85,7 +85,7 @@
                <th>Ingal</th><th>Reported by</th>
        </tr>
        <TMPL_LOOP Intel>
-       <tr>
+       <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <TMPL_IF Origin>
        <td><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        <td><TMPL_VAR NAME=OAlliance></td>

diff --git a/templates/points.tmpl b/templates/points.tmpl
index 3aa7f04245d3bb3f75fe50affee538b6340fd186..2441baf41109a864cd0cd3d28f06185b6aaba5b5 100644 (file)
--- a/templates/points.tmpl
+++ b/templates/points.tmpl
@@ -1,4 +1,4 @@
-<table border="1">
+<table>
        <tr>
        <th>User</th>
        <th><a href="index.pl?page=points&amp;type=total">Total</a></th>
@@ -9,7 +9,7 @@
        <th><a href="index.pl?page=points&amp;type=rank">ND Rank</a></th>
        </tr>
        <TMPL_LOOP Members>
-       <tr>
+       <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <td><TMPL_VAR NAME=Username></td>
        <td><TMPL_VAR NAME=Total></td>
        <td><TMPL_VAR NAME=Defense></td>

diff --git a/templates/top100.tmpl b/templates/top100.tmpl
index 6e6848beb4daf15a153078fb1788a5713e641d6e..20f73034f5dd9e0275cfd0ce39380a64d38da02b 100644 (file)
--- a/templates/top100.tmpl
+++ b/templates/top100.tmpl
@@ -1,6 +1,6 @@
 <p><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
        <a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
-<table border="1">
+<table>
        <tr><th>Coords</th><th>Planet</th><th>Race</th>
        <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size (rank)</a></th>
        <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score (rank)</a></th>
@@ -13,7 +13,7 @@
        </TMPL_IF>
        </tr>
        <TMPL_LOOP Planets>
-       <tr align="center">
+       <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
        <td><TMPL_VAR NAME=Planet></td>
        <td><TMPL_VAR NAME=Race></td>

diff --git a/top100.pl b/top100.pl
index 9611a17acfd4d6c6e30628b7b0cb041b6dd75c09..20b0bd1f8c8b582282f30444b997a53742320732 100644 (file)
--- a/top100.pl
+++ b/top100.pl
@@ -55,6 +55,7 @@ my $query = $DBH->prepare(qq{SELECT id,coords(x,y,z), ruler, planet,race,
        $extra_columns FROM current_planet_stats ORDER BY $order LIMIT 100 OFFSET ?});
 $query->execute($offset);
 my @planets;
+my $i = 0;
 while (my ($id,$coords,$ruler,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank
                ,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){
        my %planet = (Coords => $coords, Planet => "$ruler OF $planet", Race => $race, Size => "$size ($sizerank)"
@@ -67,7 +68,9 @@ while (my ($id,$coords,$ruler,$planet,$race,$size,$score,$value,$xp,$sizerank,$s
                $planet{Relationship} = $relationship;
                $planet{isHC} = 1;
        }
+       $planet{ODD} = $i % 2;
        push @planets,\%planet;
+       $i++;
 }
 $BODY->param(Planets => \@planets);