version 1.190, 2010/06/19 23:28:12
|
version 1.193, 2011/06/23 22:47:56
|
Line 591 sub verify_and_change_screenname {
|
Line 591 sub verify_and_change_screenname {
|
} |
} |
|
|
################################################################ |
################################################################ |
|
# Icon Subroutines # |
|
################################################################ |
|
sub iconchanger { |
|
my $r = shift; |
|
&Apache::lonhtmlcommon::add_breadcrumb( |
|
{ href => '/adm/preferences?action=changeicons', |
|
text => 'Change Menu Display'}); |
|
$r->print(Apache::loncommon::start_page('Page Display Settings')); |
|
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display')); |
|
|
|
my $user = $env{'user.name'}; |
|
my $domain = $env{'user.domain'}; |
|
my %userenv = &Apache::lonnet::get('environment',['icons']); |
|
my $iconic='checked="checked"'; |
|
my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview); |
|
if ($userenv{'icons'} eq 'classic') { |
|
$iconic=''; |
|
$classic='<div class="LC_info">'. |
|
&mt('Your current selection: "Use buttons and text" is deprecated - it is recommended that you change this to "Use icons and text".').'</div>'; |
|
} |
|
if ($userenv{'icons'} eq 'iconsonly') { |
|
$onlyicon='checked="checked"'; |
|
$iconic=''; |
|
} |
|
my $change=&mt('Save'); |
|
my %lt = &icon_options(); |
|
my ($inlinetools,$toolsorder) = &icon_previews(); |
|
if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) { |
|
foreach my $tool (@{$toolsorder}) { |
|
my ($command,$row,$col,$img,$top,$bot,$act,$desc) = |
|
split(/\&/,$inlinetools->{$tool}); |
|
$iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'" class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.(' ' x 2).'</span></a></li>'; |
|
$iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'" class="LC_icon" /> </a></li>'; |
|
} |
|
} |
|
$iconsonly_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'. |
|
'<ul>'. |
|
$iconsonly_preview. |
|
'</ul></li></ul>'; |
|
$iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'. |
|
'<ul>'. |
|
$iconic_preview. |
|
'</ul></li></ul>'; |
|
$r->print(<<ENDSCREEN); |
|
$classic |
|
<form name="prefs" action="/adm/preferences" method="post"> |
|
<input type="hidden" name="action" value="verify_and_change_icons" /> |
|
<label><input type="radio" name="menumode" value="iconic" $iconic /> $lt{'iconic'}</label>$iconic_preview<br /> |
|
<label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $lt{'iconsonly'}</label>$iconsonly_preview<br /> |
|
<input type="submit" value="$change" /> |
|
</form> |
|
ENDSCREEN |
|
} |
|
|
|
sub verify_and_change_icons { |
|
my $r = shift; |
|
my $user = $env{'user.name'}; |
|
my $domain = $env{'user.domain'}; |
|
my $newicons = $env{'form.menumode'}; |
|
my %lt = &icon_options(); |
|
my $newchoice = $newicons; |
|
if ($lt{$newicons}) { |
|
$newchoice = $lt{$newicons}; |
|
} |
|
&Apache::lonnet::put('environment',{'icons' => $newicons}); |
|
&Apache::lonnet::appenv({'environment.icons' => $newicons}); |
|
my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newchoice.'</tt>')); |
|
$message=&Apache::loncommon::confirmwrapper($message); |
|
&print_main_menu($r, $message); |
|
} |
|
|
|
sub icon_options { |
|
return &Apache::lonlocal::texthash( |
|
iconic => 'Use icons and text', |
|
iconsonly => 'Use icons only', |
|
); |
|
} |
|
|
|
sub icon_previews { |
|
my %icon_text = ( |
|
annotate => 'Notes', |
|
wishlist => 'Wishlist', |
|
catalog => 'Info', |
|
evaluate => 'Evaluate', |
|
feedback => 'Communicate', |
|
printout => 'Print', |
|
); |
|
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 to wishlist", |
|
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", |
|
catalog => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata", |
|
); |
|
my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog); |
|
return (\%inlinetools,\@toolsorder); |
|
} |
|
|
|
################################################################ |
# Clicker Subroutines # |
# Clicker Subroutines # |
################################################################ |
################################################################ |
|
|
Line 1187 sub passwordchanger {
|
Line 1287 sub passwordchanger {
|
# This function is a bit of a mess.... |
# This function is a bit of a mess.... |
# Passwords are encrypted using londes.js (DES encryption) |
# Passwords are encrypted using londes.js (DES encryption) |
$errormessage = ($errormessage || ''); |
$errormessage = ($errormessage || ''); |
my ($user,$domain,$currentpass,$defdom); |
my ($user,$domain,$currentpass); |
&Apache::lonhtmlcommon::add_breadcrumb( |
&Apache::lonhtmlcommon::add_breadcrumb( |
{ href => '/adm/preferences?action=changepass', |
{ href => '/adm/preferences?action=changepass', |
text => 'Change Password'}); |
text => 'Change Password'}); |
Line 1202 sub passwordchanger {
|
Line 1302 sub passwordchanger {
|
$caller = 'preferences'; |
$caller = 'preferences'; |
} |
} |
} elsif ($caller eq 'reset_by_email') { |
} elsif ($caller eq 'reset_by_email') { |
$defdom = $r->dir_config('lonDefDomain'); |
|
my %data = &Apache::lonnet::tmpget($mailtoken); |
my %data = &Apache::lonnet::tmpget($mailtoken); |
if (keys(%data) == 0) { |
if (keys(%data) == 0) { |
$r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.' |
$r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.' |
Line 1223 sub passwordchanger {
|
Line 1322 sub passwordchanger {
|
$r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />'); |
$r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />'); |
return; |
return; |
} |
} |
} else { |
if (&Apache::lonnet::domain($domain) eq '') { |
|
$domain = $r->dir_config('lonDefDomain'); |
|
} |
|
} else { |
$r->print(&mt('Page requested in unexpected context').'<br />'); |
$r->print(&mt('Page requested in unexpected context').'<br />'); |
return; |
return; |
} |
} |
Line 1267 $errormessage
|
Line 1369 $errormessage
|
crappy browser --> |
crappy browser --> |
ENDFORM |
ENDFORM |
$r->print(&server_form($logtoken,$caller,$mailtoken)); |
$r->print(&server_form($logtoken,$caller,$mailtoken)); |
$r->print(&client_form($caller,\%hexkey,$currentpass,$defdom)); |
$r->print(&client_form($caller,\%hexkey,$currentpass,$domain)); |
|
|
# |
# |
return; |
return; |
Line 1944 my @menu=
|
Line 2046 my @menu=
|
icon => 'preferences-desktop-theme.png', |
icon => 'preferences-desktop-theme.png', |
linktitle => 'Change LON-CAPA default colors.' |
linktitle => 'Change LON-CAPA default colors.' |
}, |
}, |
|
{ linktext => 'Menu Display', |
|
url => '/adm/preferences?action=changeicons', |
|
permission => 'F', |
|
#help => '', |
|
icon => 'preferences-system-windows.png', |
|
linktitle => 'Change whether the menus are displayed with icons or icons and text.' |
|
} |
] |
] |
}, |
}, |
{ categorytitle=>'Messages & Notifications', |
{ categorytitle=>'Messages & Notifications', |
Line 1959 my @menu=
|
Line 2068 my @menu=
|
url => '/adm/preferences?action=changediscussions', |
url => '/adm/preferences?action=changediscussions', |
permission => 'F', |
permission => 'F', |
#help => 'Change_Discussion_Display', |
#help => 'Change_Discussion_Display', |
icon => 'mail-message-new.png', |
icon => 'chat.png', |
linktitle => 'Set display preferences for discussion posts for both discussion 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.' |
}, |
}, |
] |
] |
Line 2104 sub handler {
|
Line 2213 sub handler {
|
&texenginechanger($r); |
&texenginechanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){ |
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){ |
&verify_and_change_texengine($r); |
&verify_and_change_texengine($r); |
|
}elsif($env{'form.action'} eq 'changeicons'){ |
|
&iconchanger($r); |
|
}elsif($env{'form.action'} eq 'verify_and_change_icons'){ |
|
&verify_and_change_icons($r); |
}elsif($env{'form.action'} eq 'changeclicker'){ |
}elsif($env{'form.action'} eq 'changeclicker'){ |
&clickerchanger($r); |
&clickerchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){ |
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){ |