--- loncom/interface/lonmenu.pm	2003/02/17 17:34:16	1.40
+++ loncom/interface/lonmenu.pm	2003/02/17 19:28:54	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.40 2003/02/17 17:34:16 www Exp $
+# $Id: lonmenu.pm,v 1.41 2003/02/17 19:28:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,7 @@ sub menubuttons {
     my $target  =shift;
     my $registration=shift;
     unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
+# Textual display only
     my $output='<a href="/adm/menu">Main Menu</a><br />';
     if ($registration) { $output.=&innerregister($forcereg,$target); }
     return $output."<hr />";
@@ -73,6 +74,7 @@ sub registerurl {
 	return $result.
          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
     }
+# Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $result.=&innerregister($forcereg,$target);
     return $result;
@@ -93,11 +95,13 @@ sub innerregister {
 
     my $newmail='';
     if (&Apache::lonmsg::newmail()) { 
-       $newmail=($textual?'<b>You have messages</b><br />':
+       $newmail=($textual?
+ '<b><a href="/adm/communicate">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
-# -- This is for URLs that actually can be registered
+# =============================================================================
+# ============================ This is for URLs that actually can be registered
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
         my $hwkadd='';
@@ -176,7 +180,40 @@ sub innerregister {
         }
         ###
         ###
-	$result = (<<ENDREGTHIS);
+# Prepare the rest of the buttons
+	my $menuitems=(<<ENDMENUITEMS);
+c&3&1
+s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
+s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&1
+s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
+s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
+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&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2
+s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
+ENDMENUITEMS
+        my $buttons='';
+        foreach (split(/\n/,$menuitems)) {
+	    my ($command,@rest)=split(/\&/,$_);
+            if ($command eq 's') {
+		$buttons.=&switch('','',@rest);
+            } else {
+                $buttons.=&clear(@rest);
+            }
+        }
+        if ($textual) {
+# Registered, textual output
+	    $result =(<<ENDREGTEXT);
+$timesync
+$newmail
+$buttons
+$hwkadd
+$editbutton
+ENDREGTEXT
+# Registered, graphical output
+        } else {
+	    $result = (<<ENDREGTHIS);
      
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
@@ -186,30 +223,12 @@ sub innerregister {
           swmenu.clearTimeout(swmenu.menucltim);
           $timesync
           $newmail
+          $buttons
 	  swmenu.currentURL=window.location.pathname;
           swmenu.reloadURL=window.location.pathname;
           swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;
-          swmenu.clearbut(3,1);
-          swmenu.switchbutton
-       (6,3,'catalog.gif','catalog','info','catalog_info()','Show catalog information');
-          swmenu.switchbutton
-       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
-          swmenu.switchbutton
-    (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)','Provide feedback messages or contribute to the course discussion about this resource');
-          swmenu.switchbutton
-     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)','Prepare a printable document');
-          swmenu.switchbutton
-       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)','Go to the previous resource in the course sequence');
-          swmenu.switchbutton
-     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)','Go to the next resource in the course sequence');
-          swmenu.switchbutton
-                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()','Set a bookmark for this resource');
-          swmenu.switchbutton
-                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()','Use or edit my bookmark collection');
-          swmenu.switchbutton
-                               (9,3,'anot.gif','anno-','tations','annotate()','Make notes and annotations about this resource');
           $hwkadd
           $editbutton
     }
@@ -234,9 +253,17 @@ sub innerregister {
 // END LON-CAPA Internal
 </script>
 ENDREGTHIS
-
+        }
+# =============================================================================
     } else {
-        $result = (<<ENDDONOTREGTHIS);
+# ========================================== This can or will not be registered
+        if ($textual) {
+# Not registered, textual
+	    $result= (<<ENDDONOTREGTEXT);
+ENDDONOTREGTEXT
+        } else {
+# Not registered, graphical
+           $result = (<<ENDDONOTREGTHIS);
 
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
@@ -264,6 +291,8 @@ ENDREGTHIS
 // END LON-CAPA Internal
 </script>
 ENDDONOTREGTHIS
+       }
+# =============================================================================
     }
     return $result;
 }
@@ -403,10 +432,11 @@ sub switch {
        return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
    } else {
+       if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
        return ($nobreak?'':'<br />').
-        '<a href="javascript:'.$act.';">'.$text.'</a> '.$desc;
+        '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);
    }
 }