--- loncom/interface/lonsimplepage.pm	2008/01/28 10:32:47	1.54
+++ loncom/interface/lonsimplepage.pm	2010/02/13 00:51:06	1.59.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.54 2008/01/28 10:32:47 foxr Exp $
+# $Id: lonsimplepage.pm,v 1.59.2.2 2010/02/13 00:51:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,7 @@ 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';
         }
@@ -216,7 +216,9 @@ sub handler {
 
     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_TextBoxes',&mt('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');
@@ -283,9 +285,9 @@ sub handler {
 	    $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" />');
 	}
@@ -293,17 +295,17 @@ sub handler {
 	    if (($syllabus{$field}) || ($allowed) || 
                 ($field eq 'abb_links' && $group ne '')) {
 		my $message=$syllabus{$field};
-		&Apache::lonfeedback::newline_to_br(\$message);
+                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);
 		}
-		&Apache::lonnet::logthis("Prior to texconvert: '$message'");
 		if ($target ne 'tex') {
 		    $message=&Apache::lontexconvert::msgtexconverted($message);
 		}
-		&Apache::lonnet::logthis("After texconvert: '$message'");
                 if ($field eq 'abb_links' && $group ne '') {
                     $r->print('<br /><input type="hidden" name="'.$field.
                                           '" value="'.$syllabus{$field}.'" />');
@@ -320,9 +322,9 @@ sub handler {
                     if ($allowed) {
                         if ($env{'form.grade_target'} ne 'tex') {
                             $r->print(
-                                      '<br />Title<br /><textarea cols="80" rows="2" name="'.$field.'">'.
+                                      '<br /><h3>'.&mt('Title').'</h3><textarea cols="80" rows="2" name="'.$field.'">'.
                                       &HTML::Entities::encode($syllabus{$field},'"&<>').
-                                      '</textarea><input type="submit" name="storesyl" value="Save" />');
+                                      '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
                         } else {
                             my $safeinit;
                             $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
@@ -331,10 +333,8 @@ sub handler {
                 } else {
 		    if (($field ne 'bbb_content') || ($allowed)) {
 			if ($target ne 'tex') {
-			    &Apache::lonnet::logthis("contents in web presentation '$syllabusfields{$field}'");
 			    $r->print('<h3>'.$syllabusfields{$field}.'</h3>');
 			} else {
-			    &Apache::lonnet::logthis("contents in tex presentation '$syllabusfields{$field}'");
 			    my $safeinit;
 			    $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
 			}
@@ -350,7 +350,7 @@ sub handler {
 			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" />');
+				      '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
 			} else {
 			    my $safeinit;
 			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
@@ -384,7 +384,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,
                       );
@@ -393,16 +393,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))) {
@@ -411,16 +411,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 {
@@ -431,7 +442,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));
@@ -449,11 +460,12 @@ sub grouppage_breadcrumbs {
           text=>"Groups",
           title=>"Display Groups"},
         {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist",
-          text=>"Group: $description",
-          title=>"Go to group's home page"},
+          text=>&mt('Group:')." $description",
+          title=>&mt("Go to group's home page"),
+          no_mt=>1,},
         );
     my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]',
-                                                           $description));
+                      $description),undef,undef,undef,undef,1);
     return $output;
 }