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

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

version 1.74, 2008/12/17 00:44:53 version 1.78, 2009/02/19 18:55:53
Line 168  ENDSCRIPT Line 168  ENDSCRIPT
  $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').'}\\\\');
     }      }
 # -------------------------------------------------------------- Announcements?  
     my $day = &Apache::lonannounce::showday(time,2,  
  &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));  
     if ($target ne 'tex') {  
  $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));  
     } else {  
  $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));  
     }  
   
 # -------------------------------------------------------- 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 220  ENDSCRIPT Line 211  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 240  ENDSCRIPT Line 239  ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }            if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }         }
        if ($allowed) {         if ($allowed) {
           $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.            my $protocol = $Apache::lonnet::protocol{$homeserver};
 &mt('Show Public View').'</font></a>'.            $protocol = 'http' if ($protocol ne 'https');
           &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').            $r->print('<p>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')
           '</p><p>'.      .' <tt>'.$protocol.'://'.
 &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')  
     .' <tt>http://'.  
     &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.      &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
                &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.                 &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
           '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');            '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');
       } elsif ($privileged) {        } 
   if ($target ne 'tex') {  
       $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.  
  &mt('Edit').'</font></a>');   
   }  
       }  
        if (($allowed) && ($env{'form.storesyl'})) {         if (($allowed) && ($env{'form.storesyl'})) {
    foreach my $syl_field (keys(%syllabusfields)) {     foreach my $syl_field (keys(%syllabusfields)) {
                my $field=$env{'form.'.$syl_field};                 my $field=$env{'form.'.$syl_field};
Line 271  ENDSCRIPT Line 263  ENDSCRIPT
 # get rid of leading and trailing spaces  # get rid of leading and trailing spaces
                       $url=~s/^\s+//;                        $url=~s/^\s+//;
                       $url=~s/\s+$//;                        $url=~s/\s+$//;
                       if ($url=~m|^http://([^/]+)/(.+)$|) {                        if ($url=~m|^https?\://([^/]+)/(.+)$|) {
   my $host = $1;    my $host = $1;
                           my $remainder=$2;                            my $remainder=$2;
 # remove the hostname from internal URLs  # remove the hostname from internal URLs
Line 284  ENDSCRIPT Line 276  ENDSCRIPT
           }            }
       }        }
 # norm internal URLs  # norm internal URLs
                       unless ($url=~/^http\:/) {                        unless ($url=~/^https?\:/) {
           $url=&Apache::lonnet::clutter($url);            $url=&Apache::lonnet::clutter($url);
                       }                        }
 # re-assemble field  # re-assemble field
Line 322  ENDSCRIPT Line 314  ENDSCRIPT
           :'')            :'')
      .'\\\\');       .'\\\\');
        }         }
        
    if ($target ne 'tex') {
    &Apache::lontemplate::print_start_page_functions($r);
    if($allowed){
    &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'));      
    }elsif($privileged){
    &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>'); 
    }
    &Apache::lontemplate::print_end_page_functions($r);
     }
         
        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" />');
        }         }
        my @htmlids=();         my @htmlids=();
  &Apache::lontemplate::start_columnSection($r);  
  &Apache::lontemplate::start_ContentBox($r, $allowed);  
  foreach my $field (sort(keys(%syllabusfields))) {   foreach my $field (sort(keys(%syllabusfields))) {
    if (($syllabus{$field}=~/\w/) || ($allowed)) {     if (($syllabus{$field}=~/\w/) || ($allowed)) {
        my $message=$syllabus{$field};         my $message=$syllabus{$field};
Line 361  ENDSCRIPT Line 364  ENDSCRIPT
    }      } 
        } else {         } else {
    &Apache::lonfeedback::newline_to_br(\$message);     &Apache::lonfeedback::newline_to_br(\$message);
    $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;     $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
    if ($allowed) {     if ($allowed) {
        $message=&Apache::lonspeller::markeduptext($message);         $message=&Apache::lonspeller::markeduptext($message);
    }     }
Line 369  ENDSCRIPT Line 372  ENDSCRIPT
    if ($target ne 'tex') {     if ($target ne 'tex') {
  if($allowed){   if($allowed){
  $r->print('<p>');   $r->print('<p>');
  }   }
  &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);   &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
    } else {     } else {
        $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.         $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
  &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');   &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
Line 384  ENDSCRIPT Line 387  ENDSCRIPT
  &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);   &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
        }         }
    }     }
        }         }    
         if ($allowed) {  
                 $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.  
                                  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');  
         }  
  &Apache::lontemplate::end_ContentBox($r);  
  &Apache::lontemplate::end_columnSection($r);  
        if ($allowed) {         if ($allowed) {
    $r->print('</form>'.     $r->print('</form>'.
      &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));       &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
Removed from v.1.74  
changed lines
  Added in v.1.78

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