[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.181.2.5 and 1.181.2.7

version 1.181.2.5, 2020/01/10 05:16:30 version 1.181.2.7, 2020/11/11 22:04:25
Line 782  sub groupmail_header { Line 782  sub groupmail_header {
     if ($grouppagelink) {      if ($grouppagelink) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>$grouppagelink,              ({href=>$grouppagelink,
               text=>"Group: $description",                text=>&mt('Group').": $description",
               title=>"Go to group's home page"},);                title=>&mt("Go to group's home page"),
                 no_mt=>1,
                },);
     } else {      } else {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({text=>"Group: $description",});              ({text=>&mt('Group').": $description",
                 no_mt=>1,});
     }      }
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
          ({href=>"/adm/email?compose=group&group=".           ({href=>"/adm/email?compose=group&group=".
Line 799  sub groupmail_header { Line 802  sub groupmail_header {
                            title=>"E-mails sent"},);                             title=>"E-mails sent"},);
     }      }
     my $groupheader = &Apache::loncommon::start_page('Group Message');      my $groupheader = &Apache::loncommon::start_page('Group Message');
     $groupheader .= &Apache::lonhtmlcommon::breadcrumbs      $groupheader .= &Apache::lonhtmlcommon::breadcrumbs(
                 ('Group - '.$env{'form.group'}.' Email');                                      &mt('Group messages - [_1]',$description),
                                                           undef,undef,undef,undef,1);
     return $groupheader;      return $groupheader;
 }  }
   
Line 2143  sub displaymessage { Line 2147  sub displaymessage {
   
   
     my $number_of_messages = scalar(@messages); #subtract 1 for last index      my $number_of_messages = scalar(@messages); #subtract 1 for last index
       my $head_extra;
   
   # if student's view of resource will be included
   # get <link> tag(s) for css file(s) in use, and pass to &header to include
   # in call to loncommon::start_page()
   
       if (($env{'request.course.id'} eq $content{'courseid'}) &&
           (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
           my $symb;
           if (defined($content{'symb'})) {
               $symb = $content{'symb'};
           } elsif (defined($content{'baseurl'})) {
               $symb=&Apache::lonnet::symbread($content{'baseurl'});
           }
           if ($symb) {
               $head_extra = &Apache::loncommon::css_links($symb);
           }
       }
   
 # start output  # start output
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});      &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',
                    $content{'baseurl'},$head_extra);
   
 # Prepare available functions  # Prepare available functions
     my @functionlist;      my @functionlist;
Line 2678  sub displayresource { Line 2702  sub displayresource {
 # ================================================================== The Header  # ================================================================== The Header
   
 sub header {  sub header {
     my ($r,$title,$baseurl)=@_;      my ($r,$title,$baseurl,$head_extra)=@_;
     my $extra = &Apache::loncommon::studentbrowser_javascript();      my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {      if ($baseurl) {
  $extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";   $extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }      }
     $extra .= '<script type="text/javascript"      $extra .= '<script type="text/javascript"
                 src="/res/adm/includes/file_upload.js"></script>';                  src="/res/adm/includes/file_upload.js"></script>';
       if ($head_extra) {
           $extra .= "\n$head_extra";
       }
     $r->print(&Apache::loncommon::start_page('Messages',      $r->print(&Apache::loncommon::start_page('Messages',
   $extra));    $extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs      $r->print(&Apache::lonhtmlcommon::breadcrumbs
Line 2694  sub header { Line 2721  sub header {
 # ---------------------------------------------------------------- Print header  # ---------------------------------------------------------------- Print header
   
 sub printheader {  sub printheader {
     my ($r,$url,$desc,$title,$baseurl)=@_;      my ($r,$url,$desc,$title,$baseurl,$head_extra)=@_;
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
  ({href=>$url,   ({href=>$url,
   text=>$desc});    text=>$desc});
     &header($r,$title,$baseurl);      &header($r,$title,$baseurl,$head_extra);
 }  }
   
 # ------------------------------------------------------------ Store the comment  # ------------------------------------------------------------ Store the comment
Removed from v.1.181.2.5  
changed lines
  Added in v.1.181.2.7

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>