--- loncom/interface/lonpreferences.pm	2012/02/17 03:32:34	1.186.2.8.2.2
+++ loncom/interface/lonpreferences.pm	2011/06/23 22:47:56	1.193
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.186.2.8.2.2 2012/02/17 03:32:34 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.193 2011/06/23 22:47:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -620,7 +620,7 @@ sub iconchanger {
     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) =
+            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>';
@@ -633,7 +633,7 @@ sub iconchanger {
     $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
                       '<ul>'.
                       $iconic_preview.
-                      '</ul></li></ul>';
+                      '</ul></li></ul>'; 
     $r->print(<<ENDSCREEN);
 $classic
 <form name="prefs" action="/adm/preferences" method="post">
@@ -663,17 +663,16 @@ sub verify_and_change_icons {
 }
 
 sub icon_options {
-    my %lt = &Apache::lonlocal::texthash(
-                 iconic    => 'Use icons and text',
-                 iconsonly => 'Use icons only',
-             );
-    return %lt;
+    return &Apache::lonlocal::texthash(
+                                        iconic    => 'Use icons and text',
+                                        iconsonly => 'Use icons only',
+                                      );
 }
 
 sub icon_previews {
      my %icon_text = (
                       annotate => 'Notes',
-                      bookmark => 'Bookmark',
+                      wishlist => 'Wishlist',
                       catalog  => 'Info',
                       evaluate => 'Evaluate',
                       feedback => 'Communicate',
@@ -681,13 +680,13 @@ sub icon_previews {
                      );
     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",
+        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 bookmark evaluate feedback printout catalog);
+    my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
     return (\%inlinetools,\@toolsorder);
 }
 
@@ -1326,7 +1325,7 @@ sub passwordchanger {
             if (&Apache::lonnet::domain($domain) eq '') {
                 $domain = $r->dir_config('lonDefDomain');
             }
-   } else {
+    } else {
         $r->print(&mt('Page requested in unexpected context').'<br />');
         return;
     }
@@ -1360,7 +1359,7 @@ sub passwordchanger {
 	my $jsh=Apache::File->new($include."/londes.js");
 	$r->print(<$jsh>);
     }
-    $r->print(&jscript_send($caller,$domain));
+    $r->print(&jscript_send($caller));
     $r->print(<<ENDFORM);
 $errormessage
 
@@ -1377,7 +1376,7 @@ ENDFORM
 }
 
 sub jscript_send {
-    my ($caller,$domain) = @_;
+    my ($caller) = @_;
     my $output = qq|
 <script type="text/javascript" language="JavaScript">
 
@@ -1405,19 +1404,8 @@ sub jscript_send {
         $output .= qq|
         this.document.pserver.elements.uname.value =
                    this.document.client.elements.uname.value;
-|;
-        if ($domain eq 'relate') {
-            $output .= qq|
-        this.document.pserver.elements.udom.value =
-                   this.document.client.elements.udom.value;
-|;
-        } else {
-            $output .= qq|
         this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
-|;
-        }
-        $output .= qq| 
         this.document.pserver.elements.email.value =
                    this.document.client.elements.email.value;
 |;
@@ -1450,18 +1438,13 @@ sub client_form {
                   .&Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title(
                        '<label for="uname">'.$lt{'username'}.'</label>')
-                  .'<input type="text" name="uname" size="30" />'
-                  .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />';
-        if ($defdom eq 'relate') {
-            $output .= '<input type="hidden" name="udom" value="'.$defdom.'" />'
-                      .&Apache::lonhtmlcommon::row_closure(); 
-        } else {
-            $output .= &Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(
-                           '<label for="udom">'.$lt{'domain'}.'</label>')
-                      .&Apache::loncommon::select_dom_form($defdom,'udom')
-                      .&Apache::lonhtmlcommon::row_closure();
-        }
+                  .'<input type="text" name="uname" size="15" />'
+                  .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
+                       '<label for="udom">'.$lt{'domain'}.'</label>')
+                  .&Apache::loncommon::select_dom_form($defdom,'udom')
+                  .&Apache::lonhtmlcommon::row_closure();
     } else {
         $output .= &Apache::lonhtmlcommon::row_title(
                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
@@ -1720,13 +1703,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 '
     );
@@ -1811,7 +1794,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');
         }
@@ -2113,26 +2096,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} }, {