[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

[matthew]

matthew		Mon May 10 14:57:43 2004 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  &breadcrumbs: If we are not in a course but still want a menu link, use the
  text "Menu" instead of not putting in a menu link.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.69 loncom/interface/lonhtmlcommon.pm:1.70
--- loncom/interface/lonhtmlcommon.pm:1.69	Thu May  6 13:54:11 2004
+++ loncom/interface/lonhtmlcommon.pm	Mon May 10 14:57:43 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.69 2004/05/06 17:54:11 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.70 2004/05/10 18:57:43 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -975,16 +975,21 @@
         # The last breadcrumb does not have a link, so handle it separately.
         my $last = pop(@Crumbs);
         #
-        # The first one should be the course, I guess.
+        # The first one should be the course or a menu link
 	if (!defined($menulink)) { $menulink=1; }
-        if ($menulink && exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') {
-            my $cid = $ENV{'request.course.id'};
+        if ($menulink) {
+            my $description = 'Menu';
+            if (exists($ENV{'request.course.id'}) && 
+                $ENV{'request.course.id'} ne '') {
+                $description = 
+                    $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+            }
             unshift(@Crumbs,{
-                             href   =>'/adm/menu',
-                             title  =>'Go to main menu',
-                             target =>'_top',
-                             text   =>$ENV{'course.'.$cid.'.description'},
-                            });
+                    href   =>'/adm/menu',
+                    title  =>'Go to main menu',
+                    target =>'_top',
+                    text   =>$description,
+                });
         }
         my $links .= 
             join('->',