--- loncom/interface/lonsyllabus.pm 2009/09/07 18:31:50 1.96
+++ loncom/interface/lonsyllabus.pm 2012/10/04 13:41:10 1.112
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.96 2009/09/07 18:31:50 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.112 2012/10/04 13:41:10 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,13 +52,13 @@ sub handler {
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']);
+ ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
# ----------------------------------------------------- Is this even a course?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
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',
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
'No syllabus available');
return OK;
}
@@ -74,14 +74,8 @@ sub handler {
my $externalsyllabus=$courseenv{'externalsyllabus'};
if ($externalsyllabus=~/\w/) {
-
- if ($env{'form.wrapperdisplay'} eq 'menu') {
- $r->print(&Apache::lonwrapper::simple_menu());
- } else {
- $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
- $externalsyllabus));
- }
- return OK;
+ $r->print( Apache::lonwrapper::wrapper($externalsyllabus) );
+ return OK;
}
# ------------------------------ The buck stops here: internal syllabus display
@@ -141,7 +135,7 @@ ENDSCRIPT
}
my $start_page =
&Apache::loncommon::start_page("Syllabus", $rss_link.$js,
- {'function' => $forcestudent,
+ {'function' => undef,
'domain' => $cdom,
'force_register' =>
$env{'form.register'},});
@@ -151,7 +145,7 @@ ENDSCRIPT
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog()",
- text=>"Course Catalog"});
+ text=>"Course/Community Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('details')",
@@ -182,6 +176,7 @@ ENDSCRIPT
}
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
+ #store what the user typed in
if (($allowed) && ($env{'form.storesyl'})) {
foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
@@ -190,6 +185,7 @@ ENDSCRIPT
$field=~s/^\s+//s;
$field=~s/\<br\s*\/*\>$//s;
$field=&Apache::lonfeedback::clear_out_html($field,1);
+ #here it will be stored
$syllabus{$syl_field}=$field;
if ($syl_field eq 'lll_includeurl') { # clean up included URLs
my $field='';
@@ -232,17 +228,31 @@ ENDSCRIPT
#--------Functions
if( ($allowed || $privileged) && $target ne 'tex') {
my $functions=&Apache::lonhtmlcommon::start_funclist();
-
if ($allowed) {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ #if you have the register flag, keep it
+ if($env{'form.register'} == 1) {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$r->uri.'?forcestudent=1&register=1">'
+ .&mt('Show Public View').'</a>'
+ .&Apache::loncommon::help_open_topic(
+ 'Uploaded_Templates_PublicView'));
+ } else {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
'<a href="'.$r->uri.'?forcestudent=1">'
.&mt('Show Public View').'</a>'
.&Apache::loncommon::help_open_topic(
'Uploaded_Templates_PublicView'));
+ }
} elsif ($privileged) {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ if($env{'form.register'} == 1) {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$r->uri.'?forceedit=1&register=1">'
+ .&mt('Edit').'</a>');
+ } else {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
'<a href="'.$r->uri.'?forceedit=1">'
.&mt('Edit').'</a>');
+ }
}
$functions.=&Apache::lonhtmlcommon::end_funclist();
@@ -260,7 +270,7 @@ ENDSCRIPT
.'</p>'
.'<p class="LC_info">'
.&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
- ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
+ ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
.'</p>'
);
#-Print Help Text
@@ -272,10 +282,20 @@ ENDSCRIPT
#----------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'});
+ my $who;
+ if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
+ $who = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
+ } else {
+ # Public user?
+ # Only display name of user, but no link to personal information page
+ $who = &Apache::loncommon::plainname(
+ $syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
+ }
+
if ($target ne 'tex') {
$r->print('<div class="LC_info">'.&mt('Last updated').': '.
$lastmod . ' '.
@@ -313,22 +333,24 @@ ENDSCRIPT
} else {
$r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
+ my @coursepersonlist;
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);
+ push(@coursepersonlist,$courseperson);
} else {
- $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+ push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
$puname,$pudom));
}
} else {
- $r->print(' '.&Apache::loncommon::plainname($puname,
+ push(@coursepersonlist,&Apache::loncommon::plainname($puname,
$pudom).' ');
}
}
+ $r->print(join(", ",@coursepersonlist));
if ($target ne 'tex') {
my $lastclose=$element eq $lastpers?1:0;
$r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
@@ -346,13 +368,13 @@ ENDSCRIPT
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
if ($allowed) {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
$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_Box');
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
&Apache::lontemplate::print_end_template($r);
}
@@ -366,67 +388,55 @@ ENDSCRIPT
$r->print('<form method="post" action="">'.
'<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') {
- &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
- } else {
- $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
- &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
- }
- push(@htmlids,$field);
- }
- if ($allowed) {
- if ($target ne 'tex') {
- &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
- }
- }
- }
- }
+ my $url_include_handler = sub {
+ my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;
+ my %data = %{$data_ref};
+ my %fields = %{$fields_ref};
+ 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) {
+ &Apache::lonfeedback::newline_to_br(\$urls);
+ &Apache::lontemplate::print_start_template($r,$fields{$field}.
+ &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');
+ $r->print($urls);
+ $r->print("<br /><div>");
+ &Apache::lontemplate::print_textarea_template($r, $data{$field},
+ $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+ &Apache::lontemplate::print_saveall_template($r);
+ $r->print("</div>");
+ &Apache::lontemplate::print_end_template($r);
+
+ } else {
+ $r->print($message);
+ }
+ };
+ my %custom_hash = ( 'lll_includeurl' => $url_include_handler );
+ &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,
+ $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
if ($allowed) {
$r->print('</form>'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
+ &Apache::lonhtmlcommon::htmlareaselectactive());
}
- # if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
- if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
+ if ($target ne 'tex') {$r->print('<p class="LC_info">');} else {$r->print('\par ');}
$r->print(&mt('No syllabus information provided.'));
if ($target ne 'tex') {$r->print('</p>');}
}