--- loncom/interface/lonpreferences.pm	2012/05/15 01:41:27	1.197
+++ loncom/interface/lonpreferences.pm	2012/08/16 17:02:55	1.198
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.197 2012/05/15 01:41:27 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.198 2012/08/16 17:02:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -354,16 +354,25 @@ sub rolesprefchanger {
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['recentroles','recentrolesn']);
+    my $brtext = 'Change '.$role.' Page Pref';
+    my $brtitle;
+    if ($env{'form.returnurl'} eq '/adm/roles') {
+        $brtext = 'Configure Hotlist';
+    } else {
+        $brtitle = $brtext;
+    }
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changerolespref',
-                text => 'Change '.$role.' Page Pref'});
+                text => $brtext});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle));
     my $hotlist_flag=$userenv{'recentroles'};
     my $hotlist_n=$userenv{'recentrolesn'};
-    my $checked;
+    my ($checkedon,$checkedoff);
     if ($hotlist_flag) {
-	$checked = 'checked="checked"';
+	$checkedon = 'checked="checked"';
+    } else {
+        $checkedoff = 'checked="checked"';
     }
     
     if (!$hotlist_n) { $hotlist_n=3; }
@@ -390,7 +399,7 @@ sub rolesprefchanger {
 	    &Apache::loncommon::start_data_table().
 	    &Apache::loncommon::start_data_table_header_row().
 	    "<th>".&mt('Freeze '.$role)."</th>".
-	    "<th>".&mt($role)."</td>".
+	    "<th>".&mt($role)."</th>".
 	    &Apache::loncommon::end_data_table_header_row().
 	    "\n";
 	my $count;
@@ -413,28 +422,51 @@ sub rolesprefchanger {
         $roles_check_list .= "</table>\n";
     }
 
+    my $actionurl = '/adm/preferences';
+    if ($env{'form.returnurl'} eq '/adm/roles') {
+        $actionurl = '/adm/roles';
+    }
+    $r->print('<h3>'.&mt('Recent Roles Hotlist').'</h3>');
+    unless ($checkedon) {
+        $r->print(&mt('LON-CAPA users with several '.$lc_role.'s may wish to enable the Hotlist.').'<br />');
+    }
     $r->print('
-<p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
-</p>
-<form name="prefs" action="/adm/preferences" method="post">
+<form name="prefs" action="'.$actionurl.'" method="post">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
-<br />'.
-'<h2>'.&mt('Recent '.$role.'s Hotlist').'</h2>'.
+<input type="hidden" name="returnurl" value="'.$env{'form.returnurl'}.'" />
+<div class="LC_left_float"><h4>'.&mt('Hotlist options').'</h4>
+<p>'.
+&mt('When enabled, the Hotlist keeps track of the last N '.$lc_role.'s visited.').'<br />'.
+&mt('Those N '.$lc_role.'s are then shown in a table at the top of the '.$lc_role.'s page.').'</p>'.
 &Apache::lonhtmlcommon::start_pick_box().
-&Apache::lonhtmlcommon::row_title('<label for="Hotlist">'.&mt('Enable Recent '.$role.'s Hotlist').'</label>').
-'<input id="Hotlist" type="checkbox"'.$checked.' name="recentroles" value="true" />'.
+&Apache::lonhtmlcommon::row_title(&mt('Use Recent '.$role.'s Hotlist')).
+'<span class="LC_nobreak">
+<label><input id="Hotliston" type="radio" '.$checkedon.' name="recentroles" value="1" />'.&mt('Yes').'</label>'.
+('&nbsp;'x2).
+'<label><input id="Hotlistoff" type="radio" '.$checkedoff.' name="recentroles" value="0" />'.&mt('No').'</label>
+</span>'.
 &Apache::lonhtmlcommon::row_closure().
 &Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
 '<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
-$options.
-'</select>'.
+$options.'
+</select>'.
 &Apache::lonhtmlcommon::row_closure(1).
-&Apache::lonhtmlcommon::end_pick_box().
-'<br/><h2>'.&mt('Freeze Roles').'</h2>'.
-'<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
+&Apache::lonhtmlcommon::end_pick_box().'
+</div>');
+    if ($roles_check_list) { 
+        $r->print('<div class="LC_left_float">
+<h4>'.&mt('Freeze Roles').'</h4>
+<p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
+&mt('Those marked frozen will not be removed from the list, even if not recently used.').'
 </p>
 '.$roles_check_list.'
-<br />
+</div>');
+     } else {
+         $r->print('<br clear="all" />'.
+                   &mt('Once the Hotlist contains recently visited '.$lc_role.'s, you can return to this page to also set frozen roles.'));
+     }
+     $r->print('
+<br clear="all" />
 <input type="submit" value="'.&mt('Save').'" />
 </form>');
 }
@@ -525,7 +557,11 @@ sub verify_and_change_rolespref {
         }
     }
     $message=&Apache::loncommon::confirmwrapper($message);
-    &print_main_menu($r, $message);
+    if ($env{'form.returnurl'} eq '/adm/roles') {
+        return $message;
+    } else {
+        &print_main_menu($r, $message);
+    }
 }
 
 
@@ -2176,11 +2212,19 @@ sub handler {
                                    ['action','wysiwyg','returnurl','refpage']);
     #
     Apache::lonhtmlcommon::clear_breadcrumbs();
+    my ($brlink,$brtxt,$brhelp);
+    if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
+        $brlink ='/adm/roles';
+        $brtxt = 'User Roles';
+    } else {
+        $brlink ='/adm/preferences';
+        $brtxt = 'Set User Preferences';
+        $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';   
+    }
     Apache::lonhtmlcommon::add_breadcrumb
-        ({href => '/adm/preferences',
-          text => 'Set User Preferences',
-          help =>
-          'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'});
+        ({href => $brlink,
+          text => $brtxt,
+          help => $brhelp,});
     if(!exists $env{'form.action'}) {
 	    &print_main_menu($r);
     }elsif($env{'form.action'} eq 'changepass'){