--- loncom/interface/lonpreferences.pm 2009/10/08 22:37:33 1.174 +++ loncom/interface/lonpreferences.pm 2009/12/07 04:23:32 1.179.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.174 2009/10/08 22:37:33 raeburn Exp $ +# $Id: lonpreferences.pm,v 1.179.2.1 2009/12/07 04:23:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -166,8 +166,11 @@ sub languagechanger { = &Apache::loncommon::plainlanguagedescription($_); } } - my $selectionbox=&Apache::loncommon::select_form($language,'language', - %langchoices); + my $selectionbox= + &Apache::loncommon::select_form( + $language, + 'language', + &Apache::lonlocal::texthash(%langchoices)); $r->print(< @@ -206,9 +209,9 @@ sub texenginechanger { my $r = shift; Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changetexenginepref', - text => 'Change How Math Equations Are Displayed'}); + text => 'Math display settings'}); $r->print(Apache::loncommon::start_page('Content Display Settings')); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed')); + $r->print(Apache::lonhtmlcommon::breadcrumbs('Math display settings')); my $user = $env{'user.name'}; my $domain = $env{'user.domain'}; my %userenv = &Apache::lonnet::get('environment',['texengine']); @@ -221,12 +224,15 @@ sub texenginechanger { 'mimetex' => 'mimetex (Convert to Images)', 'raw' => 'Raw (Screen Reader)' ); - my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine', - %mathchoices); + my $selectionbox= + &Apache::loncommon::select_form( + $texengine, + 'texengine', + &Apache::lonlocal::texthash(%mathchoices)); my $jsMath_start=&Apache::lontexconvert::jsMath_header(); my %lt=&Apache::lonlocal::texthash( - 'headline' => 'Change Math Preferences', - 'preftxt' => 'Preferred method to display Math', + 'headline' => 'Change how math is displayed', + 'preftxt' => 'Preferred method to display math', 'change' => 'Save', 'exmpl' => 'Examples', 'jsmath' => 'jsMath:', @@ -281,7 +287,7 @@ if (jsMath.nofonts == 1) {

$lt{'tth'}

- +

ENDLSCREEN if ($env{'environment.texengine'} ne 'jsMath') { @@ -779,11 +785,11 @@ sub msgforwardchanger { all => 'All', crit => 'Critical only', reg => 'Non-critical only', - foad => 'Forwarding Address(es)', - noti => 'Notification E-mail Address(es)', + foad => 'Forward to account(s)', + fwdm => 'Forward messages to other account(s) in LON-CAPA', + noti => 'E-mail notification of LON-CAPA messages', foad_exmpl => 'e.g. userA:domain1,userB:domain2,...', - mnot => 'E-mail Address(es) which should be notified about new LON-CAPA messages', - # old: 'Message Notification Email Address(es)', + mnot => 'E-mail address(es) which should be notified about new LON-CAPA messages', mnot_exmpl => 'e.g. joe@doe.com', chg => 'Save', email => 'The e-mail address entered in row ', @@ -793,9 +799,9 @@ sub msgforwardchanger { ); Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changemsgforward', - text => 'Change Message Forwarding/Notification'}); - $r->print(Apache::loncommon::start_page('Message Management')); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification')); + text => 'Messages & Notifications'}); + $r->print(Apache::loncommon::start_page('Messages & Notifications')); + $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages & Notifications')); my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding"); my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification"); my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message"); @@ -861,11 +867,12 @@ $validatescript $r->print(<$lt{'foad'} $forwardingHelp +

$lt{'fwdm'} $forwardingHelp

$lt{'foad'} ($lt{'foad_exmpl'}): -
+ +

$lt{'noti'} $notificationHelp

$lt{'mnot'} ($lt{'mnot_exmpl'}):
ENDMSG @@ -910,7 +917,7 @@ ENDMSG ''. - $lt{$type}.' '; + $lt{$type}.''.(' ' x4); } my $htmlon = ''; my $htmloff = ''; @@ -922,7 +929,7 @@ ENDMSG $output .= ' '. + &mt('Yes').''.(' ' x3). ''.(' ' x4); } $output .= ' '. + '" value="1" />'.&mt('Yes').''.(' ' x3). ''. @@ -1602,7 +1609,7 @@ sub discussionchanger { Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changediscussions', text => 'Change Discussion Preferences'}); - $r->print(Apache::loncommon::start_page('Message Management')); + $r->print(Apache::loncommon::start_page('Change Discussion Preferences')); $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences')); my $user = $env{'user.name'}; my $domain = $env{'user.domain'}; @@ -1876,13 +1883,6 @@ my @menu= }, { categorytitle=>'Content Display Settings', items =>[ - { linktext => 'Language', - url => '/adm/preferences?action=changelanguages', - permission => 'F', - #help => 'Prefs_Language', - icon => 'preferences-desktop-locale.png', - linktitle => 'Choose the default language for this user.' - }, { linktext => 'WYSIWYG Editor', url => '/adm/preferences?action=changewysiwyg', permission => 'F', @@ -1890,23 +1890,16 @@ my @menu= icon => 'edit-select-all.png', linktitle => 'Enable or disable the WYSIWYG-Editor.' }, - { linktext => $role.' Page', - url => '/adm/preferences?action=changerolespref', - permission => 'F', - #help => '', - icon => 'sctr.png', - linktitle => 'Configure the roles hotlist.' - }, - { linktext => 'Display of Scientific Equations', + { linktext => 'Math display settings', url => '/adm/preferences?action=changetexenginepref', permission => 'F', #help => '', icon => 'stat.png', - linktitle => 'Change how Scientific Equations are displayed.' + linktitle => 'Change how math is displayed.' }, ] }, - { categorytitle=>'Message Management', + { categorytitle=>'Messages & Notifications', items =>[ { linktext => 'Messages & Notifications', url => '/adm/preferences?action=changemsgforward', @@ -1925,15 +1918,7 @@ my @menu= ] }, { categorytitle=>'Other', - items =>[ - { linktext => 'Register Response Devices ("Clickers")', - url => '/adm/preferences?action=changeclicker', - permission => 'F', - #help => '', - icon => 'network-workgroup.png', - linktitle => 'Register your clicker.' - }, - ] + items =>[] }, ); @@ -1947,25 +1932,6 @@ push(@{ $menu[0]->{items} }, { linktitle => 'Change your password.', }); } - if ($env{'environment.remote'} eq 'off') { -push(@{ $menu[1]->{items} }, { - linktext => 'Launch Remote Control', - url => '/adm/remote?url=/adm/preferences&action=launch', - permission => 'F', - #help => '', - icon => 'remotecontrol.png', - linktitle => 'Launch the remote control for LON-CAPA.', - }); - }else{ -push(@{ $menu[1]->{items} }, { - linktext => 'Collapse Remote Control', - url => '/adm/remote?url=/adm/preferences&action=collapse', - permission => 'F', - #help => '', - icon => 'remotecontrol.png', - linktitle => 'Collapse the remote control for LON-CAPA.', - }); - } my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']); if (keys(%author_roles) > 0) { push(@{ $menu[4]->{items} }, {