--- loncom/interface/lonsimplepage.pm	2009/02/24 18:20:49	1.71
+++ loncom/interface/lonsimplepage.pm	2009/03/27 15:46:38	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.71 2009/02/24 18:20:49 hauer Exp $
+# $Id: lonsimplepage.pm,v 1.77 2009/03/27 15:46:38 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,10 +214,7 @@ sub handler {
     }
 
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
-
-    if ($allowed) {
-	$r->print('<p>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')) .'</p>');             
-    } 
+   
     if (($env{'form.uploaddoc.filename'} and $target ne 'tex') &&
 	($env{'form.storeupl'}) && ($allowed)) {
 	if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -256,6 +253,40 @@ sub handler {
 	&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(
+                                    '<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Student View').'</a>'
+                                   .&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(
+                                    '<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">'.$edittext.'</a>'));
+        			if ($group ne '') {
+            				if ($group_edit_perm) {
+                                                $r->print(&Apache::lontemplate::item_functionslist(
+                                                    '<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'
+                                                   .'&amp;state=pick_task&amp;groupname='.$group.'">'
+                                                   .&mt('Edit Group Settings').'</a>'));
+           				}
+      	 	 		}
+			}
+                        $r->print(&Apache::lontemplate::end_functionslist());
+		}
+	  }	
+
 # ---------------------------------------------------------------- Get syllabus
     if ((($syllabus{'uploaded.lastmodified'}) && 
          (($group ne '' && ($group_home_view || $group_edit_perm ||  
@@ -271,30 +302,7 @@ sub handler {
 		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
             }
         }
-	if ($target ne 'tex') {
-		if($allowed || $privileged){
-			&Apache::lontemplate::print_start_page_functions($r);
-			if($allowed){
-				&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Student View').'</a>'.
-          											&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));	      		
-			}elsif($privileged){
-				my $edittext = &mt('Edit');
-       		 		if ($group ne '') {
-            				$edittext = &mt('Edit Group Homepage');
-        			}
-				&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">'.$edittext.'</a>');
-        			if ($group ne '') {
-            				if ($group_edit_perm) {
-               				 	&Apache::lontemplate::print_functions_content($r,'&nbsp;&nbsp;&nbsp;'.
-               					'<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
-               					'&amp;state=pick_task&amp;groupname='.$group.'">'.
-               					&mt('Edit Group Settings').'</a>');
-           				}
-      	 	 		}		    
-			}
-			&Apache::lontemplate::print_end_page_functions($r);
-		}
-	  }	
+	
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
@@ -334,9 +342,7 @@ sub handler {
 			if($allowed){
 				$r->print('<p>');
 			}
-			$r->print('<div class="LC_ContentBoxSpecial">');
-                        $r->print('<h2 class="LC_hcell">'.$message.'</h2>');
-			$r->print('<blockquote>');
+                        $r->print('<h2>'.$message.'</h2>');
                     } else {
                         my $safeinit;
                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<h1>'.$message.'</h1>'));
@@ -387,9 +393,6 @@ sub handler {
 	    $r->print('<p>'.&mt('No page information provided.').'</p>');
         }
     }
-    
-    $r->print('</blockquote>');
-    $r->print('</div>');
     if ($env{'form.grade_target'} ne 'tex') {
 	$r->print(&Apache::loncommon::end_page());
     } else {
@@ -416,7 +419,7 @@ sub display_group_links {
                         href => "javascript:group_chat('$group')",
                       );
     %{$menu{'files'}} = (
-                        text => 'File Repository',
+                        text => 'Group Portfolio',
                         href => '/adm/coursegrp_portfolio?group='.$group.
                                 $refarg,
                       );