--- loncom/interface/lonpreferences.pm	2011/10/10 22:38:20	1.186.2.8
+++ loncom/interface/lonpreferences.pm	2010/03/16 19:55:49	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.186.2.8 2011/10/10 22:38:20 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.187 2010/03/16 19:55:49 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,12 +166,11 @@ sub languagechanger {
 	               = &Apache::loncommon::plainlanguagedescription($_);
 	}
     }
-    %langchoices = &Apache::lonlocal::texthash(%langchoices);
     my $selectionbox=
            &Apache::loncommon::select_form(
                $language,
                'language',
-               \%langchoices);
+               &Apache::lonlocal::texthash(%langchoices));
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_languages" />
@@ -230,12 +229,11 @@ sub texenginechanger {
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
-    %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
     my $selectionbox=
            &Apache::loncommon::select_form(
                $texengine,
                'texengine',
-               \%mathchoices);
+               &Apache::lonlocal::texthash(%mathchoices));
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
@@ -591,107 +589,6 @@ 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.('&nbsp;' 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" />&nbsp;</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 {
-    my %lt = &Apache::lonlocal::texthash(
-                 iconic    => 'Use icons and text',
-                 iconsonly => 'Use icons only',
-             );
-    return %lt;
-}
-
-sub icon_previews {
-     my %icon_text = (
-                      annotate => 'Notes',
-                      bookmark => 'Bookmark',
-                      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",
-        bookmark => "s&9&1&sbkm.png&$icon_text{'bookmark'}&bookmark[_2]&set_bookmark()&Set a bookmark for this resource",
-        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 bookmark evaluate feedback printout catalog);
-    return (\%inlinetools,\@toolsorder);
-}
-
-################################################################
 #                     Clicker Subroutines                      #
 ################################################################
 
@@ -1288,7 +1185,7 @@ sub passwordchanger {
     # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
-    my ($user,$domain,$currentpass);
+    my ($user,$domain,$currentpass,$defdom);
     &Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});
@@ -1303,6 +1200,7 @@ sub passwordchanger {
             $caller = 'preferences';
         }
     } elsif ($caller eq 'reset_by_email') {
+            $defdom = $r->dir_config('lonDefDomain');
             my %data = &Apache::lonnet::tmpget($mailtoken);
             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.'
@@ -1323,9 +1221,6 @@ sub passwordchanger {
                 $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
                 return;
             }
-            if (&Apache::lonnet::domain($domain) eq '') {
-                $domain = $r->dir_config('lonDefDomain');
-            }
    } else {
         $r->print(&mt('Page requested in unexpected context').'<br />');
         return;
@@ -1370,7 +1265,7 @@ $errormessage
      crappy browser -->
 ENDFORM
     $r->print(&server_form($logtoken,$caller,$mailtoken));
-    $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
+    $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
 
     #
     return;
@@ -1704,13 +1599,13 @@ sub discussionchanger {
         'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',
         'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
-        'unwh' => 'Under what circumstances posts are identified as "NEW"',
+        'unwh' => 'Under what circumstances posts are identfied as "New"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'ondisp' => 'Once displayed',
-        'onmark' => 'Once marked not NEW',
+        'onmark' => 'Once marked as read',
         'disa' => 'Posts displayed?',
-        'npmr' => 'New posts cease to be identified as "NEW"?',
+        'npmr' => 'New posts cease to be identified as "New"?',
         'thde'  => 'The preferences you set here can be overridden within each individual discussion.',
         'chgt' => 'Change to '
     );
@@ -1795,7 +1690,7 @@ sub verify_and_change_discussion {
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {
-            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as not "NEW".')).'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment.discmarkread');
         }
@@ -2026,14 +1921,14 @@ my @menu=
 		url => '/adm/preferences?action=changerolespref',
 		permission => 'F',
 		#help => '',
-		icon => 'role_hotlist.png',
+		icon => 'sctr.png',
 		linktitle => 'Configure the roles hotlist.'
 	    },
 	    {	linktext => 'Math display settings',
 		url => '/adm/preferences?action=changetexenginepref',
 		permission => 'F',
 		#help => '',
-		icon => 'dismath.png',
+		icon => 'stat.png',
 		linktitle => 'Change how math is displayed.'
 	    },
 		]
@@ -2047,13 +1942,6 @@ my @menu=
 		icon => 'preferences-desktop-theme.png',
 		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 &amp; Notifications',
@@ -2069,7 +1957,7 @@ my @menu=
 		url => '/adm/preferences?action=changediscussions',
 		permission => 'F',
 		#help => 'Change_Discussion_Display',
-		icon => 'chat.png',
+		icon => 'mail-message-new.png',
 		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
 	    },
 		]
@@ -2097,26 +1985,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&amp;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&amp;action=collapse',
-        permission => 'F',
-        #help => '',
-        icon => 'remotecontrol.png',
-        linktitle => 'Collapse the remote control for LON-CAPA.',
-        });
-    }
-
 
     if (&can_toggle_namelocking()) {
         push(@{ $menu[0]->{items} }, {
@@ -2149,7 +2017,7 @@ push(@{ $menu[4]->{items} }, {
 	url => '/adm/preferences?action=changecourseinit',
 	permission => 'F',
 	#help => '',
-	icon => 'course_ini.png',
+	icon => 'edit-copy.png',
 	linktitle => 'Set the default page to be displayed when you select a course role.',
 	});
 
@@ -2234,10 +2102,6 @@ sub handler {
         &texenginechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_texengine'){
         &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'){
         &clickerchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_clicker'){