--- loncom/interface/lonmsgdisplay.pm	2010/01/06 18:25:38	1.139.2.1
+++ loncom/interface/lonmsgdisplay.pm	2010/01/13 16:39:19	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.139.2.1 2010/01/06 18:25:38 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.140 2010/01/13 16:39:19 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -295,14 +295,26 @@ sub scrollbuttons {
     } else {
         $status = $statushash{$msgstatus};
     }
-    return
-   '<b>'.&mt('Page').'</b>: '. 
-   '<input type="submit" name="firstview" value="|&lt;" />'.
-   '<input type="submit" name="prevview" value="&lt;" />'.
-   ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
-   '<input type="submit" name="nextview" value="&gt;" />'.
-   '<input type="submit" name="lastview" value="&gt;|" /><br />'.
-   &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
+    my $output = '<b>'.&mt('Page:').'</b> ';
+    if ($maxdis == 1) {
+        # No buttons if only one page is displayed
+        $output .= '1/1';
+    } else {
+        $output .=
+           '<input type="submit" name="firstview" value="|&lt;" />'.
+           '<input type="submit" name="prevview" value="&lt;" />'.
+           ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
+           '<input type="submit" name="nextview" value="&gt;" />'.
+           '<input type="submit" name="lastview" value="&gt;|" />';
+    }
+    $output .=
+        '<br />'
+       .'<b>'.&mt($status.' messages:').'</b> '
+       .&mt('showing messages [_1] through [_2] of [_3].',
+            $first,$finish,$total)
+       .'</form>';
+
+    return $output;
 }
 # =============================================================== Status Change
 
@@ -2842,9 +2854,6 @@ ENDJS
 # =========================================================== Show the citation
 
 sub displayresource {
-    if (&Apache::loncommon::needs_gci_custom()) {
-        return '';
-    }
     my %content=@_;
 #
 # If the recipient is in the same course that the message was sent from and