[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm essayresponse.pm inputtags.pm structuretags.pm

[raeburn]

raeburn		Fri Dec 31 02:40:14 2010 EDT

  Modified files:              
    /loncom/homework	structuretags.pm inputtags.pm essayresponse.pm 
                    	bridgetask.pm 
  Log:
  - xhtml.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.482 loncom/homework/structuretags.pm:1.483
--- loncom/homework/structuretags.pm:1.482	Fri Dec 31 00:58:10 2010
+++ loncom/homework/structuretags.pm	Fri Dec 31 02:40:14 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.482 2010/12/31 00:58:10 raeburn Exp $
+# $Id: structuretags.pm,v 1.483 2010/12/31 02:40:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,6 +128,7 @@
            &setmode_javascript().
 	<<'JS';
 <script type="text/javascript">
+// <![CDATA[
 function setSubmittedPart (part) {
    this.document.lonhomework.submitted.value="part_"+part;
 }
@@ -143,9 +144,9 @@
     var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
     var click = x+':'+y;
     input_element.value = click;
-    img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
+    img_element.src = '/adm/randomlabel.png?token='+token+'&amp;clickdata='+click;
 }
-
+// ]]>
 </script>
 JS
 }
@@ -167,6 +168,7 @@
                           &mt('Submit Answer?');
     return <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function file_deletion_check(formname) {
     var elemnum = formname.elements.length;
     if (elemnum == 0) {
@@ -199,6 +201,7 @@
         return true;
     }
 }
+// ]]>
 </script>
 ENDSCRIPT
 }
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.276 loncom/homework/inputtags.pm:1.277
--- loncom/homework/inputtags.pm:1.276	Fri Dec 31 00:58:10 2010
+++ loncom/homework/inputtags.pm	Fri Dec 31 02:40:14 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.276 2010/12/31 00:58:10 raeburn Exp $
+# $Id: inputtags.pm,v 1.277 2010/12/31 02:40:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -623,7 +623,7 @@
                         }
                         $result .= 
                             '<td><a href="'.$link.'"><img src="'.$icon.
-                            '" border="0" />'.$showname.'</a></td>'."\n".
+                            '" border="0" alt="" />'.$showname.'</a></td>'."\n".
                             '<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n".
                             '<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n".
                             &Apache::loncommon::end_data_table_row();
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.112 loncom/homework/essayresponse.pm:1.113
--- loncom/homework/essayresponse.pm:1.112	Sun Aug 29 19:36:37 2010
+++ loncom/homework/essayresponse.pm	Fri Dec 31 02:40:14 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.112 2010/08/29 19:36:37 raeburn Exp $
+# $Id: essayresponse.pm,v 1.113 2010/12/31 02:40:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,7 @@
         if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') {
             $status_text .= '<br />'.&mt('(Currently -- draft)');
         }
-        $result.= '<p>'.&Apache::lonhtmlcommon::start_pick_box().
+        $result.= '<div>'.&Apache::lonhtmlcommon::start_pick_box().
                   &Apache::lonhtmlcommon::row_title($status_text);
 	if (($Apache::lonhomework::type ne 'survey') &&
             ($Apache::lonhomework::type ne 'surveycred') &&
@@ -111,7 +111,7 @@
         }
 	$result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes,
 						   $filesfrom,undef,$maxfilesize);
-        $result.=&Apache::lonhtmlcommon::end_pick_box().'</p>';
+        $result.=&Apache::lonhtmlcommon::end_pick_box().'</div>';
     } elsif ($target eq 'web' &&
 	     $Apache::inputtags::status[-1] ne 'CAN_ANSWER') {
 	my $part= $Apache::inputtags::part;
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.256 loncom/homework/bridgetask.pm:1.257
--- loncom/homework/bridgetask.pm:1.256	Mon Nov  1 16:32:32 2010
+++ loncom/homework/bridgetask.pm	Fri Dec 31 02:40:14 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.256 2010/11/01 16:32:32 raeburn Exp $
+# $Id: bridgetask.pm,v 1.257 2010/12/31 02:40:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1125,13 +1125,13 @@
                         $portheader = &mt('Submit Portfolio Files for Grading');
                         $porttext = &mt('Indicate the files from your portfolio to be evaluated in grading this task.');
                     }
-		    $result.="\n".'<p>'.&Apache::lonhtmlcommon::start_pick_box().
+		    $result.="\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
 							  'portfolioonly',
                                                           '<h3>'.$portheader.'</h3><br />'.
                                                           $porttext.'<br />').
-			&Apache::lonhtmlcommon::end_pick_box().'</p>';
+			&Apache::lonhtmlcommon::end_pick_box().'</div>';
 		}
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {