--- loncom/interface/lonsimplepage.pm	2008/01/18 16:41:27	1.53
+++ loncom/interface/lonsimplepage.pm	2009/03/08 21:49:33	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.53 2008/01/18 16:41:27 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.75 2009/03/08 21:49:33 weissno 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;
@@ -138,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,
@@ -213,26 +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','Help with filling in text boxes').'<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>');
-            }
-        }    
-    } 
+   
     if (($env{'form.uploaddoc.filename'} and $target ne 'tex') &&
 	($env{'form.storeupl'}) && ($allowed)) {
 	if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -250,6 +232,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};
@@ -264,31 +253,68 @@ 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){
+			&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);
+		}
+	  }	
+
 # ---------------------------------------------------------------- Get syllabus
     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='<img src="'.$syllabus{'uploaded.photourl'}.'"
-                            align="right" />';
+	    $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
+                            />';
 	    if ($target eq 'tex') {
 		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
-	    }
-	    $r->print($image);
-	}
+            }
+        }
+	
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
 		      '<input type="hidden" name="forceedit" value="edit" />'.
-		      '<h3>Upload a Photo</h3>'.
+		      '<h3>'.&mt('Upload a Photo').'</h3>'.
 		      '<input type="file" name="uploaddoc" size="50" />'.
-		      '<input type="submit" name="storeupl" value="Upload" />'.
+		      '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
 		      '</form><form method="post">'.
-                      '<input type="hidden" name="forceedit" value="edit" />');
-	}
+                      '<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>');
+       }
+	
 	foreach my $field (sort(keys(%syllabusfields))) {
 	    if (($syllabus{$field}) || ($allowed) || 
                 ($field eq 'abb_links' && $group ne '')) {
@@ -299,7 +325,9 @@ sub handler {
 		if ($allowed) {
 		    $message=&Apache::lonspeller::markeduptext($message);
 		}
-		$message=&Apache::lontexconvert::msgtexconverted($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}.'" />');
@@ -308,43 +336,40 @@ 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 />Title<br /><textarea cols="80" rows="2" name="'.$field.'">'.
-                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
-                                      '</textarea><input type="submit" name="storesyl" value="Save" />');
+                        if ($env{'form.grade_target'} ne 'tex') {                         
+			    &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); } 
                 } else {
-		    if (($field ne 'bbb_content') || ($allowed)) {
-			if ($target ne 'tex') {
-			    $r->print('<h3>'.$syllabusfields{$field}.'</h3>');
-			} else {
-			    my $safeinit;
-			    $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
-			}
-		    }
 		    if ($target ne 'tex') {
-			$r->print('<blockquote>'.
-				  $message.'</blockquote>');
+			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>'));
 			$r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
 		    }
 		    if ($allowed) {
 			if ($target ne 'tex') {
-			    $r->print('<br /><textarea cols="80" rows="24" name="'.$field.'" id="'.$field.'">'.
-                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
-				      '</textarea><input type="submit" name="storesyl" value="Save" />');
+			    &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));
@@ -362,7 +387,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') {
@@ -378,7 +403,7 @@ sub display_group_links {
     my @available = ();
     my %menu = ();
     %{$menu{'email'}} = (
-                        text => 'Group e-mail',
+                        text => 'Group Message',
                         href => '/adm/email?compose=group&amp;group='.$group.
                                 $refarg,
                       );
@@ -387,16 +412,16 @@ sub display_group_links {
                         href => '/adm/groupboards?group='.$group.$refarg,
                       );
     %{$menu{'chat'}} = (
-                        text => 'Group chat',
+                        text => 'Group Chat Room',
                         href => "javascript:group_chat('$group')",
                       );
     %{$menu{'files'}} = (
-                        text => 'File repository',
+                        text => 'Group Portfolio',
                         href => '/adm/coursegrp_portfolio?group='.$group.
                                 $refarg,
                       );
     %{$menu{'roster'}} = (
-                        text => 'Membership roster',
+                        text => 'Membership Roster',
                         href => '/adm/grouproster?group='.$group.$refarg,
                       );
     foreach my $tool (sort(keys(%menu))) {
@@ -405,16 +430,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}.'">'.
-                           $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 {
@@ -425,7 +461,7 @@ sub display_group_links {
         if ($context eq 'edit') {
             $output = &mt('No group functionality.');
         } else {  
-            $output = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: <b>[_1]</b>.',&unescape($groupinfo{'description'}));
+            $output = &mt('No group functionality (e.g., e-mail, discussion, chat room or file upload) is currently available to you in this group: [_1].','<b>'.&unescape($groupinfo{'description'}).'</b>');
         }
         if ($target eq 'tex') {
             $r->print(&Apache::lonxml::xmlparse($r,'tex',$output));
@@ -443,7 +479,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]',