show ship classes and add links on def calls overview

diff --git a/ND/Web/Pages/Calls.pm b/ND/Web/Pages/Calls.pm
index 73b0916b118515feca901ff848c31fa9b252625f..6cb626a13c2e5e70d459159538f90e7ca42a7454 100644 (file)
--- a/ND/Web/Pages/Calls.pm
+++ b/ND/Web/Pages/Calls.pm
@@ -245,6 +245,7 @@ sub render_body {
                                push @calls,{};
                                $i = 0;
                        }
+                       $call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
                        $call->{dc} = 'Hostile' unless defined $call->{dc};
                        $i++;
                        $call->{ODD} = $i % 2;

diff --git a/ND/Web/Pages/Check.pm b/ND/Web/Pages/Check.pm
index 48186b3d290cfaa6778c564415d16e4c8b9d3bb1..394c8b02ee95c8061a8688a81b3a84c4edbabcb8 100644 (file)
--- a/ND/Web/Pages/Check.pm
+++ b/ND/Web/Pages/Check.pm
@@ -166,6 +166,14 @@ sub render_body {
                $scan .= q{</table>};
                push @scans, {Scan => $scan};
 
+               $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
+                       GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
+               $query->execute($planet_id);
+               my %scans;
+               while (my($type,$scan_id,$tick,$scan) = $query->fetchrow){
+                       $scans{$type} = [$scan_id,$tick,$scan];
+               }
+
                $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ? ORDER BY tick ASC});
                $scan = q{
                <p>Previous Coords</p>
@@ -181,16 +189,10 @@ sub render_body {
                        }
                }
                $scan .= q{</table>};
+               $scan .= $scans{'Ship Classes'}->[2] if $scans{'Ship Classes'};
                push @scans, {Scan => $scan};
 
-               $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
-                       GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
-               $query->execute($planet_id);
-               my %scans;
-               while (my($type,$scan_id,$tick,$scan) = $query->fetchrow){
-                       $scans{$type} = [$scan_id,$tick,$scan];
-               }
-               for my $type ('Planet','Jumpgate','Unit','Advanced Unit','Fleet Analysis','Surface Analysis','Technology Analysis','News'){
+               for my $type ('Planet','Jumpgate','Unit','Advanced Unit','Surface Analysis','Technology Analysis','Fleet Analysis','News'){
                        next unless exists $scans{$type};
                        my $scan_id = $scans{$type}->[0];
                        my $tick = $scans{$type}->[1];

diff --git a/default.css b/default.css
index 5beb2b682fabb187498cd9d6b978ee6ac2b3ff0e..80ea9093986e8cb161e03a672cc590ac5d918dd1 100644 (file)
--- a/default.css
+++ b/default.css
@@ -187,6 +187,10 @@ td.MediumPrio{
        background: yellow;
        color: black;
 }
+td.MediumPrio a{
+       background: yellow;
+       color: black;
+}
 td.HighestPrio{
        background: green;
        color: black;

diff --git a/templates/calls.tmpl b/templates/calls.tmpl
index ebedb759df7c5b6ca15112c3c8c1fdb5efe5bc7f..79cabf30e7c74c47bcc4e98e3b9799d8d2a827d4 100644 (file)
--- a/templates/calls.tmpl
+++ b/templates/calls.tmpl
@@ -68,7 +68,7 @@
        </tr>
        <TMPL_LOOP Attackers>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="check?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="/check?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td class="<TMPL_VAR NAME=Planet_status>"><TMPL_VAR NAME=Planet_status></td>
                <td class="<TMPL_VAR NAME=Relationship>"><TMPL_VAR NAME=Alliance> (<TMPL_VAR NAME=Relationship>)</td>
                <td><TMPL_VAR NAME=Race></td>
@@ -91,7 +91,7 @@
 <TMPL_LOOP Calls>
        <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
                <td class="<TMPL_VAR NAME=DC>"><a href="/<TMPL_VAR NAME=PAGE>?call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
-               <td class='<TMPL_VAR NAME=DefPrio>'><TMPL_VAR NAME=Coords> <TMPL_IF Id>(<TMPL_VAR NAME=Defense_points>)<TMPL_ELSE>-New Day-</TMPL_IF></td>
+               <td class='<TMPL_VAR NAME=DefPrio>'><TMPL_IF Id><a href="/check?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords> (<TMPL_VAR NAME=Defense_points>)</a><TMPL_ELSE>-New Day-</TMPL_IF></td>
                <td><TMPL_VAR NAME=Landing_tick></td>
                <td><TMPL_VAR NAME=Race></td>
                <td><TMPL_VAR NAME=Amount></td>