Merge branch 'master' of https://github.com/adefaria/clearscm

[clearscm.git] / maps / php / list.php

diff --git a/maps/php/list.php b/maps/php/list.php
index 1576d96..672f09d 100755 (executable)
--- a/maps/php/list.php
+++ b/maps/php/list.php
@@ -17,7 +17,6 @@
   include "MAPS.php";
   MAPSHeader ();
   $next = (isset ($_GET ["next"])) ? $_GET ["next"] : 0;
-//  $prev;
   $type = $_GET ["type"];
   if (isset($_GET['message'])) {
     $message = $_GET["message"];
@@ -50,7 +49,7 @@ if (($next - $lines) > 0) {
 
 $total = CountList ($type);
 $last = $next + $lines < $total ? $next + $lines : $total;
-$last_page = floor ($total / $lines);
+$last_page = floor ($total / $lines) + 1;
 $this_page = $next / $lines + 1;
 ?>
 </head>
@@ -73,15 +72,17 @@ $this_page = $next / $lines + 1;
     print "<input type=hidden name=type value=$type>";
     print "<input type=hidden name=next value=$next>";
     print "Page: <select name=page onChange=\"ChangePage(this.value,'$type','$lines');\"";
-    for ($i = 1; $i <= $last_page; $i++) {
-      if ($i == ($this_page - 1)) {
+    for ($i = 0; $i <= $last_page; $i++) {
+      if ($i == ($this_page)) {
         print "<option selected>$i</option>";
       } else {
         print "<option>$i</option>";
       } // if
     } // for
     print "</select>";
-    print "&nbsp;of $last_page";
+    //print "next: $next last_page: $last_page";
+    print "&nbsp;of <a href=\"/maps/php/list.php?type=$type&next=" . 
+          ($last_page - 1) * $lines . "\">$last_page</a>";
   ?>
   </div>
   <div class="toolbar" align="center">
@@ -92,13 +93,13 @@ $this_page = $next / $lines + 1;
       "<a href=list.php?type=$type&next=" . ($next + $lines) . "><img src=/maps/images/next.gif border=0 alt=Next align=middle accesskey=n></a>" : "";
     print $prev_button;
     ?>
-    <input type="submit" name="action" value="Add New Entry"
+    <input type="submit" name="action" value="Add"
       onclick="return NoneChecked (document.list);">
-    <input type="submit" name="action" value="Delete Marked"
+    <input type="submit" name="action" value="Delete"
       onclick="return CheckAtLeast1Checked (document.list) && AreYouSure ('Are you sure you want to delete these entries?');">
-    <input type="submit" name="action" value="Modify Marked"
+    <input type="submit" name="action" value="Modify"
       onclick="return CheckAtLeast1Checked (document.list);">
-    <input type="submit" name="action" value="Reset Marks"
+    <input type="submit" name="action" value="Reset"
       onclick="return ClearAll (document.list);">
     <?php print $next_button?>
   </div>
@@ -118,13 +119,13 @@ $this_page = $next / $lines + 1;
 
   </table>
   <br>
+  </form>
   <div align=center>
     <a href="/maps/bin/exportlist.cgi?type=<?php echo $type?>">
     <input type=submit name=export value="Export List"></a>
     <a href="/maps/bin/importlist.cgi?type=<?php echo $type?>">
     <input type=submit name=import value="Import List"></a>
   </div>
-  </form>
   <?php copyright (2001)?>
 
 </body>