--- loncom/interface/lonsimplepage.pm 2009/12/22 06:32:35 1.91
+++ loncom/interface/lonsimplepage.pm 2011/05/03 21:38:40 1.98
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.91 2009/12/22 06:32:35 faziophi Exp $
+# $Id: lonsimplepage.pm,v 1.98 2011/05/03 21:38:40 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,7 @@ use Apache::lonlocal;
use Apache::lonprintout;
use Apache::lonxml;
use Apache::longroup;
+use Apache::lonnavmaps();
use HTML::Entities();
use LONCAPA;
@@ -112,7 +113,7 @@ sub handler {
# --------------------------------------------------------- The syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_title' => 'Page Title',
- 'bbb_content' => 'Content',
+ 'bbb_content' => ($target eq 'tex'?'':'Content'),
'ccc_webreferences' => 'Web References');
if ($group ne '') {
$syllabusfields{'abb_links'} = &mt('Available Group Tools');
@@ -165,7 +166,8 @@ sub handler {
$env{'request.course.id'}.'/'.$group);
if ($group_view_perm || $group_edit_perm || $group_home_view ||
$group_home_edit || &Apache::longroup::check_group_access($group)) {
- if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex')) {
+ if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex') &&
+ (!$env{'form.register'})) {
$r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc));
}
if ((!$group_home_edit) && (!$group_home_view) &&
@@ -223,10 +225,10 @@ sub handler {
}
if ($group ne '') {
$syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload(
- 'uploaddoc',1,"grouppage/$group");
+ 'uploaddoc','coursedoc',"grouppage/$group");
} else {
$syllabus{'uploaded.photourl'}=
- &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage');
+ &Apache::lonnet::userfileupload('uploaddoc','coursedoc','simplepage');
}
}
$syllabus{'uploaded.lastmodified'}=time;
@@ -257,19 +259,28 @@ sub handler {
if ($target ne 'tex') {
if ($allowed || $privileged) {
my $functions=&Apache::lonhtmlcommon::start_funclist();
+ my $url = $r->uri;
+ if ($group ne '') {
+ my $navmap=Apache::lonnavmaps::navmap->new();
+ if (ref($navmap)) {
+ $url = &Apache::longroup::get_group_link($dom,$crs,$group,$navmap);
+ }
+ }
if ($allowed) {
+ $url .= (($url=~/\?/)?'&':'?').'forcestudent=1';
$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 '') {
+ $url .= (($url=~/\?/)?'&':'?').'forceedit=edit'.$refarg;
+ if ($group ne '') {
$edittext = &mt('Edit Group Homepage');
}
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
+ ''
.$edittext.'');
if ($group ne '') {
if ($group_edit_perm) {
@@ -328,7 +339,7 @@ sub handler {
}
#print the image
- my $image;
+ my $image='';
if ($syllabus{'uploaded.photourl'}) {
&Apache::lonnet::allowuploaded('/adm/smppg',
$syllabus{'uploaded.photourl'});
@@ -341,82 +352,49 @@ sub handler {
}
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');
+ &Apache::lontemplate::print_start_template($r, &mt('Upload a Photo'),'LC_Box');
+ $r->print($image);
+ $r->print("
");
+ $r->print(
+ ''.
+ ''.
+ ''.
+ '');
+ &Apache::lontemplate::print_end_template($r);
+
# if ($syllabus{'uploaded.photourl'}) {
# $r->print('');
# }
}
- if ($allowed) {
- $r->print($image.'