--- loncom/interface/lonmenu.pm 2003/09/19 15:45:14 1.92
+++ loncom/interface/lonmenu.pm 2003/09/25 17:52:26 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.92 2003/09/19 15:45:14 bowersj2 Exp $
+# $Id: lonmenu.pm,v 1.95 2003/09/25 17:52:26 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -351,6 +351,7 @@ s&2&3&forw.gif&forward&&gopost('/adm/fli
c&6&3
c&8&1
c&8&2
+s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
ENDMENUITEMS
@@ -640,21 +641,34 @@ sub switch {
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\s*\-\s*//gs;
- $inlineremote[10*$row+$col]="\n".($nobreak?' ':'
').
- ''.$text.' '.
- ($nobreak?'':$desc);
+ if ($nobreak) {
+ $inlineremote[10*$row+$col]=
+ ''.$text.'';
+ } else {
+ $inlineremote[10*$row+$col]="\n
".
+ ''.$desc.'';
+ }
} else {
# Inline Remote
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\s*\-\s*//gs;
- $inlineremote[10*$row+$col]="\n".
- ($nobreak==3?'