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

Diff for /loncom/interface/lonsyllabus.pm between versions 1.106 and 1.110

version 1.106, 2010/01/31 06:03:55 version 1.110, 2010/08/07 19:23:51
Line 52  sub handler { Line 52  sub handler {
     my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);      my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
 # ------------------------------------------------------------ Get query string  # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
                         ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']);                          ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
 # ----------------------------------------------------- Is this even a course?  # ----------------------------------------------------- Is this even a course?
     my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);      my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
     if ($homeserver eq 'no_host') {      if ($homeserver eq 'no_host') {
Line 74  sub handler { Line 74  sub handler {
     my $externalsyllabus=$courseenv{'externalsyllabus'};      my $externalsyllabus=$courseenv{'externalsyllabus'};
   
     if ($externalsyllabus=~/\w/) {      if ($externalsyllabus=~/\w/) {
           $r->print( Apache::lonwrapper::wrapper($externalsyllabus) );
        if ($env{'form.wrapperdisplay'} eq 'menu') {          return OK;
            $r->print(&Apache::lonwrapper::simple_menu());  
        } else {  
            $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",  
                            $externalsyllabus));  
        }  
        return OK;  
     }      }
   
 # ------------------------------ The buck stops here: internal syllabus display  # ------------------------------ The buck stops here: internal syllabus display
Line 288  ENDSCRIPT Line 282  ENDSCRIPT
 #----------Print last update  #----------Print last update
     my $lastmod=$syllabus{'uploaded.lastmodified'};      my $lastmod=$syllabus{'uploaded.lastmodified'};
     $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));      $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
     my $who = &Apache::loncommon::aboutmewrapper(      my $who;
         &Apache::loncommon::plainname($syllabus{'uploaded.name'},      if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
         $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},          $who = &Apache::loncommon::aboutmewrapper(
         $syllabus{'uploaded.domain'});                     &Apache::loncommon::plainname($syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'});
       } else {
           # Public user?
           # Only display name of user, but no link to personal information page
           $who = &Apache::loncommon::plainname(
                      $syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'});
       }
   
     if ($target ne 'tex') {      if ($target ne 'tex') {
         $r->print('<div class="LC_info">'.&mt('Last updated').': '.          $r->print('<div class="LC_info">'.&mt('Last updated').': '.
             $lastmod . ' '.              $lastmod . ' '.
Line 362  ENDSCRIPT Line 366  ENDSCRIPT
              &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));               &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
     if ($target ne 'tex') {      if ($target ne 'tex') {
         if ($allowed) {          if ($allowed) {
             &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');              &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
             $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));              $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
             my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';              my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
             $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');              $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');
             &Apache::lontemplate::print_end_template($r);              &Apache::lontemplate::print_end_template($r);
         } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {          } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
             &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');              &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
             $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));              $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
             &Apache::lontemplate::print_end_template($r);              &Apache::lontemplate::print_end_template($r);
         }          }
Line 382  ENDSCRIPT Line 386  ENDSCRIPT
             $r->print('<form method="post" action="">'.              $r->print('<form method="post" action="">'.
             '<input type="hidden" name="forceedit" value="edit" />');              '<input type="hidden" name="forceedit" value="edit" />');
         }          }
         my @htmlids=();  
  my $url_include_handler = sub {   my $url_include_handler = sub {
  my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;   my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;
  my %data = %{$data_ref};   my %data = %{$data_ref};
Line 424  ENDSCRIPT Line 427  ENDSCRIPT
  }   }
  };   };
  my %custom_hash = ( 'lll_includeurl' => $url_include_handler );   my %custom_hash = ( 'lll_includeurl' => $url_include_handler );
  @htmlids = &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,    &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, 
  $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);   $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
         if ($allowed) {          if ($allowed) {
             $r->print('</form>'.              $r->print('</form>'.
             &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));              &Apache::lonhtmlcommon::htmlareaselectactive());
         }          }
     } else {      } else {
         if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}          if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
Removed from v.1.106  
changed lines
  Added in v.1.110

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