Merge branch 'stable-3.x'

[ypp-sc-tools.db-live.git] / yarrg / web / query_route

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index a65ef1c5723d9360e4566152d294ac0fd1350112..9a6ca0829114c622552209991c1fb6e1901094f4 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -88,17 +88,21 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
  size=80
 </&>
 
  size=80
 </&>
 

+<strong>Advanced options - you may leave these blank:</strong>
+<p>

 <table>
 <tr>
 <td>
 
 <table>
 <tr>
 <td>
 

-Vessel capacity:
+Vessel or capacity:

 <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
     thingstring => 'capacitystring', emsgstore => \$emsg,
 <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
     thingstring => 'capacitystring', emsgstore => \$emsg,

+    helpref => 'capacity',

     perresult => sub {
     perresult => sub {

-        ($max_volume,$max_mass) = @_;
+        ($max_mass,$max_volume) = @_;

     }
  &>
     }
  &>

+ size=40

 </&>
 
 <td>
 </&>
 
 <td>


@@ -106,12 +110,14 @@ Vessel capacity:
 &nbsp;
 
 <td>
 &nbsp;
 
 <td>

-Estimated loss per league:
+Expected losses:

 
 <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
     thingstring => 'lossperleague', emsgstore => \$emsg,
 
 <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
     thingstring => 'lossperleague', emsgstore => \$emsg,

+    helpref => 'losses',

     perresult => sub { ($lossperleaguepct)= @_; }
  &>
     perresult => sub { ($lossperleaguepct)= @_; }
  &>

+ size=9

 </&>
 
 </table>
 </&>
 
 </table>