Diff for /loncom/interface/lonsyllabus.pm between versions 1.78 and 1.79

version 1.78, 2009/02/19 18:55:53 version 1.79, 2009/02/20 17:45:40
Line 162  ENDSCRIPT Line 162  ENDSCRIPT
                text=>"Course syllabus"});                 text=>"Course syllabus"});
             $r->print(&Apache::lonhtmlcommon::breadcrumbs());              $r->print(&Apache::lonhtmlcommon::breadcrumbs());
         }          }
         $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.   $r->print('<div class="LC_ContentBoxSpecial">');
   &Apache::lonnet::domain($cdom,'description').'</h3>');   $r->print('<h2 class="LC_hcell">'.$courseenv{'description'}.'</h2>'); 
    $r->print('<blockquote>');       
    $r->print('<h3>'.  &Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {      } else {
  $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.   $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
   &Apache::lonnet::domain($cdom,'description').'}\\\\');    &Apache::lonnet::domain($cdom,'description').'}\\\\');
     }      }
   
 # -------------------------------------------------------- Get course personnel  # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);      my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     if ($target ne 'tex') {      if ($target ne 'tex') {
Line 211  ENDSCRIPT Line 214  ENDSCRIPT
     } else {      } else {
  $r->print('\end{tabular}\\\\');   $r->print('\end{tabular}\\\\');
     }      }
 # -------------------------------------------------------------- Announcements?  
     my $day = &Apache::lonannounce::showday(time,2,  
  &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));  
     if ($target ne 'tex') {  
  &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial');  
     } else {  
  $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));  
     }  
 # ---------------------------------------------------------- Load syllabus info  # ---------------------------------------------------------- Load syllabus info
     my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);      my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
     my $allowed=0;      my $allowed=0;
Line 293  ENDSCRIPT Line 288  ENDSCRIPT
            &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);             &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
        }         }
     }      }
 # ---------------------------------------------------------------- Get syllabus  #----------Print last update
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {   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::aboutmewrapper(
                     &Apache::loncommon::plainname($syllabus{'uploaded.name'},                      &Apache::loncommon::plainname($syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},                       $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'});                       $syllabus{'uploaded.domain'});      
        if ($target ne 'tex') {   if ($target ne 'tex') {
    $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.     $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
      $lastmod.'</td><td>'.       $lastmod.'</td><td>'.
      ($who ? &mt('by').' '.$who       ($who ? &mt('by').' '.$who
                            : '' ).                             : '' ).
      '</td></tr></table><p>');       '</td></tr></table>');
        } else {         } else {
    $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.     $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
      ($who? &mt('by').'\\\\ '.       ($who? &mt('by').'\\\\ '.
             &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})              &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
           :'')            :'')
      .'\\\\');       .'\\\\');
        }         }
        #--------Functions
  if ($target ne 'tex') {  if ($target ne 'tex') {
    if($allowed || $privileged){
  &Apache::lontemplate::print_start_page_functions($r);   &Apache::lontemplate::print_start_page_functions($r);
  if($allowed){   if($allowed){
  &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Public View').'</a>'.   &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Public View').'</a>'. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));      
           &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));        
  }elsif($privileged){   }elsif($privileged){
  &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>');    &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>'); 
  }   }
  &Apache::lontemplate::print_end_page_functions($r);   &Apache::lontemplate::print_end_page_functions($r);
   }   }
          }
   # -------------------------------------------------------------- Announcements?
       my $day = &Apache::lonannounce::showday(time,2,
    &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
       if ($target ne 'tex') {
    &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial');
       } else {
    $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
       }
   # ---------------------------------------------------------------- Get syllabus
       if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {     
        if ($allowed) {         if ($allowed) {
    $r->print('<form method="post">'.     $r->print('<form method="post">'.
      '<input type="hidden" name="forceedit" value="edit" />');       '<input type="hidden" name="forceedit" value="edit" />');
Line 336  ENDSCRIPT Line 340  ENDSCRIPT
    if (($syllabus{$field}=~/\w/) || ($allowed)) {     if (($syllabus{$field}=~/\w/) || ($allowed)) {
        my $message=$syllabus{$field};         my $message=$syllabus{$field};
        if ($field eq 'lll_includeurl') { # this is the "included" field         if ($field eq 'lll_includeurl') { # this is the "included" field
    my $urls=$message;     my $urls=$message;
    $message='';     $message='';  
    foreach my $filelink (split(/\n/,$urls)) {     foreach my $filelink (split(/\n/,$urls)) {
        my $output='';         my $output='';
 # embed style?   # embed style?
        my ($curfext)=($filelink=~/\.([^\.]+)$/);         my ($curfext)=($filelink=~/\.([^\.]+)$/);
        my $embstyle=&Apache::loncommon::fileembstyle($curfext);         my $embstyle=&Apache::loncommon::fileembstyle($curfext);
        if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {         if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents
 # make ssi call and remove everything but the body contents  
    $output=&Apache::lonnet::ssi_body($filelink);     $output=&Apache::lonnet::ssi_body($filelink);
        } elsif ($embstyle eq 'img') {         } elsif ($embstyle eq 'img') {# embed as an image
 # embed as an image  
    $output='<img src="'.$filelink.'" />';     $output='<img src="'.$filelink.'" />';
        }         }
        if ($target ne 'tex') {         if($output ne ''){
    $message.='<p>'.$output.'</p>';         if ($target ne 'tex') {
        } else {     $message.='<p>'.$output.'</p>';
    $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';         } else {
        }           $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
          }
    }     
    }     }
    if ($allowed) {     if ($allowed) {
        $r->print('<h3>'.$syllabusfields{$field}.         $r->print('<h3>'.$syllabusfields{$field}.
Line 383  ENDSCRIPT Line 387  ENDSCRIPT
        if ($allowed) {         if ($allowed) {
  if($target ne 'tex'){   if($target ne 'tex'){
  $r->print('</p>');   $r->print('</p>');
    &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
  }   }
  &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);  
        }         }
    }     }
        }             }    
Line 393  ENDSCRIPT Line 398  ENDSCRIPT
    $r->print('</form>'.     $r->print('</form>'.
      &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));       &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
        }         }
        if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}        # if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
     } else {      } else {
  if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}    if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');} 
  $r->print(&mt('No syllabus information provided.'));   $r->print(&mt('No syllabus information provided.'));
  if ($target ne 'tex') {$r->print('</p>');}   if ($target ne 'tex') {$r->print('</p>');}
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex') {
    $r->print('</blockquote>');
       $r->print('</div>');
         if ($env{'form.backto'} eq 'coursecatalog') {          if ($env{'form.backto'} eq 'coursecatalog') {
             $r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.              $r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.
                       &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).                        &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).

Removed from v.1.78  
changed lines
  Added in v.1.79


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