--- loncom/interface/lonmenu.pm	2012/08/03 17:35:32	1.369.2.17
+++ loncom/interface/lonmenu.pm	2012/08/07 13:15:29	1.369.2.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.17 2012/08/03 17:35:32 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.21 2012/08/07 13:15:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -569,46 +569,8 @@ sub innerregister {
     my $timesync   = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' );
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
+    if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
                        || ($forcereg)) {
-        unless ($noremote) {
-# Not registered, graphical
-           return (<<ENDDONOTREGTHIS);
-
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-var swmenu=null;
-
-    function LONCAPAreg() {
-          swmenu=$reopen
-          $timesync
-          swmenu.currentStale=1;
-          swmenu.clearbut(2,1);
-          swmenu.clearbut(2,3);
-          swmenu.clearbut(8,1);
-          swmenu.clearbut(8,2);
-          swmenu.clearbut(8,3);
-          if (swmenu.currentURL) {
-             swmenu.switchbutton
-              (3,1,'reload.gif','return','location','go(currentURL)');
-          } else {
-              swmenu.clearbut(3,1);
-          }
-    }
-
-    function LONCAPAstale() {
-    }
-
-// END LON-CAPA Internal
-// ]]>
-</script>
-ENDDONOTREGTHIS
-
-        }
-        return '';
-    }
-
 # -- This applies to homework problems for users with grading privileges
 	my $crs='/'.$env{'request.course.id'};
 	if ($env{'request.course.sec'}) {
@@ -616,30 +578,38 @@ ENDDONOTREGTHIS
 	}
 	$crs=~s/\_/\//g;
 
+        my %swtext;
+        if ($noremote) {
+            %swtext = &get_inline_text();
+        } else {
+            %swtext = &get_rc_text();
+        } 
         my $hwkadd='';
         if ($env{'request.symb'} ne '' &&
 	    $env{'request.filename'}=~/$LONCAPA::assess_re/) {
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
+		$hwkadd.=&switch('','',7,2,'pgrd.png',$swtext{'pgrd'},'grades[_4]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Content Grades');
             } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
+		$hwkadd.=&switch('','',7,2,'subm.png',$swtext{'subm'},'missions[_1]',
                        "gocmd('/adm/grades','submission')",
 		       'Content Submissions');
             }
 	}
 	if ($env{'request.symb'} ne '' &&
 	    &Apache::lonnet::allowed('opa',$crs)) {
-	    $hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
+	    $hwkadd.=&switch('','',7,3,'pparm.png',$swtext{'pparm'},'parms[_2]',
 			     "gocmd('/adm/parmset','set')",
 			     'Content Settings');
 	}
-        if ($env{'request.symb'}=~/^uploaded/ &&
-            &Apache::lonnet::allowed('mdc',$crs)) {
-            $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]',
-                             "gocmd('/adm/coursedocs','direct')",
-                             'Folder/Page Content');
+        if ($noremote) {  
+            if ($env{'request.symb'}=~/^uploaded/ &&
+                &Apache::lonnet::allowed('mdc',$crs)) {
+                $hwkadd.=&switch('','',7,4,'docs.png',$swtext{'docs'},'parms[_2]',
+                                 "gocmd('/adm/coursedocs','direct')",
+                                 'Folder/Page Content');
+            }
         }
 # -- End Homework
         ###
@@ -682,7 +652,7 @@ ENDDONOTREGTHIS
 		my @ids=&Apache::lonnet::current_machine_ids();
 		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
 		if (!$allowed) {
-		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
+		    $editbutton=&switch('','',6,1,,$top,$bottom,$action,$desc);
                     $noeditbutton = 0;
                 }
             }
@@ -749,7 +719,7 @@ ENDDONOTREGTHIS
                         }
                     }
                     $editbutton=&switch
-                       ('','',6,1,'pcstr.png','Edit','resource[_2]',
+                       ('','',6,1,'pcstr.png',$swtext{'pcstr'},'resource[_2]',
                         $bot,"Edit this resource");
                     $noeditbutton = 0;
                 }
@@ -765,7 +735,7 @@ ENDDONOTREGTHIS
                         my $cfile = &edit_course_upload($file,$cnum,$cdom);
                         if ($cfile) {
                             $editbutton=&switch
-                                        ('','',6,1,'pcstr.png','Edit',
+                                        ('','',6,1,'pcstr.png',$swtext{'pcstr'},
                                          'resource[_2]',"go('".$cfile."');",
                                          'Edit this resource');
                         }
@@ -777,7 +747,7 @@ ENDDONOTREGTHIS
             if ($resurl eq "public/$cdom/$cnum/syllabus") {
                 if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {
                     if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                        $editbutton=&switch('','',6,1,'pcstr.png','Edit',
+                        $editbutton=&switch('','',6,1,'pcstr.png',$swtext{'pcstr'},
                                             'resource[_2]',
                                             "go('/adm/courseprefs?phase=display&actions=courseinfo')",
                                             'Edit this resource');
@@ -788,7 +758,7 @@ ENDDONOTREGTHIS
         ###
         ###
 # Prepare the rest of the buttons
-        my ($menuitems,$got_prt,$got_wishlist);
+        my ($menuitems,$got_prt,$got_wishlist,$cstritems);
         if ($const_space) {
 #
 # We are in construction space
@@ -814,6 +784,10 @@ s&6&3&pub.png&Publish&resource[_3]&gocst
 s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
 s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
+                unless ($noremote) {
+                    $cstritems = $menuitems;
+                    undef($menuitems);
+                }
             }
                 if (ref($bread_crumbs) eq 'ARRAY') {
                     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -827,14 +801,15 @@ ENDMENUITEMS
 # We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
+
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
-s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
-s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
+s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
+s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
 c&6&3
 c&8&1
 c&8&2
-s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
             $got_prt = 1;
             if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
@@ -842,7 +817,7 @@ ENDMENUITEMS
                 # wishlist is only available for users with access to resource-pool
                 # and links can only be set for resources within the resource-pool
                 $menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
                 $got_wishlist = 1;
             }
@@ -856,29 +831,29 @@ if(length($annotation) > 0){
 }else{
 	$menuitems.="anot.png";
 }
-$menuitems.="&Notes&&annotate()&";
+$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
 		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
 		    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
+s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
                 }
                 unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
 	            $menuitems.=(<<ENDREALRES);
-s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 ENDREALRES
                 }
                 $menuitems.=(<<ENDREALRES);
-s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+s&8&2&fdbk.png&$swtext{'fdbk'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
 	    }
         }
 	if ($env{'request.uri'} =~ /^\/res/) {
             unless ($got_prt) {
 	        $menuitems .= (<<ENDMENUITEMS);
-s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
                 $got_prt = 1;
             }
@@ -886,12 +861,22 @@ ENDMENUITEMS
                 if (($env{'user.adv'}) && (!$env{'request.enc'})) {
                     # wishlist is only available for users with access to resource-pool
                     $menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
                     $got_wishlist = 1;
                 }
             }
 	}
+        unless ($got_prt) {
+            $menuitems .= (<<ENDMENUITEMS);
+c&8&3
+ENDMENUITEMS
+        }
+        unless ($got_wishlist) {
+            $menuitems .= (<<ENDMENUITEMS);
+c&9&1
+ENDMENUITEMS
+        }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -947,7 +932,25 @@ ENDMENUITEMS
                     }
                 }
             }
+            return   &Apache::lonhtmlcommon::scripttag('', 'start')
+                   . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                   . &Apache::lonhtmlcommon::scripttag('', 'end');
+
         } else {
+            my $cstrcrumbs;
+            if ($const_space) {
+                foreach (split(/\n/,$cstritems)) {
+                    my ($command,@rest)=split(/\&/,$_);
+                    my $idx=10*$rest[0]+$rest[1];
+                    &switch('','',@rest);
+                }
+                &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools',
+                                                            @inlineremote[63,61,71,72]);
+
+                $cstrcrumbs = &Apache::lonhtmlcommon::scripttag('', 'start')
+                             .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                             .&Apache::lonhtmlcommon::scripttag('', 'end');
+            }
             my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
             $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
             my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
@@ -996,12 +999,84 @@ var swmenu=null;
 // END LON-CAPA Internal
 // ]]>
 </script>
+
+$cstrcrumbs
 ENDREGTHIS
         }
+    } else {
+       unless ($noremote) {
+# Not registered, graphical
+           return (<<ENDDONOTREGTHIS);
 
-    return   &Apache::lonhtmlcommon::scripttag('', 'start')
-           . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
-           . &Apache::lonhtmlcommon::scripttag('', 'end');
+<script type="text/javascript">
+// <![CDATA[
+// BEGIN LON-CAPA Internal
+var swmenu=null;
+
+    function LONCAPAreg() {
+          swmenu=$reopen
+          $timesync
+          swmenu.currentStale=1;
+          swmenu.clearbut(2,1);
+          swmenu.clearbut(2,3);
+          swmenu.clearbut(8,1);
+          swmenu.clearbut(8,2);
+          swmenu.clearbut(8,3);
+          swmenu.clearbut(9,1);
+          if (swmenu.currentURL) {
+             swmenu.switchbutton
+              (3,1,'reload.gif','return','location','go(currentURL)');
+          } else {
+              swmenu.clearbut(3,1);
+          }
+    }
+
+    function LONCAPAstale() {
+    }
+
+// END LON-CAPA Internal
+// ]]>
+</script>
+ENDDONOTREGTHIS
+
+        }
+        return '';
+    }
+}
+
+sub get_inline_text {
+    my %text = (
+                 pgrd     => 'Content Grades',
+                 subm     => 'Content Submissions',
+                 pparm    => 'Content Settings',
+                 docs     => 'Folder/Page Content',
+                 pcstr    => 'Edit',
+                 prt      => 'Print',
+                 alnk     => 'Stored Links',
+                 anot     => 'Notes',
+                 catalog  => 'Info',
+                 eval     => 'Evaluate',
+                 fdbk     => 'Feedback',
+    );
+    return %text;
+}
+
+sub get_rc_text {
+    my %text = (
+                   pgrd    => 'problem[_1]',
+                   subm    => 'view sub-[_1]',
+                   pparm   => 'problem[_2]',
+                   pcstr   => 'edit[_1]',
+                   prt     => 'prepare[_1]',
+                   back    => 'backward[_1]',
+                   forw    => 'forward[_1]',
+                   alnk    => 'add to[_1]',
+                   anot    => 'anno-[_1]',
+                   catalog => 'catalog[_2]',
+                   eval    => 'evaluate[_1]',
+                   fdbk    => 'feedback[_1]',
+    );
+    return %text;
 }
 
 sub is_course_upload {
@@ -1239,6 +1314,16 @@ sub switch {
 
     if ($env{'environment.remote'} eq 'on') {
         if (($row<1) || ($row>13)) { return ''; }
+        if ($env{'request.state'} eq 'construct') {
+            my $text = $top.' '.$bot;
+            $text=~s/\s*\-\s*//gs;
+            my $pic = '<img alt="'.$text.'" src="'.
+                      &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
+                      '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
+           $inlineremote[$idx] =
+               '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.
+               $pic.'<span class="LC_menubuttons_inline_text">'.$top.'&nbsp;</span></a>';
+        }
 # Remote
         $img=~s/\.png$/\.gif/;
         return "\n".