--- loncom/interface/lonsimplepage.pm 2009/04/15 10:49:30 1.78 +++ loncom/interface/lonsimplepage.pm 2009/12/15 20:48:53 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.78 2009/04/15 10:49:30 bisitz Exp $ +# $Id: lonsimplepage.pm,v 1.90 2009/12/15 20:48:53 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,10 +51,10 @@ sub get_db_name { my $db_name; if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { - $marker =~ s/\W//g; - $db_name = 'grppage_'.$marker; + $marker =~ s/\W//g; + $db_name = 'grppage_'.$marker; } else { - $marker=~s/\D//g; + $marker=~s/\D//g; $db_name = 'smppage_'.$marker; } return if (!defined($marker)); @@ -70,17 +70,17 @@ sub handler { 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'})); } # Is this even in a course? unless ($env{'request.course.id'}) { - if ($target ne 'tex') { - &Apache::loncommon::simple_error_page($r,'','Not in a course'); - } else { - $r->print('\textbf{Not in a course}\end{document}'); - } - return OK; + if ($target ne 'tex') { + &Apache::loncommon::simple_error_page($r,'','Not in a course'); + } else { + $r->print('\textbf{Not in a course}\end{document}'); + } + return OK; } my $db_name = &get_db_name($r->uri); @@ -93,20 +93,20 @@ sub handler { my %groupinfo = (); if ($db_name =~ /^grppage_/) { $group = (split(m{/},$r->uri))[4]; - $group =~ s/\W//g; + $group =~ s/\W//g; my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group); if (!%curr_groups) { - &Apache::loncommon::simple_error_page($r,'','Invalid group name'); - return OK; + &Apache::loncommon::simple_error_page($r,'','Invalid group name'); + return OK; } %groupinfo = - &Apache::longroup::get_group_settings($curr_groups{$group}); + &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); } if (!$db_name) { - &Apache::loncommon::simple_error_page($r,'','Invalid call'); - return OK; + &Apache::loncommon::simple_error_page($r,'','Invalid call'); + return OK; } # --------------------------------------------------------- The syllabus fields @@ -143,13 +143,13 @@ sub handler { if ($group ne '') { $title = 'Simple Group Page'; } - my $start_page = - &Apache::loncommon::start_page($title,undef, - {'function' => $forcestudent, - 'domain' => $dom, - 'force_register' => - $env{'form.register'},}); - $r->print($start_page); + my $start_page = + &Apache::loncommon::start_page($title,undef, + {'function' => $forcestudent, + 'domain' => $dom, + 'force_register' => + $env{'form.register'},}); + $r->print($start_page); } if ($group ne '') { @@ -179,15 +179,15 @@ sub handler { return OK; } } else { - my $msg = - &mt('You do not currently have rights to view this group.'); + my $msg = + &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { - $r->print("

$msg

". - &Apache::loncommon::end_page()); + $r->print('

'.$msg.'

'. + &Apache::loncommon::end_page()); } else { $r->print('\textbf{'.$msg.'}\end{document}'); } - return OK; + return OK; } my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('groups'); @@ -210,193 +210,216 @@ sub handler { } my $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; + $forcestudent='student'; } if ($forcestudent or $target eq 'tex') { $allowed=0; } if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && - ($env{'form.storeupl'}) && ($allowed)) { - if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - } + ($env{'form.storeupl'}) && ($allowed)) { + if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } if ($group ne '') { $syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload( 'uploaddoc',1,"grouppage/$group"); } else { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); } - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); - } - if ($allowed && $env{'form.delupl'}) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - delete($syllabus{'uploaded.photourl'}); - &Apache::lonnet::del('simplepage',['uploaded.photourl']); } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } +# if ($allowed && $env{'form.delupl'}) { +# if ($syllabus{'uploaded.photourl'}) { +# &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); +# delete($syllabus{'uploaded.photourl'}); +# &Apache::lonnet::del('simplepage',['uploaded.photourl']); +# } +# } 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/\$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$syl_field}=$field; - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); + foreach my $syl_field (keys(%syllabusfields)) { + my $field=$env{'form.'.$syl_field}; + chomp($field); + $field=~s/\s+$//s; + $field=~s/^\s+//s; + $field=~s/\$//s; + $field=&Apache::lonfeedback::clear_out_html($field,1); + $syllabus{$syl_field}=$field; + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } -#---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'))); - } -} #---Print Function - if ($target ne 'tex') { - if($allowed || $privileged){ - $r->print(&Apache::lontemplate::start_functionslist()); - if($allowed){ - $r->print(&Apache::lontemplate::item_functionslist( - ''.&mt('Show Student View').'' - .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); - }elsif($privileged){ - my $edittext = &mt('Edit'); - if ($group ne '') { - $edittext = &mt('Edit Group Homepage'); - } - $r->print(&Apache::lontemplate::item_functionslist( - ''.$edittext.'')); - if ($group ne '') { - if ($group_edit_perm) { - $r->print(&Apache::lontemplate::item_functionslist( - '' - .&mt('Edit Group Settings').'')); - } - } - } - $r->print(&Apache::lontemplate::end_functionslist()); - } - } + if ($target ne 'tex') { + if ($allowed || $privileged) { + my $functions=&Apache::lonhtmlcommon::start_funclist(); + if ($allowed) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Show Student View').'' + .&Apache::loncommon::help_open_topic( + 'Uploaded_Templates_PublicView')); + } elsif ($privileged) { + my $edittext = &mt('Edit'); + if ($group ne '') { + $edittext = &mt('Edit Group Homepage'); + } + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .$edittext.''); + if ($group ne '') { + if ($group_edit_perm) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Edit Group Settings') + .''); + } + } + } + $functions.=&Apache::lonhtmlcommon::end_funclist(); + $r->print(&Apache::loncommon::head_subbox($functions)); + } + } + +#---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'))); + } + } # ---------------------------------------------------------------- Get syllabus if ((($syllabus{'uploaded.lastmodified'}) && (($group ne '' && ($group_home_view || $group_edit_perm || $group_view_perm)) || ($group eq ''))) || ($allowed)) { - my $image; - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::allowuploaded('/adm/smppg', - $syllabus{'uploaded.photourl'}); - - $image=''; - if ($target eq 'tex') { - $image=&Apache::lonxml::xmlparse($r,'tex',$image); + #Print the title + my $titletext=$syllabus{'aaa_title'}; + if ($target ne 'tex') { + if ($allowed) { + } + $r->print('

'.$titletext.'

'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$titletext.'

')); + } + if ($allowed) { + if ($env{'form.grade_target'} ne 'tex') { + #editbox for title + $r->print('
'); + &Apache::lontemplate::print_template($r, &mt('Title'), $titletext, $allowed, 'LC_Box'); + &Apache::lontemplate::print_editbox_template($r,$syllabus{'aaa_title'},'aaa_title'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{'aaa_title'},$safeinit)); } } - if ($allowed) { - $r->print( - ''. - ''. - '

'.&mt('Upload a Photo').'

'. - ''. - ''. - '
'. - ''. - '' ); - } - if($allowed){ - $r->print($image.'
 
'); - } + #print the image + my $image; + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::allowuploaded('/adm/smppg', + $syllabus{'uploaded.photourl'}); + + $image=''.&mt('Image').''; + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); + } + } - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed) || + if ($allowed) { + $r->print(''); + my $upload_photo_label = &mt('Upload a Photo'); + my $upload_button_label = &mt('Upload'); + + my $content_for_upload_photo=<<"UPLOAD_PHOTO"; + + + +UPLOAD_PHOTO + &Apache::lontemplate::print_template($r, $upload_photo_label,$content_for_upload_photo,$allowed, 'LC_Box'); + +# if ($syllabus{'uploaded.photourl'}) { +# $r->print(''); +# } + } + if ($allowed) { + $r->print($image.'
 
'); + } + if (!$allowed) {$r->print($image); } + + foreach my $field (sort(keys(%syllabusfields))) { + if (($syllabus{$field}) || ($allowed) || ($field eq 'abb_links' && $group ne '')) { - my $message=$syllabus{$field}; - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - if ($target ne 'tex') { - $message=&Apache::lontexconvert::msgtexconverted($message); - } + my $message=$syllabus{$field}; + if (!&Apache::lonfeedback::contains_block_html($message)) { + &Apache::lonfeedback::newline_to_br(\$message); + } + $message=~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } + if ($target ne 'tex') { + $message=&Apache::lontexconvert::msgtexconverted($message); + } if ($field eq 'abb_links' && $group ne '') { $r->print('
'); &display_group_links($r,$target,$group,'edit',$refarg, - %groupinfo); + %groupinfo); $r->print('
'); } elsif ($field eq 'aaa_title') { + next; + } else { if ($target ne 'tex') { - if($allowed){ - $r->print('

'); - } - $r->print('

'.$message.'

'); + if ($allowed) { + } + &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); } else { my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); } if ($allowed) { - if ($env{'form.grade_target'} ne 'tex') { - &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); - $r->print('

'); + if ($target ne 'tex') { + &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } } - if(!$allowed) {$r->print($image); } - } else { - if ($target ne 'tex') { - if($allowed){ - $r->print('

'); - } - &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); - $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); - } - if ($allowed) { - if ($target ne 'tex') { - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); - $r->print('

'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); - } - } - } - } - } - if ($allowed && ($env{'form.grade_target'} ne 'tex')) { - $r->print(&Apache::lonhtmlcommon::htmlareaselectactive - ('bbb_content').''); - } - if ($env{'form.grade_target'} ne 'tex') {$r->print('

');} + } + } + } + if ($allowed && ($env{'form.grade_target'} ne 'tex')) { + $r->print(&Apache::lonhtmlcommon::htmlareaselectactive + ('bbb_content').''); + } + } else { if ($group ne '') { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); } else { - $r->print('

'.&mt('No page information provided.').'

'); + my $text=&mt('No page information provided.'); + if ($target ne 'tex') { + $r->print('

'.$text.'

'); + } else { + $r->print($text) + } } } if ($env{'form.grade_target'} ne 'tex') { - $r->print(&Apache::loncommon::end_page()); + $r->print(&Apache::loncommon::end_page()); } else { - $r->print('\end{document}'); + $r->print('\end{document}'); } return OK; }