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

Diff for /loncom/interface/lonsyllabus.pm between versions 1.69.2.1 and 1.70

version 1.69.2.1, 2008/12/24 08:10:09 version 1.70, 2008/11/19 11:51:49
Line 29 Line 29
 package Apache::lonsyllabus;  package Apache::lonsyllabus;
   
 use strict;  use strict;
   use Apache::lontemplate;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonnet;  use Apache::lonnet;
Line 239  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>'.            $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')  &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>'.$protocol.'://'.      .' <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>'.
Line 273  ENDSCRIPT Line 272  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|^https?\://([^/]+)/(.+)$|) {                        if ($url=~m|^http://([^/]+)/(.+)$|) {
   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 286  ENDSCRIPT Line 285  ENDSCRIPT
           }            }
       }        }
 # norm internal URLs  # norm internal URLs
                       unless ($url=~/^https?\:/) {                        unless ($url=~/^http\:/) {
           $url=&Apache::lonnet::clutter($url);            $url=&Apache::lonnet::clutter($url);
                       }                        }
 # re-assemble field  # re-assemble field
Line 355  ENDSCRIPT Line 354  ENDSCRIPT
    }     }
    if ($allowed) {     if ($allowed) {
        $r->print('<h3>'.$syllabusfields{$field}.         $r->print('<h3>'.$syllabusfields{$field}.
  &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.   &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
  '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.   '<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::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
    } else {     } else {
        $r->print($message);         $r->print($message);
    }      } 
        } 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') {
        $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.   &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
  $message.'</blockquote>');  #       $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
   # $message.'</blockquote>');
    } 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 378  ENDSCRIPT Line 378  ENDSCRIPT
    push(@htmlids,$field);     push(@htmlids,$field);
        }         }
        if ($allowed) {         if ($allowed) {
    $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.   &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
      &HTML::Entities::encode($syllabus{$field},'"&<>').  #   $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.
      '</textarea> <input type="submit" name="storesyl" value="'.&mt('Save').'" />');   #     &HTML::Entities::encode($syllabus{$field},'"&<>').
    #     '</textarea> <input type="submit" name="storesyl" value="'.&mt('Save').'" />');
        }         }
    }     }
        }         }
Removed from v.1.69.2.1  
changed lines
  Added in v.1.70

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