[LON-CAPA-cvs] cvs: loncom /interface lonsyllabus.pm
amueller
amueller@source.lon-capa.org
Tue, 19 May 2009 10:07:54 -0000
This is a MIME encoded message
--amueller1242727674
Content-Type: text/plain
amueller Tue May 19 10:07:54 2009 EDT
Modified files:
/loncom/interface lonsyllabus.pm
Log:
Replaced tabsymbol with 4 whitespaces to avoid conflicts with editors where tabwidth i.e. is expanded to 8 whitespaces.
Use cvs diff -w to check, that between this revision (1.91) and the revision before (1.90) there is no
difference except the whitespaces.
--amueller1242727674
Content-Type: text/plain
Content-Disposition: attachment; filename="amueller-20090519100754.txt"
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.90 loncom/interface/lonsyllabus.pm:1.91
--- loncom/interface/lonsyllabus.pm:1.90 Fri May 15 13:43:46 2009
+++ loncom/interface/lonsyllabus.pm Tue May 19 10:07:54 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.90 2009/05/15 13:43:46 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.91 2009/05/19 10:07:54 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,8 +58,8 @@
if ($homeserver eq 'no_host') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- &Apache::loncommon::simple_error_page($r,'No syllabus available',
- 'No syllabus available');
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
+ 'No syllabus available');
return OK;
}
# ------------------------------------- There is such a course, get environment
@@ -68,7 +68,7 @@
# ------------------------------------------------------------ Print the screen
if ($target eq 'tex') {
- $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
# -------------------------------------------------- Let's see who handles this
my $externalsyllabus=$courseenv{'externalsyllabus'};
@@ -76,10 +76,10 @@
if ($externalsyllabus=~/\w/) {
if ($env{'form.wrapperdisplay'} eq 'menu') {
- $r->print(&Apache::lonwrapper::simple_menu());
+ $r->print(&Apache::lonwrapper::simple_menu());
} else {
- $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
- $externalsyllabus));
+ $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
+ $externalsyllabus));
}
return OK;
}
@@ -110,7 +110,7 @@
# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
- my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
my $js;
if ($env{'form.backto'} eq 'coursecatalog') {
$js .= <<"ENDSCRIPT";
@@ -139,14 +139,14 @@
ENDSCRIPT
}
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
- {'function' => $forcestudent,
- 'domain' => $cdom,
- 'force_register' =>
- $env{'form.register'},});
+ my $start_page =
+ &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
+ {'function' => $forcestudent,
+ 'domain' => $cdom,
+ 'force_register' =>
+ $env{'form.register'},});
- $r->print($start_page);
+ $r->print($start_page);
if ($env{'form.backto'} eq 'coursecatalog') {
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb
@@ -174,54 +174,54 @@
if ($env{'user.environment'}) {
# does this user have privileges to post, etc?
if ($env{'request.course.id'}
- && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
- && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
+ && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
+ && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
$allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- $privileged=$allowed;
- if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
- }
+ $privileged=$allowed;
+ if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
+ $forcestudent='student';
+ }
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (keys(%syllabusfields)) {
+ foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
- chomp($field);
+ chomp($field);
$field=~s/\s+$//s;
- $field=~s/^\s+//s;
- $field=~s/\<br\s*\/*\>$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- $syllabus{$syl_field}=$field;
+ $field=~s/^\s+//s;
+ $field=~s/\<br\s*\/*\>$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $syllabus{$syl_field}=$field;
if ($syl_field eq 'lll_includeurl') { # clean up included URLs
my $field='';
- foreach my $value (split(/\n/,$syllabus{$syl_field})) {
- my $url=$value;
+ foreach my $value (split(/\n/,$syllabus{$syl_field})) {
+ my $url=$value;
# get rid of leading and trailing spaces
$url=~s/^\s+//;
$url=~s/\s+$//;
if ($url=~m|^https?\://([^/]+)/(.+)$|) {
- my $host = $1;
+ my $host = $1;
my $remainder=$2;
# remove the hostname from internal URLs
- my $hostname = &Apache::lonnet::hostname($host);
- my %all_hostnames = &Apache::lonnet::all_hostnames();
- foreach my $possible_host (keys(%all_hostnames)) {
+ my $hostname = &Apache::lonnet::hostname($host);
+ my %all_hostnames = &Apache::lonnet::all_hostnames();
+ foreach my $possible_host (keys(%all_hostnames)) {
if ($possible_host =~ /\Q$hostname\E/i) {
- $url=$remainder;
- }
- }
- }
+ $url=$remainder;
+ }
+ }
+ }
# norm internal URLs
unless ($url=~/^https?\:/) {
- $url=&Apache::lonnet::clutter($url);
+ $url=&Apache::lonnet::clutter($url);
}
# re-assemble field
if ($url) {
- $field.=$url."\n";
+ $field.=$url."\n";
}
- }
+ }
$syllabus{$syl_field}=$field;
- }
+ }
}
$syllabus{'uploaded.domain'}=$env{'user.domain'};
$syllabus{'uploaded.name'}=$env{'user.name'};
@@ -232,8 +232,8 @@
#---------------------Print External URL Syllabus Info
if( ($allowed) && ($target ne 'tex') ) {
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
$r->print('<p class="LC_info">'
.&mt('This syllabus can be publicly viewed at [_1]'
,'<tt>'.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'</tt>')
@@ -248,9 +248,9 @@
#-Print Help Text
if ($target ne 'tex') {
- if ($allowed) {
- $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
- }
+ if ($allowed) {
+ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+ }
}
#----------Print last update
my $lastmod=$syllabus{'uploaded.lastmodified'};
@@ -260,177 +260,177 @@
$syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
$syllabus{'uploaded.domain'});
if ($target ne 'tex') {
- $r->print('<div class="LC_info">'.&mt('Last updated').': '.
- $lastmod . ' '.
- ($who ? &mt('by').' '.$who
+ $r->print('<div class="LC_info">'.&mt('Last updated').': '.
+ $lastmod . ' '.
+ ($who ? &mt('by').' '.$who
: '' ) .
'</div>' );
} else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
- ($who? &mt('by').'\\\\ '.
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
- :'')
- .'\\\\');
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+ ($who? &mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+ :'')
+ .'\\\\');
}
#--------Functions
if ($target ne 'tex') {
- if( $allowed || $privileged) {
+ if( $allowed || $privileged) {
$r->print(&Apache::lontemplate::start_functionslist());
- if ($allowed) {
+ if ($allowed) {
$r->print(&Apache::lontemplate::item_functionslist(
'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Public View').'</a>'
.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
- } elsif ($privileged) {
+ } elsif ($privileged) {
$r->print(&Apache::lontemplate::item_functionslist(
'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>'));
- }
+ }
$r->print(&Apache::lontemplate::end_functionslist());
- }
+ }
}
#----------------------------Print Headtitle
if ($target ne 'tex') {
- $r->print('<h1>'.$courseenv{'description'}.'</h1>');
- $r->print('<h3>'. &Apache::lonnet::domain($cdom,'description').'</h3>');
+ $r->print('<h1>'.$courseenv{'description'}.'</h1>');
+ $r->print('<h3>'. &Apache::lonnet::domain($cdom,'description').'</h3>');
} else {
- $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
- &Apache::lonnet::domain($cdom,'description').'}\\\\');
+ $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
+ &Apache::lonnet::domain($cdom,'description').'}\\\\');
}
# -------------------------------------------------------- Get course personnel
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
} else {
- $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
}
my @personnel=sort(keys(%coursepersonnel));
my $lastpers=$personnel[$#personnel];
foreach my $element (@personnel) {
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::row_title($element));
- } else {
- $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
- }
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::row_title($element));
+ } else {
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
+ }
foreach (split(/\,/,$coursepersonnel{$element})) {
- my ($puname,$pudom)=split(/\:/,$_);
- if ($target ne 'tex') {
+ my ($puname,$pudom)=split(/\:/,$_);
+ if ($target ne 'tex') {
my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
- $r->print(' '.$courseperson);
+ $r->print(' '.$courseperson);
} else {
$r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
$puname,$pudom));
}
- } else {
- $r->print(' '.&Apache::loncommon::plainname($puname,
+ } else {
+ $r->print(' '.&Apache::loncommon::plainname($puname,
$pudom).' ');
- }
- }
- if ($target ne 'tex') {
+ }
+ }
+ if ($target ne 'tex') {
my $lastclose=$element eq $lastpers?1:0;
$r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
- } else {
- $r->print('\\\\ \hline');
- }
+ } else {
+ $r->print('\\\\ \hline');
+ }
}
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('\end{tabular}\\\\');
+ $r->print('\end{tabular}\\\\');
}
# -------------------------------------------------------------- Announcements?
my $day = &Apache::lonannounce::showday(time,2,
- &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
- if ($allowed) {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
- my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
- $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');
- &Apache::lontemplate::print_end_template($r);
- } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
- &Apache::lontemplate::print_end_template($r);
- }
+ if ($allowed) {
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
+ $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');
+ &Apache::lontemplate::print_end_template($r);
+ } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ &Apache::lontemplate::print_end_template($r);
+ }
} else {
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($allowed) {
- $r->print('<form method="post">'.
- '<input type="hidden" name="forceedit" value="edit" />');
+ $r->print('<form method="post">'.
+ '<input type="hidden" name="forceedit" value="edit" />');
}
my @htmlids=();
- 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
- my $urls=$message;
- $message='';
- foreach my $filelink (split(/\n/,$urls)) {
- my $output='';
- # embed style?
- my ($curfext)=($filelink=~/\.([^\.]+)$/);
- my $embstyle=&Apache::loncommon::fileembstyle($curfext);
- if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents
- $output=&Apache::lonnet::ssi_body($filelink);
- } elsif ($embstyle eq 'img') {# embed as an image
- $output='<img src="'.$filelink.'" />';
- }
- if ($output ne '') {
- if ($target ne 'tex') {
- $message.='<p>'.$output.'</p>';
- } else {
- $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
- }
- }
- }
- if ($allowed) {
- $r->print('<h3>'.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>');
- } else {
- $r->print($message);
- }
- } else {
- &Apache::lonfeedback::newline_to_br(\$message);
- $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
- if ($allowed) {
- $message=&Apache::lonspeller::markeduptext($message);
- }
- $message=&Apache::lontexconvert::msgtexconverted($message);
- if ($target ne 'tex') {
- if ($allowed) {
- $r->print('<p>');
- }
- &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
- } else {
- $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
- &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
- }
- push(@htmlids,$field);
- }
- if ($allowed) {
- if ($target ne 'tex') {
- $r->print('</p>');
- &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
- }
- }
- }
+ 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
+ my $urls=$message;
+ $message='';
+ foreach my $filelink (split(/\n/,$urls)) {
+ my $output='';
+ # embed style?
+ my ($curfext)=($filelink=~/\.([^\.]+)$/);
+ my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+ if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents
+ $output=&Apache::lonnet::ssi_body($filelink);
+ } elsif ($embstyle eq 'img') {# embed as an image
+ $output='<img src="'.$filelink.'" />';
+ }
+ if ($output ne '') {
+ if ($target ne 'tex') {
+ $message.='<p>'.$output.'</p>';
+ } else {
+ $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+ }
+ }
+ }
+ if ($allowed) {
+ $r->print('<h3>'.$syllabusfields{$field}.
+ &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>');
+ } else {
+ $r->print($message);
+ }
+ } else {
+ &Apache::lonfeedback::newline_to_br(\$message);
+ $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+ if ($allowed) {
+ $message=&Apache::lonspeller::markeduptext($message);
+ }
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ if ($target ne 'tex') {
+ if ($allowed) {
+ $r->print('<p>');
+ }
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
+ } else {
+ $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
+ &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
+ }
+ push(@htmlids,$field);
+ }
+ if ($allowed) {
+ if ($target ne 'tex') {
+ $r->print('</p>');
+ &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
+ }
+ }
+ }
}
if ($allowed) {
- $r->print('</form>'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
+ $r->print('</form>'.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
}
# if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
- if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
- $r->print(&mt('No syllabus information provided.'));
- if ($target ne 'tex') {$r->print('</p>');}
+ if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
+ $r->print(&mt('No syllabus information provided.'));
+ if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {
if ($env{'form.backto'} eq 'coursecatalog') {
@@ -438,9 +438,9 @@
&Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).
'</form>');
}
- $r->print(&Apache::loncommon::end_page());
+ $r->print(&Apache::loncommon::end_page());
} else {
- $r->print('\end{document}');
+ $r->print('\end{document}');
}
return OK;
}
--amueller1242727674--