--- loncom/interface/lonpreferences.pm	2008/12/23 19:22:13	1.132
+++ loncom/interface/lonpreferences.pm	2009/02/10 09:30:16	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.132 2008/12/23 19:22:13 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.135 2009/02/10 09:30:16 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -515,27 +515,30 @@ sub screennamechanger {
         ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
-    my %lt = &Apache::lonlocal::texthash(
-                                          text_screenname  => 'New screenname (shown if you post anonymously):',
-                                          text_nickname  => 'New nickname (shown if you post non-anonymously):',
-                                          text_submit => 'Change',
-                                        );
     Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changescreenname',
                   text => 'Change Screen Name'});
     $r->print(Apache::loncommon::start_page('Change Screen Name'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Screen Name'));
-    $r->print(<<ENDSCREEN);
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_screenname" />
-<br />$lt{'text_screenname'}
-<input type="text" size="20" value="$screenname" name="screenname" />
-<br />$lt{'text_nickname'}
-<input type="text" size="20" value="$nickname" name="nickname" />
-<br />
-<input type="submit" value="$lt{'text_submit'}" />
-</form>
-ENDSCREEN
+    $r->print('<p>'
+             .&mt('Change the name that is displayed in your posts.')
+             .'</p>'
+    );
+    $r->print('<form name="prefs" action="/adm/preferences" method="post">'
+             .'<input type="hidden" name="action" value="verify_and_change_screenname" />'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('New screenname (shown if you post anonymously)'))
+             .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title(&mt('New nickname (shown if you post non-anonymously)'))
+             .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title()
+             .'<input type="submit" value="'.&mt('Save').'" />'
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .'</form>'
+    );
 }
 
 sub verify_and_change_screenname {
@@ -1598,9 +1601,9 @@ sub discussionchanger {
         'pref' => 'Display Preference',
         'curr' => 'Current setting ',
         'actn' => 'Action',
-        'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
+        'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',
-        'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
+        'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
         'unwh' => 'Under what circumstances posts are identfied as "New"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
@@ -1663,7 +1666,7 @@ END
     $r->print(<<"END");
 <br />
 <br />
-<input type="submit" name="sub" value="Save Changes" />
+<input type="submit" name="sub" value="Save" />
 <br />
 <br />
 Note: $lt{'thde'}
@@ -1729,14 +1732,21 @@ sub coursedisplaychanger {
 	    $whatsnewselect = '';
         }
     }
-    my %pagenames = (
+    my %pagenames = &Apache::lonlocal::texthash(
                        firstres => 'First resource',
-                       whatsnew => "What's new page",
+                       whatsnew => "What's New page",
                     );
-    my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
-    my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
+    my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','<b>','</b>');
+    my $whatsnew_on=&mt("Display the [_1]What's New page[_2] - a summary of items in the course which require attention.",'<b>','</b>');
 
-    $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
+    $r->print('<br /><b>'
+             .&mt('Set the default page to be displayed when you select a course role')
+             .'</b>&nbsp;'
+             .&mt('(Currently: [_1])',$pagenames{$currvalue})
+             .'<br />'
+             .&mt("The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the [_1]What's New page[_2] in the course.",'<i>','</i>')
+             .'<br /><br />'
+    );
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
@@ -1888,7 +1898,7 @@ my @menu=
 		permission => 'F',
 		#help => 'Change_Discussion_Display',
 		icon => 'mail-message-new.png',
-		linktitle => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.'
+		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
 	    },
 		]
     },