--- loncom/interface/lonsimplepage.pm	2009/12/22 06:32:35	1.91
+++ loncom/interface/lonsimplepage.pm	2010/02/23 14:18:12	1.94
@@ -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.94 2010/02/23 14:18:12 raeburn 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;
 
@@ -257,19 +258,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(
-                                '<a href="'.$r->uri.'?forcestudent=1">'
+                                '<a href="'.$url.'">'
                                .&mt('Show Student View').'</a>'
                                .&Apache::loncommon::help_open_topic(
                                     'Uploaded_Templates_PublicView'));
             } elsif ($privileged) {
                 my $edittext = &mt('Edit');
-                    if ($group ne '') {
+                $url .= (($url=~/\?/)?'&amp;':'?').'forceedit=edit'.$refarg;
+                if ($group ne '') {
                     $edittext = &mt('Edit Group Homepage');
                 }
                 $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                                '<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">'
+                                '<a href="'.$url.'">'
                                .$edittext.'</a>');
                 if ($group ne '') {
                     if ($group_edit_perm) {
@@ -328,7 +338,7 @@ sub handler {
         }
 
         #print the image
-        my $image;
+        my $image='';
         if ($syllabus{'uploaded.photourl'}) {
             &Apache::lonnet::allowuploaded('/adm/smppg',
                     $syllabus{'uploaded.photourl'});
@@ -341,79 +351,46 @@ sub handler {
         }
 
         if ($allowed) {
-            $r->print('<input type="hidden" name="forceedit" value="edit" />');
-            my $upload_photo_label = &mt('Upload a Photo');
-            my $upload_button_label = &mt('Upload');
-
-            my $content_for_upload_photo=<<"UPLOAD_PHOTO";
-                  <input type="file" name="uploaddoc" size="50" />
-                  <input type="submit" name="storeupl" value="$upload_button_label" />
-                  <input type="hidden" name="forceedit" value="edit" />
-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("<br /><br />");
+            $r->print(
+                '<input type="hidden" name="forceedit" value="edit" />'.
+                '<input type="file" name="uploaddoc" size="50" />'.
+                '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+                '<input type="hidden" name="forceedit" value="edit" />');
+            &Apache::lontemplate::print_end_template($r);
+    
 
 #            if ($syllabus{'uploaded.photourl'}) {
 #                $r->print('<input type="submit" name="delupl"'
 #                         .' value="'.&mt('Delete Photo').'" />');
 #            }
         }
-        if ($allowed) {
-            $r->print($image.'<div class="LC_footer_clear">&nbsp;</div>');
-        }
-        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};
-                if (!&Apache::lonfeedback::contains_block_html($message)) {
-               		&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);
-                }
-                if ($target ne 'tex') {
-                    $message=&Apache::lontexconvert::msgtexconverted($message);
-                }
-                if ($field eq 'abb_links' && $group ne '') {
-                    $r->print('<br /><input type="hidden" name="'.$field.
-                                          '" value="'.$syllabus{$field}.'" />');
-                    &display_group_links($r,$target,$group,'edit',$refarg,
-                                    %groupinfo);
-                    $r->print('<br />');
-                } elsif ($field eq 'aaa_title') {
-                    next;
-                } else {
-                    if ($target ne 'tex') {
-                        if ($allowed) {
-                        } else {
-                        	&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
-                        }
-                    } else {
-                        my $safeinit;
-                        $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
-                        $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
-                    }
-                    if ($allowed) {
-                        if ($target ne 'tex') {
-							#output of syllabusfields will be generated here. 
-							&Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box');
-							$r->print($message);
-							$r->print("<br /><div>");
-							&Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
-								$field, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
-							&Apache::lontemplate::print_saveall_template($r);
-							$r->print("</div>");
-							&Apache::lontemplate::print_end_template($r);                        
-						} else {
-                            my $safeinit;
-                            $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
-                        }
-                    }
-                }
-            }
-        }
+        #Image in Student view and printout.
+        else {
+            $r->print($image);
+        }
+       	
+        my $links_handler = sub { 
+        	my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;
+			if ($group ne '') {
+				my %data = %{$data_ref};
+				my %fields = %{$fields_ref};
+				$r->print('<br /><input type="hidden" name="'.$field.
+					'" value="'.$data{$field}.'" />');
+				&display_group_links($r, $target, $group, 'edit', $refarg, %groupinfo);
+				$r->print('<br />');
+			}
+        };
+        my $title_handler = sub {};
+		my %custom_handlers = (
+			'abb_links' => $links_handler,
+			'aaa_title' => $title_handler
+		);
+		&Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, 
+			$target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_handlers, $group);
+		
         if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
             $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
                 ('bbb_content').'</form>');