[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonmenu.pm

[raeburn]

raeburn		Thu Aug 13 13:52:02 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - Backport 1.277.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.244.2.2 loncom/interface/lonmenu.pm:1.244.2.3
--- loncom/interface/lonmenu.pm:1.244.2.2	Thu Aug 13 13:28:51 2009
+++ loncom/interface/lonmenu.pm	Thu Aug 13 13:52:01 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.244.2.2 2009/08/13 13:28:51 raeburn Exp $
+# $Id: lonmenu.pm,v 1.244.2.3 2009/08/13 13:52:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -351,8 +351,8 @@
         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>
@@ -409,7 +409,9 @@
 	   &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
-          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
+               '<script type="text/javascript">'."\n".
+               'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n".
+               '</script>'.$force_title;
     }
 # Graphical display after login only
     if ($env{'request.registered'} && !$forcereg) { return ''; }
@@ -750,6 +752,7 @@
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
+// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -785,6 +788,7 @@
       }
 
 // END LON-CAPA Internal 
+// ]]>
 </script>
 ENDREGTHIS
         }
@@ -800,6 +804,7 @@
            $result = (<<ENDDONOTREGTHIS);
 
 <script type="text/javascript">
+// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -824,6 +829,7 @@
     }
 
 // END LON-CAPA Internal
+// ]]>
 </script>
 ENDDONOTREGTHIS
        }
@@ -895,6 +901,7 @@
     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') {
@@ -944,7 +951,7 @@
    timestart=date.getTime();
    wait();
 }
-
+// ]]>
 </script>
 ENDREMOTESTARTUP
 }
@@ -952,8 +959,10 @@
 sub setflags() {
     return(<<ENDSETFLAGS);
 <script type="text/javascript">
+// <![CDATA[
     menuloaded=0;
     tim=0;
+// ]]>
 </script>
 ENDSETFLAGS
 }
@@ -963,7 +972,9 @@
         ($env{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
+// <![CDATA[
     main();
+// ]]>
 </script>
 ENDMAINCALL
 }
@@ -1008,7 +1019,12 @@
     my $returnval='';
     if (($env{'browser.interface'} eq 'textual') ||
         ($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();
     
@@ -1021,11 +1037,13 @@
 #}
 #ENDRESIZE
 #    }
-    $returnval.=(<<ENDOPEN);
+    $returnval=(<<ENDOPEN);
+// <![CDATA[
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$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>';
 }
@@ -1337,6 +1355,7 @@
     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");
@@ -1346,6 +1365,7 @@
 window.status='Closing Remote Control';
 menu.close();
 window.status='Done.';
+// ]]>
 </script>
 ENDCLOSE
 }