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

[www]

www		Mon Mar  1 11:19:45 2004 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm lonmsg.pm 
  Log:
  Adding &mt() to crumbs display.
  Saving my work on lonmsg.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.57 loncom/interface/lonhtmlcommon.pm:1.58
--- loncom/interface/lonhtmlcommon.pm:1.57	Mon Mar  1 11:04:43 2004
+++ loncom/interface/lonhtmlcommon.pm	Mon Mar  1 11:19:45 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.57 2004/03/01 16:04:43 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.58 2004/03/01 16:19:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -912,8 +912,8 @@
                  map {
                      $faq = $_->{'faq'} if (exists($_->{'faq'}));
                      $bug = $_->{'bug'} if (exists($_->{'bug'}));
-                     '<a href="'.$_->{'href'}.'" title="'.$_->{'title'}.'">'.
-                         $_->{'text'}.'</a>' 
+                     '<a href="'.$_->{'href'}.'" title="'.&mt($_->{'title'}).'">'.
+                         &mt($_->{'text'}).'</a>' 
                      } @Crumbs
                  );
         $links .= '-&gt;' if ($links ne '');
@@ -936,7 +936,7 @@
         #
         if (defined($component)) {
             $Str .= '<td align="right" bgcolor="'.$color.'">'.
-                '<font size="+1">'.$component.'</font>';
+                '<font size="+1">'.&mt($component).'</font>';
             if (defined($component_help)) {
                 $Str .= 
                     &Apache::loncommon::help_open_topic($component_help);
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.88 loncom/interface/lonmsg.pm:1.89
--- loncom/interface/lonmsg.pm:1.88	Sun Feb 29 21:21:57 2004
+++ loncom/interface/lonmsg.pm	Mon Mar  1 11:19:45 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.88 2004/03/01 02:21:57 www Exp $
+# $Id: lonmsg.pm,v 1.89 2004/03/01 16:19:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -802,7 +802,9 @@
 
 sub compout {
     my ($r,$forwarding,$broadcast)=@_;
-      my $dispcrit='';
+    &printheader($r,'/adm/email?compose=upload',
+	     'Distribute from uploaded file');
+    my $dispcrit='';
     my $dissub='';
     my $dismsg='';
     my $func=&mt('Send New');
@@ -942,6 +944,16 @@
     }
 }
 
+# ---------------------------------------------------------------- Print header
+
+sub printheader {
+    my ($r,$url,$desc,$baseurl)=@_;
+    &Apache::lonhtmlcommon::add_breadcrumb
+	({href=>$url,
+	  text=>$desc});
+    &header($r,$baseurl);
+}
+
 # ---------------------------------------------------------------- Face to face
 
 sub facetoface {
@@ -949,11 +961,9 @@
     unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	return;
     }
-    &Apache::lonhtmlcommon::add_breadcrumb
-	({href=>'/adm/dropadd?recordftf=query',
-	  text=>"User Notes, Face-to-Face, Critical Messages",
-	 faq=>12,bug=>'Communication Tools'});
-    &header($r);
+    &printheader($r,
+		 '/adm/email?recordftf=query',
+		 "User Notes, Face-to-Face, Critical Messages");
 # from query string
 
     if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }