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

[raeburn]

raeburn		Fri Jun  8 21:24:17 2012 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm loncommon.pm 
  Log:
  - xhtml. Now passes W3C validation.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.485 loncom/interface/lonnavmaps.pm:1.486
--- loncom/interface/lonnavmaps.pm:1.485	Mon May 28 10:31:17 2012
+++ loncom/interface/lonnavmaps.pm	Fri Jun  8 21:24:16 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.485 2012/05/28 10:31:17 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.486 2012/06/08 21:24:16 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -484,6 +484,7 @@
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
 use DateTime();
+use HTML::Entities;
 
 # For debugging
 
@@ -1481,9 +1482,10 @@
 		      'document.clearbubbles.submit()',
 		      'Mark all posts read');
 	my $time=time;
+        my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
 	$result .= (<<END);
     <form name="clearbubbles" method="post" action="/adm/feedback">
-	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navurl" value="$querystr" />
 	<input type="hidden" name="navtime" value="$time" />
 END
         if ($env{'form.register'}) {
@@ -1825,6 +1827,8 @@
 	    }
 	}
     }
+
+    $result.=&Apache::loncommon::end_data_table();
     
     # Print out the part that jumps to #curloc if it exists
     # delay needed because the browser is processing the jump before
@@ -1841,8 +1845,6 @@
 ");
     }
 
-    $result.=&Apache::loncommon::end_data_table();
-
     if ($r) {
         $r->print($result);
         $result = "";
@@ -1873,7 +1875,6 @@
                           '<td class="LC_middle">'.&mt('Tools:').'</td>';
             }
             $result .= '<td align="left">'."\n".
-                       '<span class="LC_nobreak">'."\n".
                        '<ul id="LC_toolbar">';
             my @linkorder = ('firsthomework','everything','uncompleted',
                              'changefolder','clearbubbles','edittoplevel');
@@ -1901,7 +1902,7 @@
                 }
             }
             $result .= '</ul>'.
-                       '</span></td>';
+                       '</td>';
             if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
                 $result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
                            &mt('Content Editor').'</a></td>';
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1081 loncom/interface/loncommon.pm:1.1082
--- loncom/interface/loncommon.pm:1.1081	Fri Jun  1 11:39:24 2012
+++ loncom/interface/loncommon.pm	Fri Jun  8 21:24:16 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1081 2012/06/01 11:39:24 raeburn Exp $
+# $Id: loncommon.pm,v 1.1082 2012/06/08 21:24:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6900,6 +6900,7 @@
   list-style:none;
   position:relative;
   background-color:white;
+  overflow: auto;
 }
 
 ul#LC_toolbar li {
@@ -6909,6 +6910,7 @@
   float: left;
   display:inline;
   vertical-align:middle;
+  white-space: nowrap;
 }