--- loncom/interface/lonsimplepage.pm	2008/12/16 19:01:45	1.60
+++ loncom/interface/lonsimplepage.pm	2009/02/20 15:09:28	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.60 2008/12/16 19:01:45 ehlerst Exp $
+# $Id: lonsimplepage.pm,v 1.68 2009/02/20 15:09:28 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,9 +139,9 @@ sub handler {
 # --------------------------------------- There is such a user, get environment
 
     if ($target ne 'tex') {
-        my $title = 'Course Page';
+        my $title = 'Simple Course Page';
         if ($group ne '') {
-            $title = 'Group Page';
+            $title = 'Simple Group Page';
         }
 	my $start_page = 
 	    &Apache::loncommon::start_page($title,undef,
@@ -216,28 +216,7 @@ sub handler {
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
 
     if ($allowed) {
-	$r->print('<p>'.'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
-                 .'<font size="+1">'.&mt('Show Student View').'</font></a>'.
-                  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
-		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
- 		 .'</p>');                
-#		 .'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
- #                .'<font size="+1">'.&mt('Show Student View').'</font></a>'.
-#		  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-    } elsif ($privileged and $target ne 'tex') {
-        my $edittext = &mt('Edit');
-        if ($group ne '') {
-            $edittext = &mt('Edit Group Homepage');
-        }
-	$r->print('<a href="'.$r->uri.'?forceedit=edit'.$refarg.'"><font size="+1">'.$edittext.'</font></a>');
-        if ($group ne '') {
-            if ($group_edit_perm) {
-                $r->print('&nbsp;&nbsp;&nbsp;<font size="+1">'.
-               '<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
-               '&amp;state=pick_task&amp;groupname='.$group.'">'.
-               &mt('Edit Group Settings').'</a></font>');
-            }
-        }    
+	$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)) {
@@ -256,6 +235,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};
@@ -280,11 +266,33 @@ sub handler {
 					   $syllabus{'uploaded.photourl'});
 	    
 	    $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
-                            align="right" />';
+                            />';
 	    if ($target eq 'tex') {
 		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
             }
         }
+	if ($target ne 'tex') {
+		&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.'"><font size="+1">'.$edittext.'</font></a>');
+        		if ($group ne '') {
+            			if ($group_edit_perm) {
+               				 &Apache::lontemplate::print_functions_content($r,'&nbsp;&nbsp;&nbsp;<font size="+1">'.
+               				'<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
+               				'&amp;state=pick_task&amp;groupname='.$group.'">'.
+               				&mt('Edit Group Settings').'</a></font>');
+           			}
+      	 	 	}		    
+		}
+		&Apache::lontemplate::print_end_page_functions($r);
+	  }	
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
@@ -293,14 +301,16 @@ sub handler {
 		      '<input type="file" name="uploaddoc" size="50" />'.
 		      '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
 		      '</form><form method="post">'.
-                      '<input type="hidden" name="forceedit" value="edit" />');
-	}
-	&Apache::lontemplate::start_columnSection($r);
+                      '<input type="hidden" name="forceedit" value="edit" />'.
+		      '<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
+	}	
 	if($allowed){
-                $r->print($image.'<div class="clear">&nbsp;</div>');
-#'<br style="clear: both;" />');
-        }
-	&Apache::lontemplate::start_ContentBox($r,$allowed);
+               $r->print($image.'<div class="clear">&nbsp;</div>');
+       }
+#	if(!$allowed){
+#		$r-print($image);
+#	}
+	
 	foreach my $field (sort(keys(%syllabusfields))) {
 	    if (($syllabus{$field}) || ($allowed) || 
                 ($field eq 'abb_links' && $group ne '')) {
@@ -322,23 +332,33 @@ sub handler {
                     $r->print('<br />');
                 } elsif ($field eq 'aaa_title') {
                     if ($target ne 'tex') {
-                        $r->print('<h1>'.$message.'</h1>');
+			if($allowed){
+				$r->print('<p>');
+			}
+                        $r->print('<h2>'.$message.'</h2>');
                     } else {
                         my $safeinit;
                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<h1>'.$message.'</h1>'));
                     }
                     if ($allowed) {
                         if ($env{'form.grade_target'} ne 'tex') {
-                            $r->print('<br /><h3>'.&mt('Title').'</h3>');
+                            #$r->print('<br /><h3>'.&mt('Title').'</h3>');
+			    &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); 
 			    &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);				
+			    $r->print('</p>');
                         } else {
                             my $safeinit;
                             $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
                         }
-                    }
+                    } 
+#		    if ($allowed) { $r->print($image . '<div class="clear">&nbsp; </div>'); }
+		    if(!$allowed) {$r->print($image); } 
                 } else {
 		    if ($target ne 'tex') {
-			&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed);
+			if($allowed){
+				$r->print('<p>');
+			}	
+			&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
 		    } else {
 			my $safeinit;
 			$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
@@ -347,6 +367,7 @@ sub handler {
 		    if ($allowed) {
 			if ($target ne 'tex') {
 			    &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
+			    $r->print('</p>');
 			} else {
 			    my $safeinit;
 			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
@@ -355,16 +376,10 @@ sub handler {
 		}
 	    }
 	}
-	&Apache::lontemplate::end_ContentBox($r);
-	if(!$allowed){
-		$r->print($image);
-	}
-	&Apache::lontemplate::end_columnSection($r);
-	if ($allowed) {
-                $r->print('<p>'.'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
-                        .'<font size="+1">'.&mt('Show Student View').'</font></a>'.
-                        &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-        }
+	#MUEA: Stand hier if???
+#	if(!$allowed){ 
+#		$r->print($image);
+#	}	
 	if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
 	    $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
 		      ('bbb_content').'</form>');
@@ -374,7 +389,7 @@ sub handler {
         if ($group ne '') {
             &display_group_links($r,$target,$group,'view',$refarg,%groupinfo);
         } else {
-	    $r->print(&mt('<p>No page information provided.</p>'));
+	    $r->print('<p>'.&mt('No page information provided.').'</p>');
         }
     }
     if ($env{'form.grade_target'} ne 'tex') {
@@ -417,16 +432,27 @@ sub display_group_links {
         }
     }
     if (@available > 0) {
-        my $output = '<table cellspacing="4" cellpadding="4"><tr>';
+        my $output = '';
+        if ($target eq 'tex') {
+            $output = '<table cellspacing="4" cellpadding="4">';
+        } else {
+            $output = &Apache::loncommon::start_data_table();
+        }
         foreach my $tool (@available) {
             if ($target eq 'tex') {
-                $output .= '<td>'.&mt($menu{$tool}{text}).'</td>';
+                $output .= '<tr><td>'.&mt($menu{$tool}{text}).'</td></tr>';
             } else {
-                $output .= '<td><a href="'.$menu{$tool}{href}.'">'.
-                           &mt($menu{$tool}{text}).'</a></td>';
+                $output .= &Apache::loncommon::start_data_table_row()
+                          .'<td><a href="'.$menu{$tool}{href}.'">'
+                          .&mt($menu{$tool}{text}).'</a></td>'
+                          .&Apache::loncommon::end_data_table_row();
             }
         }
-        $output .= '</tr></table>';
+        if ($target eq 'tex') {
+            $output .= '</table>';
+        } else {
+            $output .= &Apache::loncommon::end_data_table();
+        }
         if ($target eq 'tex') {
             $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'<br /><br />'.$output));
         } else {
@@ -455,7 +481,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]',