--- loncom/interface/lonmenu.pm	2010/03/11 16:35:12	1.317
+++ loncom/interface/lonmenu.pm	2010/03/16 19:55:49	1.318
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.317 2010/03/11 16:35:12 droeschl Exp $
+# $Id: lonmenu.pm,v 1.318 2010/03/16 19:55:49 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,12 +118,6 @@ This gets called in the header section
 This gets called in order to register a URL, both with the Remote
 and in the body of the document
 
-=item loadevents()
-
-=item unloadevents()
-
-=item get_menu_name()
-
 =item clear()
 
 =item switch()
@@ -259,13 +253,9 @@ sub secondary_menu {
                 && $crstype eq 'Community';
         next if    $$menuitem[4]  eq 'mdcCommunity'
                 && $crstype ne 'Community';
-        next if    $$menuitem[4]  =~ /^remotenav/
-                && $env{'environment.remotenavmap'} ne 'on';
-        next if    $$menuitem[4]  =~ /noremotenav/
-                && $env{'environment.remotenavmap'} eq 'on';
-        next if $$menuitem[4] =~ /^(no|)remotenav$/ 
+        next if    $$menuitem[4] =~ /^Course$/
                 && $crstype eq 'Community';
-        next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ 
+        next if    $$menuitem[4] =~ /^Community$/
                 && $crstype ne 'Community';
         next if    $$menuitem[4]   =~ /showgroups$/
                 && !$canviewgrps
@@ -279,15 +269,6 @@ sub secondary_menu {
 
             $menu .= $roles_selector ? "<li>$roles_selector</li>"
                                      : '';
-        } elsif ($env{'environment.remotenavmap'} eq 'on') {
-            # open link using javascript when remote navmap is activated
-            my @items = @{$menuitem}; 
-            if ($menuitem->[4] eq 'remotenav') {
-                $items[0] = "javascript:gonav('$menuitem->[0]');";
-            } else {
-                $items[0] = "javascript:go('$menuitem->[0]');";
-            }
-            $menu .= &prep_menuitem(\@items);
         } else {
             $menu .= &prep_menuitem(\@$menuitem);
         }
@@ -330,21 +311,8 @@ sub show_return_link {
 
 
 sub registerurl {
-    my ($forcereg) = @_;
-    my $result = '';
     if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
-    my $force_title='';
-    if ($env{'request.state'} eq 'construct') {
-	$force_title=&Apache::lonxml::display_title();
-    }
- 	return
-        $result
-       .'<script type="text/javascript">'."\n"
-       .'// <![CDATA['."\n"
-       .'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n"
-       .'// ]]>'."\n"
-       .'</script>'
-       .$force_title;
+    return Apache::lonxml::display_title();
 }
 
 sub innerregister {
@@ -366,13 +334,12 @@ sub innerregister {
 
         my $maptitle = &Apache::lonnet::gettitle($mapurl);
         my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        my $contentstext;
-        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
-            $contentstext = &mt('Community Contents');
-        } else {
-            $contentstext = &mt('Course Contents');
-        }
-        my @crumbs = ({text  => $contentstext, 
+
+#SD
+#course_type only Course and Community?
+#
+        my @crumbs = ({text  => Apache::loncommon::course_type() 
+                                . ' Contents', 
                        href  => "Javascript:gonav('/adm/navmaps')"});
 
         if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
@@ -703,24 +670,6 @@ sub edit_course_upload {
     return $cfile;
 }
 
-sub loadevents() {
-    if ($env{'request.state'} eq 'construct' ||
-	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
-    return 'LONCAPAreg();';
-}
-
-sub unloadevents() {
-    if ($env{'request.state'} eq 'construct' ||
-	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
-    return 'LONCAPAstale();';
-}
-
-sub get_menu_name {
-    my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
-    $hostid =~ s/\W//g;
-    return 'LCmenu'.$hostid;
-}
-
 # ================================================================== Raw Config
 
 #SD
@@ -748,7 +697,6 @@ sub switch {
     $category_members{$cat}.=':'.$idx;
 
 # Inline Remote
-#RC    $img=~s/\.gif$/\.png/;
     if ($nobreak==2) { return ''; }
     my $text=$top.' '.$bot;
     $text=~s/\s*\-\s*//gs;
@@ -778,14 +726,9 @@ sub switch {
 	   }
     } else {
 # Inline Menu
-#SD look here
-       if ($env{'environment.icons'} eq 'iconsonly') {
-          $inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>';
-       } else {
       $inlineremote[$idx]=
        '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
        '<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
-       }
     }
     return '';
 }
@@ -1045,25 +988,6 @@ sub check_for_rcrs {
     return $showreqcrs;
 }
 
-# ====================================================================== Footer
-
-sub nav_control_js {
-    my $nav=($env{'environment.remotenavmap'} eq 'on');
-    return (<<NAVCONTROL);
-    var w_loncapanav_flag="$nav";
-
-
-function gonav(url) {
-   if (w_loncapanav_flag != 1) {
-      gopost(url,'');
-   }  else {
-      navwindow=window.open(url,
-                  "loncapanav","height=600,width=400,scrollbars=1"); 
-   }
-}
-NAVCONTROL
-}
-
 sub dc_popup_js {
     my %lt = &Apache::lonlocal::texthash(
                                           more => '(More ...)',
@@ -1098,7 +1022,6 @@ sub utilityfunctions {
     $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
-    my $nav_control=&nav_control_js();
 
     my $dc_popup_cid;
     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
@@ -1133,7 +1056,6 @@ return (<<ENDUTILITY)
     var reloadURL="$currenturl";
     var currentSymb="$currentsymb";
 
-$nav_control
 $dc_popup_cid
 
 function go(url) {
@@ -1309,19 +1231,7 @@ sub constspaceform {
 ENDCONSTSPACEFORM
 }
 
-
-sub get_nav_status {
-    my $navstatus="swmenu.w_loncapanav_flag=";
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	$navstatus.="1";
-    } else {
-	$navstatus.="-1";
-    }
-    return $navstatus;
-}
-
 sub hidden_button_check {
-    my $hidden;
     if ( $env{'request.course.id'} eq ''
          || $env{'request.role.adv'} ) {