--- loncom/interface/lonpreferences.pm	2005/12/09 23:48:06	1.69
+++ loncom/interface/lonpreferences.pm	2005/12/20 15:52:27	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.69 2005/12/09 23:48:06 albertel Exp $
+# $Id: lonpreferences.pm,v 1.71 2005/12/20 15:52:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -982,24 +982,31 @@ sub coursedisplaychanger {
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
-
+    my $currvalue = 'whatsnew';
     my $firstselect='checked="checked"';
     my $whatsnewselect='';
-    if ($userenv{'course_init_display'} ne 'firstres') {
-        $firstselect='';
-        $whatsnewselect='checked="checked"';
+    if (exists($userenv{'course_init_display'})) {
+        if ($userenv{'course_init_display'} eq 'firstres') {
+            $currvalue = 'firstres';
+            $firstselect='';
+            $whatsnewselect='checked="checked"';
+        }
     }
-    my $whatsnew_off=&mt('Display the first resource in the course.');
-    my $whatsnew_on=&mt('Display a summary of items in the course which require action from the course coordinator.');
+    my %pagenames = (
+                       firstres => 'First resource',
+                       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>");
 
-    $r->print('<br /><b>'.&mt('Set the page to be displayed when you select the role of Course Coordinator').':</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(<<ENDLSCREEN);
 <form name="server" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
 <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
-<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label>
+<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
 ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />
+    $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
 </form>');
 }
 
@@ -1007,22 +1014,25 @@ sub verify_and_change_coursepage {
     my $r = shift;
     my $message='';
     my %lt = &Apache::lonlocal::texthash(
-        'when' => 'Whenever you select the Course Coordinator role from the roles screen',
+        'defs' => 'Default now set',
+        'when' => 'when you select a course role from the roles screen',
         'ywbt' => 'you will be taken to the start of the course.',
         'apwb' => 'a page will be displayed that lists items in the course that may require action from you.',
         'gtts' => 'Go to the start of the course',
-        'dasp' => 'Display a summary page listing course action items', 
+        'dasp' => "Display the What's New page listing course action items", 
     );
     my $newdisp  = $env{'form.newdisp'};
+    $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
     if ($newdisp eq 'firstres') {
-        $message .= $lt{'when'}.', '.$lt{'ywbt'}.'<br/>';
+        $message .= $lt{'ywbt'}.'<br/>';
         &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
         &Apache::lonnet::appenv('environment.course_init_display' => $newdisp);
     } else {
-        $message .= $lt{'when'}.', '.$lt{'apwb'}.'<br/>';
+        $message .= $lt{'apwb'}.'<br/>';
         &Apache::lonnet::del('environment',['course_init_display']);
         &Apache::lonnet::delenv('environment\.course_init_display');
     }
+    my $refpage = $env{'form.refpage'};
     if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
         if ($newdisp eq 'firstres') {
             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -1031,7 +1041,8 @@ sub verify_and_change_coursepage {
                 &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
             $message .= '<br /><font size="+1"><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a></font>';
         } else {
-            $message .= '<br /><font size="+1"><a href="/adm/whatsnew">'.$lt{'dasp'}.'</a></font>';
+            $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
+                        $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
     $r->print(<<ENDVCSCREEN);
@@ -1059,7 +1070,7 @@ sub handler {
     return OK if $r->header_only;
     #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['action','wysiwyg','returnurl']);
+                                   ['action','wysiwyg','returnurl','refpage']);
     #
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -1221,7 +1232,7 @@ sub handler {
                             text => 'Change Math Preferences'},
                       printmenu => 'yes',
                       }));
-    if($env{'request.role'} =~ /^cc\.\//) {
+    if ($env{'user.adv'}) {
         push (@Options,({ action => 'changecourseinit',
                           linktext => 'Change Course Initialization Preference',
                           href => '/adm/preferences',