--- loncom/interface/lonsimplepage.pm 2008/01/28 10:32:47 1.54
+++ loncom/interface/lonsimplepage.pm 2008/12/17 09:44:04 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.54 2008/01/28 10:32:47 foxr Exp $
+# $Id: lonsimplepage.pm,v 1.62 2008/12/17 09:44:04 ehlerst Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,7 @@ package Apache::lonsimplepage;
use strict;
use Apache::Constants qw(:common);
use Apache::loncommon;
+use Apache::lontemplate;
use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
@@ -215,9 +216,11 @@ sub handler {
if ($forcestudent or $target eq 'tex') { $allowed=0; }
if ($allowed) {
- $r->print('
'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').' '.&mt('Show Student View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'
');
+ $r->print('
'.' '
+ .''.&mt('Show Student View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
+ .'
');
} elsif ($privileged and $target ne 'tex') {
my $edittext = &mt('Edit');
if ($group ne '') {
@@ -250,6 +253,13 @@ sub handler {
$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};
@@ -268,27 +278,33 @@ sub handler {
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'});
- my $image='';
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
- }
- $r->print($image);
- }
+ }
+ }
if ($allowed) {
$r->print(
'');
}
+ &Apache::lontemplate::start_columnSection($r);
+ if($allowed){
+ $r->print($image.'
');
+ }
+ &Apache::lontemplate::start_ContentBox($r,$allowed);
foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}) || ($allowed) ||
($field eq 'abb_links' && $group ne '')) {
@@ -299,11 +315,9 @@ sub handler {
if ($allowed) {
$message=&Apache::lonspeller::markeduptext($message);
}
- &Apache::lonnet::logthis("Prior to texconvert: '$message'");
if ($target ne 'tex') {
$message=&Apache::lontexconvert::msgtexconverted($message);
}
- &Apache::lonnet::logthis("After texconvert: '$message'");
if ($field eq 'abb_links' && $group ne '') {
$r->print(' ');
@@ -312,6 +326,9 @@ sub handler {
$r->print(' ');
} elsif ($field eq 'aaa_title') {
if ($target ne 'tex') {
+ if($allowed){
+ $r->print('
');
+ }
$r->print('
'.$message.'
');
} else {
my $safeinit;
@@ -319,38 +336,29 @@ sub handler {
}
if ($allowed) {
if ($env{'form.grade_target'} ne 'tex') {
- $r->print(
- ' Title ');
+ $r->print('
'.&mt('Title').'
');
+ &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
+ $r->print('');
} else {
my $safeinit;
$r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
}
}
} else {
- if (($field ne 'bbb_content') || ($allowed)) {
- if ($target ne 'tex') {
- &Apache::lonnet::logthis("contents in web presentation '$syllabusfields{$field}'");
- $r->print('
'.$syllabusfields{$field}.'
');
- } else {
- &Apache::lonnet::logthis("contents in tex presentation '$syllabusfields{$field}'");
- my $safeinit;
- $r->print(&Apache::lonxml::xmlparse($r,'tex','
'.$syllabusfields{$field}.'
'));
- }
- }
if ($target ne 'tex') {
- $r->print('
';
+ &mt($menu{$tool}{text}).'';
}
}
$output .= '';
@@ -431,7 +449,7 @@ sub display_group_links {
if ($context eq 'edit') {
$output = &mt('No group functionality.');
} else {
- $output = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: [_1].',&unescape($groupinfo{'description'}));
+ $output = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: [_1].',''.&unescape($groupinfo{'description'}).'');
}
if ($target eq 'tex') {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$output));