--- loncom/interface/lonsimplepage.pm 2008/12/03 22:00:41 1.59
+++ loncom/interface/lonsimplepage.pm 2009/02/13 17:26:56 1.65
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.59 2008/12/03 22:00:41 schafran Exp $
+# $Id: lonsimplepage.pm,v 1.65 2009/02/13 17:26:56 neumanie 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,11 +216,11 @@ sub handler {
if ($forcestudent or $target eq 'tex') { $allowed=0; }
if ($allowed) {
- $r->print('
'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
- .'
'
+ $r->print(''.'
'
.''.&mt('Show Student View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'
');
+ &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 '') {
@@ -252,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};
@@ -270,17 +278,17 @@ 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='';
+ $image='';
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
- }
- $r->print($image);
- }
+ }
+ }
if ($allowed) {
$r->print(
'');
@@ -366,7 +385,7 @@ sub handler {
if ($group ne '') {
&display_group_links($r,$target,$group,'view',$refarg,%groupinfo);
} else {
- $r->print(&mt('No page information provided.
'));
+ $r->print(''.&mt('No page information provided.').'
');
}
}
if ($env{'form.grade_target'} ne 'tex') {
@@ -409,16 +428,27 @@ sub display_group_links {
}
}
if (@available > 0) {
- my $output = '';
+ my $output = '';
+ if ($target eq 'tex') {
+ $output = '';
+ } else {
+ $output = &Apache::loncommon::start_data_table();
+ }
foreach my $tool (@available) {
if ($target eq 'tex') {
- $output .= ''.&mt($menu{$tool}{text}).' | ';
+ $output .= ''.&mt($menu{$tool}{text}).' |
';
} else {
- $output .= ''.
- &mt($menu{$tool}{text}).' | ';
+ $output .= &Apache::loncommon::start_data_table_row()
+ .''
+ .&mt($menu{$tool}{text}).' | '
+ .&Apache::loncommon::end_data_table_row();
}
}
- $output .= '
';
+ if ($target eq 'tex') {
+ $output .= '
';
+ } else {
+ $output .= &Apache::loncommon::end_data_table();
+ }
if ($target eq 'tex') {
$r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'
'.$output));
} else {
@@ -447,7 +477,7 @@ sub grouppage_breadcrumbs {
text=>"Groups",
title=>"Display Groups"},
{href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist",
- text=>"Group: $description",
+ text=>&mt('Group:')." $description",
title=>"Go to group's home page"},
);
my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]',