[LON-CAPA-cvs] cvs: loncom /interface lonnavdisplay.pm lonnavmaps.pm

[bisitz]

bisitz		Thu Jun 24 14:21:39 2010 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm lonnavdisplay.pm 
  Log:
  Course Contents: XHTML
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.448 loncom/interface/lonnavmaps.pm:1.449
--- loncom/interface/lonnavmaps.pm:1.448	Wed Jun 16 23:42:55 2010
+++ loncom/interface/lonnavmaps.pm	Thu Jun 24 14:21:39 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.448 2010/06/16 23:42:55 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.449 2010/06/24 14:21:39 bisitz Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1401,11 +1401,11 @@
 	my ($link,$text);
         if ($condition) {
 	    $link='navmaps?condition=0&filter=&'.$queryString.
-		'&here='.&escape($here);
+		'&here='.&escape($here);
 	    $text='Close all folders';
         } else {
 	    $link='navmaps?condition=1&filter=&'.$queryString.
-		'&here='.&escape($here);
+		'&here='.&escape($here);
 	    $text='Open all folders';
         }
         if ($env{'form.register'}) {
@@ -1715,7 +1715,7 @@
 	    if (defined($anchor)) { $anchor='#'.$anchor; }
 	    my $srcHasQuestion = $src =~ /\?/;
 	    $args->{"resourceLink"} = $src.
-		($srcHasQuestion?'&':'?') .
+		($srcHasQuestion?'&':'?') .
 		'symb=' . &escape($symb).$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
@@ -1777,12 +1777,11 @@
     # it's quite likely this might fix other browsers, too, and 
     # certainly won't hurt anything.
     if ($displayedJumpMarker) {
-        $result .= "
-<script>
+        $result .= &Apache::lonhtmlcommon::scripttag("
 if (location.href.indexOf('#curloc')==-1) {
     setTimeout(\"location += '#curloc';\", 0)
 }
-</script>";
+");
     }
 
     $result.=&Apache::loncommon::end_data_table();
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.17 loncom/interface/lonnavdisplay.pm:1.18
--- loncom/interface/lonnavdisplay.pm:1.17	Mon Mar 29 14:50:46 2010
+++ loncom/interface/lonnavdisplay.pm	Thu Jun 24 14:21:39 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.17 2010/03/29 14:50:46 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.18 2010/06/24 14:21:39 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -220,11 +220,11 @@
     }
 
     my %selected=($env{'form.sort'} => ' selected="selected"');
-    my $sort_html=('<form name="sortForm">
+    my $sort_html=('<form name="sortForm" action="">
                  <span class="LC_nobreak">
                     <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
                     '.&mt('Sort by:').'
-                    <select name="sort" onChange="document.sortForm.submit()">
+                    <select name="sort" onchange="document.sortForm.submit()">
                        <option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>
                        <option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>
                        <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</option>