[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonpreferences.pm
raeburn
raeburn at source.lon-capa.org
Mon Aug 27 12:30:31 EDT 2012
raeburn Mon Aug 27 16:30:31 2012 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonpreferences.pm
Log:
- For 2.11.
- Backport 1.198, and a wording change missed in earlier backport of 1.197.
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.196.4.4 loncom/interface/lonpreferences.pm:1.196.4.5
--- loncom/interface/lonpreferences.pm:1.196.4.4 Fri May 25 23:51:44 2012
+++ loncom/interface/lonpreferences.pm Mon Aug 27 16:30:31 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.196.4.4 2012/05/25 23:51:44 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.196.4.5 2012/08/27 16:30:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -354,16 +354,25 @@
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 @@
&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 @@
$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>'.
+(' '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 @@
}
}
$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);
+ }
}
@@ -692,7 +728,7 @@
);
my %inlinetools = (
printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
- wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource in your personal Stored Links repository",
+ wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository",
evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
@@ -2195,11 +2231,19 @@
['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'){
More information about the LON-CAPA-cvs
mailing list