[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonpreferences.pm

[droeschl]

droeschl		Thu Jul  9 19:28:37 2009 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonpreferences.pm 
  Log:
  XHTML validity. 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.272 loncom/interface/lonmenu.pm:1.273
--- loncom/interface/lonmenu.pm:1.272	Thu Jul  9 08:53:39 2009
+++ loncom/interface/lonmenu.pm	Thu Jul  9 19:28:36 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.272 2009/07/09 08:53:39 droeschl Exp $
+# $Id: lonmenu.pm,v 1.273 2009/07/09 19:28:36 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1687,8 +1687,9 @@
                    '    numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n";
         }
     }
-    my $output = <<"END";
+    return <<"END";
 <script type="text/javascript">
+//<![CDATA[
 function adhocRole(roleitem) {
     $js
     var newrole =  document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
@@ -1759,11 +1760,9 @@
     }
     return -1;
 }
-
-
+// ]]>
 </script>
 END
-    return $output;
 }
 
 
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.166 loncom/interface/lonpreferences.pm:1.167
--- loncom/interface/lonpreferences.pm:1.166	Thu Jul  9 12:20:25 2009
+++ loncom/interface/lonpreferences.pm	Thu Jul  9 19:28:36 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.166 2009/07/09 12:20:25 droeschl Exp $
+# $Id: lonpreferences.pm,v 1.167 2009/07/09 19:28:36 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1939,7 +1939,7 @@
     if ($env{'environment.remote'} eq 'off') {
 push(@{ $menu[1]->{items} }, {
 	linktext => 'Launch Remote Control',
-	url => '/adm/remote?url=/adm/preferences&action=launch',
+	url => '/adm/remote?url=/adm/preferences&amp;action=launch',
 	permission => 'F',
 	#help => '',
 	icon => 'network-wireless.png',
@@ -1948,7 +1948,7 @@
     }else{
 push(@{ $menu[1]->{items} }, {
 	linktext => 'Collapse Remote Control',
-	url => '/adm/remote?url=/adm/preferences&action=collapse',
+	url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
 	permission => 'F',
 	#help => '',
 	icon => 'network-wireless.png',