[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm lonsyllabus.pm
amueller
amueller@source.lon-capa.org
Fri, 15 May 2009 13:43:46 -0000
This is a MIME encoded message
--amueller1242395026
Content-Type: text/plain
amueller Fri May 15 13:43:46 2009 EDT
Modified files:
/loncom/interface lonaboutme.pm lonsyllabus.pm
Log:
code styling. I.e. 4 whitespaces after an if-statement.
--amueller1242395026
Content-Type: text/plain
Content-Disposition: attachment; filename="amueller-20090515134346.txt"
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.132 loncom/interface/lonaboutme.pm:1.133
--- loncom/interface/lonaboutme.pm:1.132 Thu May 14 10:01:20 2009
+++ loncom/interface/lonaboutme.pm Fri May 15 13:43:46 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.132 2009/05/14 10:01:20 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.133 2009/05/15 13:43:46 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -96,14 +96,14 @@
my $target=$env{'form.grade_target'};
# ------------------------------------------------------------ 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'}));
}
my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri);
my $is_course;
# Is this even a user?
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
- &Apache::loncommon::simple_error_page($r,'No info',
- 'No user information available');
+ &Apache::loncommon::simple_error_page($r,'No info',
+ 'No user information available');
return OK;
} else {
$is_course = &Apache::lonnet::is_course($cdom,$cnum);
@@ -122,10 +122,10 @@
} else {
$r->print(&Apache::loncommon::start_page("Personal Information Page"));
$r->print('<h2>'.&mt('No user personal information page available') .'</h2>'.
- &mt('This is a result of one of the following:').'<ul>'.
- '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.
- '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.
- '</ul>');
+ &mt('This is a result of one of the following:').'<ul>'.
+ '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.
+ '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.
+ '</ul>');
$r->print(&Apache::loncommon::end_page());
}
return OK;
@@ -149,10 +149,10 @@
&display_portfolio_header($r,$is_course);
if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) {
$r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
- &mt('This is a result of one of the following:').'<ul>'.
- '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
- '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
- '</ul>');
+ &mt('This is a result of one of the following:').'<ul>'.
+ '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+ '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+ '</ul>');
} else {
my ($blocked,$blocktext) =
&Apache::loncommon::blocking_status('port',$cnum,$cdom);
@@ -168,7 +168,7 @@
if ($is_course) {
if ($target ne 'tex') {
- my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
+ my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
{href=>"/adm/aboutme",text=>"Course Information"}];
my $start_page =
&Apache::loncommon::start_page(
@@ -207,7 +207,7 @@
# --------------------------------------- There is such a user, get environment
if ($target ne 'tex') {
- my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
my $args = {'function' => $forcestudent,
'domain' => $cdom,
'force_register' => $forceregister};
@@ -216,29 +216,29 @@
} else { # Don't show breadcrumbs in popup window
$args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];
}
- my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);
- $r->print($start_page);
+ my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);
+ $r->print($start_page);
#Print Privacy Note
if ($allowed) {
$r->print('<div class="LC_info">'
- .'<b>'.&mt('Privacy Note:').'</b> '
- .&mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.')
- .'</div>'
- );
- }
+ .'<b>'.&mt('Privacy Note:').'</b> '
+ .&mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.')
+ .'</div>'
+ );
+ }
#Print last modified
- my $lastmod;
+ my $lastmod;
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- $lastmod=$syllabus{'uploaded.lastmodified'};
- $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- $r->print('<div class="LC_info">');
- $r->print(&mt('Last updated').': '.$lastmod . '');
- $r->print('</div>');
+ $lastmod=$syllabus{'uploaded.lastmodified'};
+ $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
+ $r->print('<div class="LC_info">');
+ $r->print(&mt('Last updated').': '.$lastmod . '');
+ $r->print('</div>');
+ }
}
-}
#Print Help Text
if ($target ne 'tex') {
if($allowed){
@@ -249,36 +249,34 @@
#----------------Print Functions
if ($target ne 'tex') {
$r->print(&Apache::lontemplate::start_functionslist());
- if ($allowed) {
- my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
- $r->print(&Apache::lontemplate::item_functionslist(
- '<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
- .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
- }elsif($privleged){
- my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
- $r->print(&Apache::lontemplate::item_functionslist(
- '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
- }
- $r->print(&Apache::lontemplate::item_functionslist(
- &Apache::lontemplate::send_message($r,$cnum,$cdom)));
-
- if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) {
- if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
- $env{'request.course.sec'})) {
- $r->print(&Apache::lontemplate::item_functionslist(
- &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
- }
- if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
- &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.
- $env{'request.course.sec'})) {
- $r->print(&Apache::lontemplate::item_functionslist(
- &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)));
- }
- $r->print(&Apache::lontemplate::item_functionslist(
+ if ($allowed) {
+ my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
+ $r->print(&Apache::lontemplate::item_functionslist(
+ '<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
+ .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
+ } elsif ($privleged) {
+ my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
+ $r->print(&Apache::lontemplate::item_functionslist(
+ '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
+ }
+ $r->print(&Apache::lontemplate::item_functionslist(
+ &Apache::lontemplate::send_message($r,$cnum,$cdom)));
+
+ if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) {
+ if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+ $r->print(&Apache::lontemplate::item_functionslist(
+ &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
+ }
+ if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
+ &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+ $r->print(&Apache::lontemplate::item_functionslist(
+ &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)));
+ }
+ $r->print(&Apache::lontemplate::item_functionslist(
&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)));
- }
- $r->print(&Apache::lontemplate::end_functionslist());
- }
+ }
+ $r->print(&Apache::lontemplate::end_functionslist());
+ }
#------Print Headtitle
if ($target ne 'tex') {
$r->print('<div class="LC_ContentBoxSpecial">');
@@ -288,8 +286,7 @@
$r->print('<h2>"'.$courseenv{'nickname'}.'"</h2>');
}
$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
- }
- else {
+ } else {
$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
}
@@ -298,136 +295,133 @@
my $query_string;
- if (($env{'form.uploaddoc.filename'}) &&
+ if (($env{'form.uploaddoc.filename'}) &&
($env{'form.storeupl'}) && ($allowed)) {
- if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
- }
- $syllabus{'uploaded.photourl'}=
- &Apache::lonnet::userphotoupload('uploaddoc','aboutme');
- }
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
- }
+ if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+ }
+ $syllabus{'uploaded.photourl'}=
+ &Apache::lonnet::userphotoupload('uploaddoc','aboutme');
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
+ }
if ($allowed && $env{'form.delupl'}) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
- delete($syllabus{'uploaded.photourl'});
- &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum);
- }
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+ delete($syllabus{'uploaded.photourl'});
+ &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum);
+ }
+ }
+ if (($allowed) && ($env{'form.storesyl'})) {
+ foreach my $syl_field (keys(%syllabusfields)) {
+ my $field=$env{'form.'.$syl_field};
+ $field=~s/\s+$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,$env{'user.adv'});
+ $syllabus{$syl_field}=$field;
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
}
- if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (keys(%syllabusfields)) {
- my $field=$env{'form.'.$syl_field};
- $field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,
- $env{'user.adv'});
- $syllabus{$syl_field}=$field;
- }
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
- }
-my $image;
+ my $image;
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::allowuploaded('/adm/aboutme',
- $syllabus{'uploaded.photourl'});
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'});
#This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line.
- &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
- #---End Resize---
+ &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
+ #---End Resize---
- $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
+ $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
- if ($target eq 'tex') {
- $image=&Apache::lonxml::xmlparse($r,'tex',$image);
- }
-
- }
-
- if ($allowed) {
- $r->print(
- '<form method="post" enctype="multipart/form-data">'.
- '<h3>'.&mt('Upload a Photo').'</h3>'.
- '<input type="file" name="uploaddoc" size="50" />'.
- '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
- '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
- '</form>');
- if ($syllabus{'uploaded.photourl'}) {
- $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
- }
- $r->print('<p>');
- }
+ if ($target eq 'tex') {
+ $image=&Apache::lonxml::xmlparse($r,'tex',$image);
+ }
- if($allowed) {
- $r->print('<form method="post">');
- }
+ }
- if($target ne 'tex') #print Image
- {
- &Apache::lontemplate::start_ContentBox($r);
- &Apache::lontemplate::end_ContentBox($r);
- $r->print($image);
-
- }#End Print Image
-
- #Print Content eg. Contactinfo aboutme,...
- &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
- #End Print Content
-
- if($target ne 'tex') { #Begin Print RSS and portfiles
- &print_portfiles_link($r,$is_course);
- if (&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));
- &Apache::lontemplate::print_end_template($r);
- }
+ if ($allowed) {
+ $r->print(
+ '<form method="post" enctype="multipart/form-data">'.
+ '<h3>'.&mt('Upload a Photo').'</h3>'.
+ '<input type="file" name="uploaddoc" size="50" />'.
+ '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+ '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
+ '</form>');
+ if ($syllabus{'uploaded.photourl'}) {
+ $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
+ }
+ $r->print('<p>');
+ }
+
+ if($allowed) {
+ $r->print('<form method="post">');
+ }
+
+ if ($target ne 'tex') { #print Image
+ &Apache::lontemplate::start_ContentBox($r);
+ &Apache::lontemplate::end_ContentBox($r);
+ $r->print($image);
+
+ } #End Print Image
+
+ #Print Content eg. Contactinfo aboutme,...
+ &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
+ #End Print Content
+
+ if ($target ne 'tex') { #Begin Print RSS and portfiles
+ &print_portfiles_link($r,$is_course);
+ if (&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));
+ &Apache::lontemplate::print_end_template($r);
+ }
- } #End Print RSS and portfiles
+ } #End Print RSS and portfiles
- if ($allowed) {
- if ($env{'form.popup'}) {
- $r->print('<input type="hidden" name="popup" value="'.
- $env{'form.popup'}.'" />');
- }
- $r->print('</form>');
- }
- if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
+ if ($allowed) {
+ if ($env{'form.popup'}) {
+ $r->print('<input type="hidden" name="popup" value="'.
+ $env{'form.popup'}.'" />');
+ }
+ $r->print('</form>');
+ }
+ if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
} else {
- $r->print('<p>'.&mt('No personal information provided').'.</p>');
+ $r->print('<p>'.&mt('No personal information provided').'.</p>');
}
if ($env{'request.course.id'}
- && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
- && &in_course($cdom,$cnum)) {
- if ($target ne 'tex') {
- $r->print('<a name="coursecomment" />');
- &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
- $r->print('<span class="LC_info">');
- $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
- $r->print('</span> <p>');
- &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
- $r->print('</p>');
- &Apache::lontemplate::print_end_template($r);
-
- } else {
- $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
- &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
- }
+ && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
+ && &in_course($cdom,$cnum)) {
+ if ($target ne 'tex') {
+ $r->print('<a name="coursecomment" />');
+ &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
+ $r->print('<span class="LC_info">');
+ $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
+ $r->print('</span> <p>');
+ &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+ $r->print('</p>');
+ &Apache::lontemplate::print_end_template($r);
+
+ } else {
+ $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
+ &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+ }
}
if ($target ne 'tex') {
- $r->print('</div>');
+ $r->print('</div>');
$r->print('</div>');
if ($env{'form.popup'}) {
$r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
}
- $r->print(&Apache::loncommon::end_page());
+ $r->print(&Apache::loncommon::end_page());
} else {
- $r->print('\end{document}');
+ $r->print('\end{document}');
}
@@ -439,9 +433,9 @@
my ($udom,$uname,$cdom,$cnum,$type) = @_;
$type ||= 'any';
if (!defined($cdom) || !defined($cnum)) {
- my $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
+ my $cid = $env{'request.course.id'};
+ $cdom = $env{'course.'.$cid.'.domain'};
+ $cnum = $env{'course.'.$cid.'.num'};
}
my %roles = &Apache::lonnet::dump('roles',$udom,$uname);
my @course_roles = grep(m{^/\Q$cdom\E/\Q$cnum\E[/_]}, keys(%roles));
@@ -449,15 +443,15 @@
return 1 if ($type eq 'any');
my $now = time();
foreach my $role (@course_roles) {
- my (undef,$role_end,$role_start)=split(/\_/,$roles{$role});
- my $status = 'active';
- if ($role_start > 0 && $now < $role_start) {
- $status = 'future';
- }
- if ($role_end > 0 && $now > $role_end) {
- $status = 'previous';
- }
- return 1 if ($status eq $type);
+ my (undef,$role_end,$role_start)=split(/\_/,$roles{$role});
+ my $status = 'active';
+ if ($role_start > 0 && $now < $role_start) {
+ $status = 'future';
+ }
+ if ($role_end > 0 && $now > $role_end) {
+ $status = 'previous';
+ }
+ return 1 if ($status eq $type);
}
return 0;
}
@@ -485,13 +479,13 @@
'difl' => 'Display file listing',
);
if ($filecounts->{'both'} > 0) {
- $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
- $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4><div class="LC_BoxPadding">';
+ $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
+ $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4><div class="LC_BoxPadding">';
- #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
+ #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
$output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
- $query_string.'">'.$lt{'difl'}.
- '</a><br /><br />';
+ $query_string.'">'.$lt{'difl'}.
+ '</a><br /><br />';
if ($filecounts->{'both'} == 1) {
if ($is_course) {
$output .= &mt('One group portfolio file is available.').'<ul>';
@@ -506,14 +500,14 @@
}
}
if ($filecounts->{'withoutpass'}) {
- $output .= '<li>'.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
+ $output .= '<li>'.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
}
if ($filecounts->{'withpass'}) {
- $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
+ $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
}
$output .= '</ul>';
- $output .='</p>';
- $output .='</div></div>';
+ $output .='</p>';
+ $output .='</div></div>';
}
$r->print($output);
return;
@@ -601,8 +595,8 @@
}
my $output = '<form action="'.&HTML::Entities::encode($r->uri,'<>&"')
- .'" name="displaystatus" method="post">'.
- &mt('File access type: ').'<select name="portaccess">';
+ .'" name="displaystatus" method="post">'.
+ &mt('File access type: ').'<select name="portaccess">';
foreach my $type ('withoutpass','withpass','both') {
$output .= '<option value="'.$type.'" ';
if ($portaccess eq $type) {
@@ -611,8 +605,8 @@
$output .= '>'.$lt{$type}.'</option>';
}
$output .= '</select>'."\n".
- '<input type="submit" name="portaccessbutton" value="'.
- &mt('Update display').'" />';
+ '<input type="submit" name="portaccessbutton" value="'.
+ &mt('Update display').'" />';
$output .= '</form><br /><br />';
$r->print($output);
my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course,
@@ -694,7 +688,7 @@
$allfileshash,$group) = @_;
foreach my $filename (sort(keys(%{$access_info}))) {
my $access_status =
- &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group, $$access_info{$filename});
+ &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$$access_info{$filename});
if ($portaccess eq 'both') {
if (($access_status ne 'ok') &&
($access_status !~ /^[^:]+:guest_/)) {
@@ -760,50 +754,49 @@
if (ref($currhash->{$item}) eq 'HASH') {
my $title=&HTML::Entities::encode($item,'<>&"');
$output .= '<img src="'.&Apache::loncommon::lonhttpdurl("/adm/lonIcons/navmap.folder.open.gif").'" alt="'.&mt('Folder').' '.$title.'" class="LC_icon" /> '.$title;
- $output .= '</td><td> </td>'
+ $output .= '</td><td> </td>'
.&Apache::loncommon::end_data_table_row();
$output .= &parse_directory($r,$depth,$currhash->{$item},
$path.'/'.$item,$is_course,$group);
} else {
- my $file_name;
- if ($currhash->{$item} =~ m|/([^/]+)$|) {
- $file_name = $1;
- } else {
- $file_name = $currhash->{$item};
- }
- my $have_meta = exists($dirlist{$file_name.'.meta'});
+ my $file_name;
+ if ($currhash->{$item} =~ m|/([^/]+)$|) {
+ $file_name = $1;
+ } else {
+ $file_name = $currhash->{$item};
+ }
+ my $have_meta = exists($dirlist{$file_name.'.meta'});
my $url;
if ($is_course) {
$url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group.
- '/portfolio/'.$currhash->{$item};
+ '/portfolio/'.$currhash->{$item};
} else {
- $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.
- $currhash->{$item};
+ $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.$currhash->{$item};
}
my $showname;
- if ($have_meta) {
- $showname = &Apache::lonnet::metadata($url,'title');
- }
- if ($showname eq '') {
- $showname = $file_name;
- } else {
- $showname = $file_name.' ('.$showname.')';
- }
+ if ($have_meta) {
+ $showname = &Apache::lonnet::metadata($url,'title');
+ }
+ if ($showname eq '') {
+ $showname = $file_name;
+ } else {
+ $showname = $file_name.' ('.$showname.')';
+ }
$showname=&HTML::Entities::encode($showname,'<>&"');
$output .= '<a href="'.$url.'">'.
- '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />'.
- ' '.$showname.'</a>';
- $output.='</td><td>';
- if ($have_meta) {
- $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
- &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
- '" class="LC_icon" /></a>';
- }
- $output .= '</td>'
- .&Apache::loncommon::end_data_table_row();
+ '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />'.
+ ' '.$showname.'</a>';
+ $output.='</td><td>';
+ if ($have_meta) {
+ $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
+ &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
+ '" class="LC_icon" /></a>';
+ }
+ $output .= '</td>'
+ .&Apache::loncommon::end_data_table_row();
}
- }
+ }
return $output;
}
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.89 loncom/interface/lonsyllabus.pm:1.90
--- loncom/interface/lonsyllabus.pm:1.89 Mon May 11 13:34:10 2009
+++ loncom/interface/lonsyllabus.pm Fri May 15 13:43:46 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.89 2009/05/11 13:34:10 bisitz Exp $
+# $Id: lonsyllabus.pm,v 1.90 2009/05/15 13:43:46 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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,13 +76,13 @@
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",
+ $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
$externalsyllabus));
}
return OK;
- }
+ }
# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields
@@ -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";
@@ -118,11 +118,11 @@
<script type="text/javascript">
function ToCatalog(caller) {
numidx = getIndexByName('coursenum');
- if (numidx > -1) {
- if (caller != 'details') {
- document.backtocat.elements[numidx].value = '';
+ if (numidx > -1) {
+ if (caller != 'details') {
+ document.backtocat.elements[numidx].value = '';
+ }
}
- }
document.backtocat.submit();
}
@@ -139,27 +139,27 @@
ENDSCRIPT
}
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
+ 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
- ({href=>"javascript:ToCatalog()",
- text=>"Course Catalog"});
+ ({href=>"javascript:ToCatalog()",
+ text=>"Course Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog('details')",
- text=>"Course details"});
+ ({href=>"javascript:ToCatalog('details')",
+ text=>"Course details"});
}
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>$r->uri,
- text=>"Course syllabus"});
+ ({href=>$r->uri,
+ text=>"Course syllabus"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs());
}
@@ -173,67 +173,67 @@
# ----------------------------------------------------- Only if not public call
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'}) {
- $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- $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)) {
- my $field=$env{'form.'.$syl_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;
- if ($syl_field eq 'lll_includeurl') { # clean up included URLs
- my $field='';
- foreach my $value (split(/\n/,$syllabus{$syl_field})) {
- my $url=$value;
+ if ($env{'request.course.id'}
+ && $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';
+ }
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
+ }
+ if (($allowed) && ($env{'form.storesyl'})) {
+ foreach my $syl_field (keys(%syllabusfields)) {
+ my $field=$env{'form.'.$syl_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;
+ if ($syl_field eq 'lll_includeurl') { # clean up included URLs
+ my $field='';
+ 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 $remainder=$2;
+ $url=~s/^\s+//;
+ $url=~s/\s+$//;
+ if ($url=~m|^https?\://([^/]+)/(.+)$|) {
+ 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)) {
- if ($possible_host =~ /\Q$hostname\E/i) {
- $url=$remainder;
- }
- }
- }
+ 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;
+ }
+ }
+ }
# norm internal URLs
- unless ($url=~/^https?\:/) {
- $url=&Apache::lonnet::clutter($url);
- }
+ unless ($url=~/^https?\:/) {
+ $url=&Apache::lonnet::clutter($url);
+ }
# re-assemble field
- if ($url) {
- $field.=$url."\n";
- }
- }
- $syllabus{$syl_field}=$field;
- }
- }
- $syllabus{'uploaded.domain'}=$env{'user.domain'};
- $syllabus{'uploaded.name'}=$env{'user.name'};
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
- }
+ if ($url) {
+ $field.=$url."\n";
+ }
+ }
+ $syllabus{$syl_field}=$field;
+ }
+ }
+ $syllabus{'uploaded.domain'}=$env{'user.domain'};
+ $syllabus{'uploaded.name'}=$env{'user.name'};
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
+ }
}
#---------------------Print External URL Syllabus Info
-if( ($allowed) && ($target ne 'tex') ) {
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
+ if( ($allowed) && ($target ne 'tex') ) {
+ 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>')
@@ -244,195 +244,193 @@
,'<a href="/adm/parmset?action=crsenv">','</a>')
.'</p>'
);
-}
+ }
#-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 ($target ne 'tex') {
+ 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'};
- $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- my $who = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $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
+ my $lastmod=$syllabus{'uploaded.lastmodified'};
+ $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
+ my $who = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},
+ $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
: '' ) .
'</div>' );
- } else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
- ($who? &mt('by').'\\\\ '.
+ } else {
+ $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) {
- $r->print(&Apache::lontemplate::start_functionslist());
+ if ($target ne 'tex') {
+ if( $allowed || $privileged) {
+ $r->print(&Apache::lontemplate::start_functionslist());
if ($allowed) {
- $r->print(&Apache::lontemplate::item_functionslist(
+ $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) {
- $r->print(&Apache::lontemplate::item_functionslist(
+ $r->print(&Apache::lontemplate::item_functionslist(
'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>'));
}
- $r->print(&Apache::lontemplate::end_functionslist());
+ $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>');
-} else {
- $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
- &Apache::lonnet::domain($cdom,'description').'}\\\\');
-}
+ if ($target ne 'tex') {
+ $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').'}\\\\');
+ }
# -------------------------------------------------------- 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).' & ');
- }
- foreach (split(/\,/,$coursepersonnel{$element})) {
- my ($puname,$pudom)=split(/\:/,$_);
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 $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));
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';
+ 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);
- }
+ &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" />');
- }
- 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);
- }
-
- }
- }
- }
+ if ($allowed) {
+ $r->print('<form method="post">'.
+ '<input type="hidden" name="forceedit" value="edit" />');
+ }
+ my @htmlids=();
- if ($allowed) {
- $r->print('</form>'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@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);
+ }
+ }
+ }
+ }
+ if ($allowed) {
+ $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') {
@@ -440,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;
}
--amueller1242395026--