--- loncom/interface/lonsyllabus.pm 2008/12/12 17:02:47 1.71 +++ loncom/interface/lonsyllabus.pm 2009/02/13 17:26:55 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.71 2008/12/12 17:02:47 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.76 2009/02/13 17:26:55 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -240,16 +240,17 @@ ENDSCRIPT if ($forcestudent or $target eq 'tex') { $allowed=0; } } if ($allowed) { - $r->print('
'. + my $protocol = $Apache::lonnet::protocol{$homeserver}; + $protocol = 'http' if ($protocol ne 'https'); + $r->print('
'. +&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). + '
'. &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&mt('This syllabus can be publicly viewed at') - .' http://'. + .' '.$protocol.'://'. &Apache::lonnet::hostname($homeserver).$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'
'. - ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'. - ''. -&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). - '
'); + ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'); } elsif ($privileged) { if ($target ne 'tex') { $r->print(''.
@@ -272,7 +273,7 @@ ENDSCRIPT
# get rid of leading and trailing spaces
$url=~s/^\s+//;
$url=~s/\s+$//;
- if ($url=~m|^http://([^/]+)/(.+)$|) {
+ if ($url=~m|^https?\://([^/]+)/(.+)$|) {
my $host = $1;
my $remainder=$2;
# remove the hostname from internal URLs
@@ -285,7 +286,7 @@ ENDSCRIPT
}
}
# norm internal URLs
- unless ($url=~/^http\:/) {
+ unless ($url=~/^https?\:/) {
$url=&Apache::lonnet::clutter($url);
}
# re-assemble field
@@ -328,7 +329,9 @@ ENDSCRIPT
'');
}
my @htmlids=();
- foreach my $field (sort(keys(%syllabusfields))) {
+ #&Apache::lontemplate::start_columnSection($r);
+ #&Apache::lontemplate::start_ContentBox($r, $allowed);
+ foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}=~/\w/) || ($allowed)) {
my $message=$syllabus{$field};
if ($field eq 'lll_includeurl') { # this is the "included" field
@@ -354,23 +357,22 @@ ENDSCRIPT
}
if ($allowed) {
$r->print(' '.&mt('Show Public View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').' ');
+ }
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -378,13 +380,19 @@ ENDSCRIPT
push(@htmlids,$field);
}
if ($allowed) {
- &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
-# $r->print(' '.&mt('Show Public View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').''.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'
'.
- ''.$syllabusfields{$field}.'
'.
-# $message.'
');
+ if($allowed){
+ $r->print('
');
+ if($target ne 'tex'){
+ $r->print('