--- loncom/interface/lonmenu.pm	2009/07/13 08:24:21	1.275
+++ loncom/interface/lonmenu.pm	2009/08/06 04:09:45	1.278
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.275 2009/07/13 08:24:21 www Exp $
+# $Id: lonmenu.pm,v 1.278 2009/08/06 04:09:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,7 +165,6 @@ sub initlittle {
 
 sub menubuttons {
     my $forcereg=shift;
-    my $registration=shift;
     my $titletable=shift;
 #
 # Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes"
@@ -288,24 +287,20 @@ ENDRELOAD
 <li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
 ENDCRELOAD
         }
-        my $reg='';
-        if ($registration) {
-           $reg=&innerregister($forcereg,$titletable);
-        }
-        my $form=&serverform();
-	my $utility=&utilityfunctions();
+    my $reg     = $forcereg ? &innerregister($forcereg,$titletable) : '';
+    my $form    = &serverform();
+    my $utility = &utilityfunctions();
+
+    #Prepare the message link that indicates the arrival of new mail
+    my $messagelink = Apache::lonmsg::mynewmail() ? "Message (new)" : "Message";
+       $messagelink = '<a href="javascript:go(\'/adm/communicate\');">'
+                      . mt($messagelink) .'</a>';
 
-	my $messagelink = "";
-	if(&Apache::lonmsg::mynewmail()){
-		$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>'
-	}else{
-		$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>'
-	}
-        my $helplink=&Apache::loncommon::top_nav_help('Help');
+    my $helplink = &Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-// BEGIN LON-CAPA Internal
 // <![CDATA[
+// BEGIN LON-CAPA Internal
 $utility
 // ]]>
 </script>
@@ -362,8 +357,14 @@ sub registerurl {
          (!&Apache::lonnet::is_on_map(
 	   &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
- 	return $result.
-          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
+ 	return
+        $result
+       .'<script type="text/javascript">'."\n"
+       .'// <![CDATA['."\n"
+       .'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n"
+       .'// ]]>'."\n"
+       .'</script>'
+       .$force_title;
     }
 # Graphical display after login only
     if ($env{'request.registered'} && !$forcereg) { return ''; }
@@ -389,12 +390,13 @@ sub innerregister {
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
-    my $breadcrumb;
 
     if (&Apache::lonmsg::newmail() && !$noremote) { 
         # We have new mail and remote is up
         $newmail= 'swmenu.setstatus("you have","messages");';
     } 
+
+    my $breadcrumb;
     if ($noremote
 	     && ($env{'request.symb'}) 
 	     && ($env{'request.course.id'})) {
@@ -716,6 +718,7 @@ ENDREGTEXT
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
+// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -751,6 +754,7 @@ var swmenu=null;
       }
 
 // END LON-CAPA Internal 
+// ]]>
 </script>
 ENDREGTHIS
         }
@@ -766,6 +770,7 @@ ENDDONOTREGTEXT
            $result = (<<ENDDONOTREGTHIS);
 
 <script type="text/javascript">
+// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -790,6 +795,7 @@ var swmenu=null;
     }
 
 // END LON-CAPA Internal
+// ]]>
 </script>
 ENDDONOTREGTHIS
        }
@@ -860,6 +866,7 @@ sub startupremote {
     my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
 <script type="text/javascript">
+// <![CDATA[
 var timestart;
 function wheelswitch() {
     if (typeof(document.wheel) != 'undefined') {
@@ -910,6 +917,7 @@ function main() {
    wait();
 }
 
+// ]]>
 </script>
 ENDREMOTESTARTUP
 }
@@ -917,8 +925,10 @@ ENDREMOTESTARTUP
 sub setflags() {
     return(<<ENDSETFLAGS);
 <script type="text/javascript">
+// <![CDATA[
     menuloaded=0;
     tim=0;
+// ]]>
 </script>
 ENDSETFLAGS
 }
@@ -927,7 +937,9 @@ sub maincall() {
     if ($env{'environment.remote'} eq 'off') { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
+// <![CDATA[
     main();
+// ]]>
 </script>
 ENDMAINCALL
 }
@@ -969,7 +981,12 @@ sub reopenmenu {
 sub open {
     my $returnval='';
     if ($env{'environment.remote'} eq 'off') { 
-	return '<script type="text/javascript">self.name="loncapaclient";</script>';
+	return
+        '<script type="text/javascript">'."\n"
+       .'// <![CDATA['."\n"
+       .'self.name="loncapaclient";'."\n"
+       .'// ]]>'."\n"
+       .'</script>';
     }
     my $menuname = &get_menu_name();
     
@@ -982,11 +999,13 @@ sub open {
 #}
 #ENDRESIZE
 #    }
-    $returnval.=(<<ENDOPEN);
+    $returnval=(<<ENDOPEN);
+// <![CDATA[
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname",
 "height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 self.name='loncapaclient';
+// ]]>
 ENDOPEN
     return '<script type="text/javascript">'.$returnval.'</script>';
 }
@@ -1252,9 +1271,16 @@ sub rawconfig {
                     $output.=&clear($row,$col);
                     next;
                 }
-            } elsif ($prt eq 'reqcrs') {
+            } elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) {
+                next if (&Apache::lonnet::allowed('mky',$requested_domain));
+                if (($prt eq 'reqcrsnsc') && ($show_course))   {
+                    next;
+                }
+                if (($prt eq 'reqcrsshc') && (!$show_course)) {
+                    next;
+                }
                 my $showreqcrs = 0;
-                foreach my $type ('official','unofficial') {
+                foreach my $type ('official','unofficial','community') {
                     if (&Apache::lonnet::usertools_access($env{'user.name'},
                                                     $env{'user.domain'},
                                                     $type,undef,'requestcourses')) {
@@ -1289,6 +1315,7 @@ sub close {
     my $menuname = &get_menu_name();
     return(<<ENDCLOSE);
 <script type="text/javascript">
+// <![CDATA[
 window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
@@ -1298,6 +1325,7 @@ menu.autologout=0;
 window.status='Closing Remote Control';
 menu.close();
 window.status='Done.';
+// ]]>
 </script>
 ENDCLOSE
 }