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

Diff for /loncom/interface/lonsyllabus.pm between versions 1.73 and 1.75

version 1.73, 2008/12/16 20:00:11 version 1.75, 2008/12/24 07:55:54
Line 240  ENDSCRIPT Line 240  ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }            if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }         }
        if ($allowed) {         if ($allowed) {
             my $protocol = $Apache::lonnet::protocol{$homeserver};
             $protocol = 'http' if ($protocol ne 'https');
           $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.            $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
 &mt('Show Public View').'</font></a>'.  &mt('Show Public View').'</font></a>'.
           &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').            &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
           '</p><p>'.            '</p><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')  &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://'.      .' <tt>'.$protocol.'://'.
     &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>');
Line 271  ENDSCRIPT Line 273  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 286  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 361  ENDSCRIPT Line 363  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);
    }     }
    $message=&Apache::lontexconvert::msgtexconverted($message);     $message=&Apache::lontexconvert::msgtexconverted($message);
    if ($target ne 'tex') {     if ($target ne 'tex') {
    if($allowed){
    $r->print('<p>');
    }
  &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);   &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
   
    } 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 376  ENDSCRIPT Line 380  ENDSCRIPT
    push(@htmlids,$field);     push(@htmlids,$field);
        }         }
        if ($allowed) {         if ($allowed) {
  &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);   if($target ne 'tex'){
    $r->print('</p>');
    }
    &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
        }         }
    }     }
        }         }
Removed from v.1.73  
changed lines
  Added in v.1.75

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