X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=71cdbd2152b7ba870e9cb4994e9993758f16a84d;hb=764f11c76036161975282b87c4cc4298be5d1088;hp=1f8df2a5afdb6eafd5215a38f71cce74ad03dce5;hpb=f7c3c04f684b0e9cac4518beeece11853ef75109;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 1f8df2a..71cdbd2 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -596,6 +596,8 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
          <input type=submit name=printable_pdf value="PDF">
          <input type=submit name=printable_html value="HTML">
          <input type=submit name=printable_ps value="PostScript">
+         <input type=submit name=printable_pdf2 value="PDF 2-up">
+         <input type=submit name=printable_ps2 value="PostScript 2-up">
   </ul>
 % }
  <li><a href="#dataage">Data age summary</a>
@@ -614,8 +616,15 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 <h2><a name="plan">Voyage trading plan</a></h2>
 
 <table rules=groups>
+% my $tbody= sub {
+%	if (!printable($m)) { return '<tbody>'; }
+%#  return "<tr><td colspan=7><hr>";
+%	my ($c)= qw(40 00)[$_[0]];
+%	return "<tr><td bgcolor=\"#${c}${c}${c}\" height=1 colspan=7>";
+% };
+%
 % foreach my $i (0..$#islandids) {
-<tbody>
+<% $tbody->(1) %>
 <tr><td colspan=4>
 %	$iquery->execute($islandids[$i]);
 %	my ($islandname) = $iquery->fetchrow_array();
@@ -720,12 +729,12 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 (Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
 %		} elsif (!defined $total) {
 %			$total= 0;
-<tbody>
+<% $tbody->(0) %>
 %		}
 %		$total += $t->{Total};
 %		my $span= 0 + keys %{ $t->{Stalls} };
 %		my $td= "td rowspan=$span";
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
 <<% $td %>><% $collectdeliver %>
 <<% $td %>><% $t->{'commodname'} |h %>
 %
@@ -741,7 +750,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 <<% $td %> align=right><% $t->{Total} |h %> total
 %
 %		foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
 %			$pstall->($stallix);
 %		}
 %
@@ -773,7 +782,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
      $show_total_now->($totals);
 }
 </%perl><a name="summary"></a>
-<tbody><tr>
+<% $tbody->(1) %><tr>
 <td colspan=2>Total distance: <% $total_dist %> leagues.
 <td colspan=3 align=right>Overall net cash flow
 <td align=right><strong><%