[LON-CAPA-cvs] cvs: rat / lonratedt.pm lonratparms.pm lonsequence.pm loncom/imspackages imsimport.pm loncom/publisher loncfile.pm testbankimport.pm
bisitz
bisitz@source.lon-capa.org
Sat, 04 Apr 2009 21:46:02 -0000
This is a MIME encoded message
--bisitz1238881562
Content-Type: text/plain
bisitz Sat Apr 4 21:46:02 2009 EDT
Modified files:
/loncom/imspackages imsimport.pm
/loncom/publisher loncfile.pm testbankimport.pm
/rat lonratedt.pm lonratparms.pm lonsequence.pm
Log:
XHTML conform tags (input, br, hr)
--bisitz1238881562
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090404214602.txt"
Index: loncom/imspackages/imsimport.pm
diff -u loncom/imspackages/imsimport.pm:1.27 loncom/imspackages/imsimport.pm:1.28
--- loncom/imspackages/imsimport.pm:1.27 Sat Apr 4 19:39:29 2009
+++ loncom/imspackages/imsimport.pm Sat Apr 4 21:45:53 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: imsimport.pm,v 1.27 2009/04/04 19:39:29 bisitz Exp $
+# $Id: imsimport.pm,v 1.28 2009/04/04 21:45:53 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -459,8 +459,8 @@
<input type="hidden" name="conditions" value="'.$conditions.'" />
<input type="hidden" name="source" value="'.$cms.'" />
<input type="hidden" name="tempdir" value="'.$tempdir.'" />
- <input type="hidden" name="uploaduname" value="'.$uname.'">
- <input type="hidden" name="filename" value="'.$fname.'">
+ <input type="hidden" name="uploaduname" value="'.$uname.'" />
+ <input type="hidden" name="filename" value="'.$fname.'" />
<input type="hidden" name="phase" value="four" />'."\n");
if ($count{board} == 0) {
$r->print('<input type="hidden" name="board" value="" />'."\n");
Index: loncom/publisher/loncfile.pm
diff -u loncom/publisher/loncfile.pm:1.94 loncom/publisher/loncfile.pm:1.95
--- loncom/publisher/loncfile.pm:1.94 Thu Mar 26 16:50:12 2009
+++ loncom/publisher/loncfile.pm Sat Apr 4 21:45:57 2009
@@ -9,7 +9,7 @@
# and displays a page showing the results of the action.
#
#
-# $Id: loncfile.pm,v 1.94 2009/03/26 16:50:12 bisitz Exp $
+# $Id: loncfile.pm,v 1.95 2009/04/04 21:45:57 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -588,7 +588,7 @@
if( -e $fn) {
$request->print('<input type="hidden" name="newfilename" value="'.
- $fn.'"/>');
+ $fn.'" />');
if (-d $fn) {
unless (&empty_directory($fn,'Delete1')) {
$request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.
@@ -718,9 +718,9 @@
$request->print('</form>');
} else {
if ($mode eq 'testbank') {
- $request->print('<input type="hidden" name="callingmode" value="testbank">');
+ $request->print('<input type="hidden" name="callingmode" value="testbank" />');
} elsif ($mode eq 'imsimport') {
- $request->print('<input type="hidden" name="callingmode" value="imsimport">');
+ $request->print('<input type="hidden" name="callingmode" value="imsimport" />');
}
$request->print('<input type="hidden" name="newfilename" value="'.
$newfilename.'" /><p>'.&mt('Make new directory').' '.
@@ -733,7 +733,7 @@
sub Decompress1 {
my ($request, $user, $domain, $fn) = @_;
if( -e $fn) {
- $request->print('<input type="hidden" name="newfilename" value="'.$fn.'"/>');
+ $request->print('<input type="hidden" name="newfilename" value="'.$fn.'" />');
$request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>');
&CloseForm1($request, $fn);
} else {
Index: loncom/publisher/testbankimport.pm
diff -u loncom/publisher/testbankimport.pm:1.20 loncom/publisher/testbankimport.pm:1.21
--- loncom/publisher/testbankimport.pm:1.20 Thu Mar 26 16:50:12 2009
+++ loncom/publisher/testbankimport.pm Sat Apr 4 21:45:57 2009
@@ -1,5 +1,5 @@
# Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.20 2009/03/26 16:50:12 bisitz Exp $
+# $Id: testbankimport.pm,v 1.21 2009/04/04 21:45:57 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -85,10 +85,10 @@
newWindow.document.write("<h3>$lt{'loca'}: <tt>$webpath</tt></h3><h3>$lt{'newd'}</h3>\\n")
newWindow.document.write("<form name='fileaction' action='/adm/cfile' method='post'>\\n")
newWindow.document.write("$lt{'ente'}.<br /><br />")
- newWindow.document.write("<input type='hidden' name='filename' value='$webpath'>")
+ newWindow.document.write("<input type='hidden' name='filename' value='$webpath' />")
newWindow.document.write("<input type='hidden' name='action' value='newdir'>")
- newWindow.document.write("<input type='hidden' name='callingmode' value='testbank'>")
- newWindow.document.write("$webpath<input type='text' name='newfilename' value=''/>")
+ newWindow.document.write("<input type='hidden' name='callingmode' value='testbank' />")
+ newWindow.document.write("$webpath<input type='text' name='newfilename' value='' />")
newWindow.document.write("<input type='button' value='$lt{'go'}' onClick='document.fileaction.submit();' /></form>")
newWindow.document.write('$end_page')
newWindow.document.close()
@@ -510,7 +510,7 @@
</ol><form name="info" method="post" action="/adm/testbank">'.
&topic_bar(1,&mt('Optional: create a sub-directory in which the testbank questions will be saved')).
&mt('By default, LON-CAPA problems generated from the testbank file will be stored in the current directory.').' '.&mt('To store them in a new sub-directory:').
- ' <input type="button" name="createdir" value="'.&mt('Create sub-directory').'" onClick="javascript:createWin()">'.
+ ' <input type="button" name="createdir" value="'.&mt('Create sub-directory').'" onClick="javascript:createWin()" />'.
&page_footer($env{'form.newdir'},$uname,$fn,$page,$webpath).'
</form>');
}
@@ -625,7 +625,7 @@
$r->print(&Apache::loncommon::start_data_table_row().
'<td valign="top"> '.$iter.' </td>'."\n".
'<td valign="top"> <input type="text" name="start_'.$i.'" value="'.$bl1st.'" size="5" /> </td>'."\n".
- '<td valign="top"> <input type="text" name="end_'.$i.'" value="'.$bl1end.'" size="5"> </td>'."\n".
+ '<td valign="top"> <input type="text" name="end_'.$i.'" value="'.$bl1end.'" size="5" /> </td>'."\n".
'<td valign="top">
<select name="qtype_'.$i.'" onChange="colSet('.$i.')">
<option value= "-1" selected>'.&mt('Select').'</option>'."\n");
@@ -1200,7 +1200,7 @@
$output .= '
<td> </td>
<td>
- <input type="button" name="nextpage" value="'.$nextval.'" onclick="'.$nextclick.'">
+ <input type="button" name="nextpage" value="'.$nextval.'" onclick="'.$nextclick.'" />
</td>';
}
$output .= ' </tr>
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.92 rat/lonratedt.pm:1.93
--- rat/lonratedt.pm:1.92 Tue Jan 20 16:38:49 2009
+++ rat/lonratedt.pm Sat Apr 4 21:46:02 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.92 2009/01/20 16:38:49 bisitz Exp $
+# $Id: lonratedt.pm,v 1.93 2009/04/04 21:46:02 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -77,17 +77,17 @@
my $adv=shift;
my $output='<form method=post>';
if ($adv==1) {
- $output.='<input type=submit name=forceadv value="'.&mt('Edit').'">'.
- &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');;
+ $output.='<input type="submit" name="forceadv" value="'.&mt('Edit').'" />'.
+ &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
} else {
unless ($adv==2) {
- $output.='<input type=submit name=forcesmp value="'.&mt('Simple Edit').'">'.
+ $output.='<input type="submit" name="forcesmp" value="'.&mt('Simple Edit').'" />'.
&Apache::loncommon::help_open_topic('Sequence_Simple_Editor_Creation');
}
- $output.='<input type=submit name=forceadv value="'.&mt('Advanced Edit').'">'.
+ $output.='<input type="submit" name="forceadv" value="'.&mt('Advanced Edit').'" />'.
&Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
}
- return $output.'</form><hr>';
+ return $output.'</form><hr />';
}
# ----------------------------------------------------------------- Edit script
@@ -236,7 +236,7 @@
}
if (-e $tmpfn) {
$targetmsg=
- '<b><font color="red">'.&mt('You are working with an unsaved version of your map.').'</font></b><br>';
+ '<span class="LC_warning">'.&mt('You are working with an unsaved version of your map.').'</span><br />';
my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
}
# ---------------------------------------------------------- Process form input
@@ -549,48 +549,48 @@
$r->print(<<ENDSMPHEAD);
$start_page
$buttons
-<font color=red>$errtext</font>
-<form name=simpleedit method=post>
-<input type=hidden name=forcesmp value=1>
-<input type=hidden name=renameres value=0>
-<input type=hidden name=renametitle value=''>
-<input type=hidden name=renameidx value=0>
+<span class="LC_error">$errtext</span>
+<form name="simpleedit" method="post">
+<input type="hidden" name="forcesmp" value="1" />
+<input type="hidden" name="renameres" value="0" />
+<input type="hidden" name="renametitle" value="" />
+<input type="hidden" name="renameidx" value="0" />
<table>
<tr><th width="40%">$lt{'ta'}</th>
<th> </th>
<th width="40%">File: $url</th></tr>
<tr><td bgcolor="#FFFFCC">
-<input type=button onClick="javascript:groupsearch()" value="$lt{'se'}">
-<input type=button onClick="javascript:groupimport();" value="$lt{'im'}">
+<input type="button" onClick="javascript:groupsearch()" value="$lt{'se'}" />
+<input type="button" onClick="javascript:groupimport();" value="$lt{'im'}" />
$lt{'as'}
-<hr>
-<input type=text size=20 name=importmap>
-<input type=button
+<hr />
+<input type="text" size="20" name="importmap" />
+<input type="button"
onClick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
-value="Select Map"><input type=submit name=loadmap value="$lt{'lm'}"><hr>
-<input type=submit name="discard" value="$lt{'ds'}">
-<input type=submit name="clear" value="$lt{'ca'}">
-<input type=button onClick="javascript:viewimport()" value="$lt{'vi'}">
+value="Select Map" /><input type="submit" name="loadmap" value="$lt{'lm'}" /><hr />
+<input type="submit" name="discard" value="$lt{'ds'}" />
+<input type="submit" name="clear" value="$lt{'ca'}" />
+<input type="button" onClick="javascript:viewimport()" value="$lt{'vi'}" />
</td><td> </td><td bgcolor="#FFFFCC">
-<input type=button onClick=
-"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
-<input type=button onClick=
-"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
-<input type=button onClick=
-"javascript:impfortarget.value=1;groupopen(0,1,1);" value="$lt{'bk'}">
-<input type=button onClick=
-"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}">
+<input type="button" onClick=
+"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}" />
+<input type="button" onClick=
+"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}" />
+<input type="button" onClick=
+"javascript:impfortarget.value=1;groupopen(0,1,1);" value="$lt{'bk'}" />
+<input type="button" onClick=
+"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}" />
$lt{'as'}
-<hr>
-<input type=submit name="moveup" value="$lt{'mu'}">
-<input type=submit name="movedown" value="$lt{'md'}">
-<input type=button onClick="javascript:renametarget()" value="$lt{'re'}">
-<hr>$targetmsg
-<input type=submit name="revert" value="$lt{'rv'}">
-<input type=submit name="save" value="$lt{'sa'}">
-<input type=button onClick="javascript:viewtarget()" value="$lt{'vi'}">
+<hr />
+<input type="submit" name="moveup" value="$lt{'mu'}" />
+<input type="submit" name="movedown" value="$lt{'md'}" />
+<input type="button" onClick="javascript:renametarget()" value="$lt{'re'}" />
+<hr />$targetmsg
+<input type="submit" name="revert" value="$lt{'rv'}" />
+<input type="submit" name="save" value="$lt{'sa'}" />
+<input type="button" onClick="javascript:viewtarget()" value="$lt{'vi'}" />
</td></tr>
<tr><td bgcolor="#FFFFCC"><select name="importsel" size="10" multiple="multiple">
@@ -598,23 +598,23 @@
</select>
</td>
<td bgcolor="#FFFFAA" align="center">
-$lt{'cs'}<br>
-<input type=submit name=cut value='<<<'><p>
-<hr>
-$lt{'ps'}<br>
-<input type=submit name=copy value='<--'><p>
-<hr>
-$lt{'pas'}<br>
-<input type=submit name=paste value='-->'>
+$lt{'cs'}<br />
+<input type="submit" name="cut" value="<<<" /><p>
+<hr />
+$lt{'ps'}<br />
+<input type="submit" name="copy" value="<--" /><p>
+<h /r>
+$lt{'pas'}<br />
+<input type="submit" name="paste" value="-->" />
</td>
<td bgcolor="#FFFFCC"><select name="target" size="10" multiple="multiple">
$targetwindow
</select>
</table>
-<input type=hidden name=importdetail value="">
-<input type=hidden name=curimpdetail value="$importdetail">
-<input type=hidden name=targetdetail value="$targetdetail">
-<input type=hidden name=impfortarget value="0">
+<input type="hidden" name="importdetail" value="" />
+<input type="hidden" name="curimpdetail" value="$importdetail" />
+<input type="hidden" name="targetdetail" value="$targetdetail" />
+<input type="hidden" name="impfortarget" value="0" />
</form>
$end_page
ENDSMPHEAD
Index: rat/lonratparms.pm
diff -u rat/lonratparms.pm:1.26 rat/lonratparms.pm:1.27
--- rat/lonratparms.pm:1.26 Thu Nov 20 15:19:05 2008
+++ rat/lonratparms.pm Sat Apr 4 21:46:02 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Set parameters inside of the RAT
#
-# $Id: lonratparms.pm,v 1.26 2008/11/20 15:19:05 jms Exp $
+# $Id: lonratparms.pm,v 1.27 2009/04/04 21:46:02 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -120,9 +120,9 @@
$r->print(<<ENDDOCUMENT);
$start_page
<form action="javascript:setparms();" method="post" name="parameters">
-<input type="hidden" value='' name="pres_value">
-<input type="hidden" value='' name="pres_type">
-<input type="hidden" value='' name="pres_marker">
+<input type="hidden" value="" name="pres_value" />
+<input type="hidden" value="" name="pres_type" />
+<input type="hidden" value="" name="pres_marker" />
<table border=2>
<tr><th>$lt{'pa'}</th><th>$lt{'de'}</th><th>$lt{'va'}</th><th>$lt{'se'}?</th></tr>
ENDDOCUMENT
@@ -134,17 +134,17 @@
# Should if(defined($value{$key})) be if(exists($value{$key})) ?
if (defined($value{$key})) { $cur=$value{$key}; };
$r->print(<<"END");
-<tr><td><b>$display{$key}</b><br><tt>$key</tt></td>
+<tr><td><b>$display{$key}</b><br /><tt>$key</tt></td>
<td> $content{$key}</td>
-<td><input type="text" size="10" name="$key" value="$cur">
+<td><input type="text" size="10" name="$key" value="$cur" />
<a href='javascript:pjump("$type{$key}","$display{$key}",document.parameters.$key.value,"$key","parameters.pres","stpr");'>$enter</a></td>
<td><input type="checkbox" name="def_$key"
END
- if ($value{$key}) { $r->print(' checked'); }
- $r->print('></td></tr>');
+ if ($value{$key}) { $r->print(' checked="checked"'); }
+ $r->print(' /></td></tr>');
}
$r->print('</table><br />
- <input type="submit" value="'.&mt('Set').'"></form>'.
+ <input type="submit" value="'.&mt('Set').'" /></form>'.
&Apache::loncommon::end_page());
return OK;
}
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.37 rat/lonsequence.pm:1.38
--- rat/lonsequence.pm:1.37 Mon Feb 16 13:52:04 2009
+++ rat/lonsequence.pm Sat Apr 4 21:46:02 2009
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.37 2009/02/16 13:52:04 bisitz Exp $
+# $Id: lonsequence.pm,v 1.38 2009/04/04 21:46:02 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,10 +102,10 @@
'<h1>'.$url.'</h1>');
# ------------------ This is trying to select. Provide buttons and tie %selhash
if ($env{'form.forceselect'}) { $r->print(<<ENDSELECT);
-<form name=fileattr><input type=hidden name=acts value=''>
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
-<input type="button" name="groupimport" value='GROUP IMPORT'
-onClick="javascript:select_group()">
+<form name="fileattr"><input type="hidden" name="acts" value="" />
+<input type="button" name="close" value="CLOSE" onClick="self.close()" />
+<input type="button" name="groupimport" value="GROUP IMPORT"
+onClick="javascript:select_group()" />
</form>
ENDSELECT
my $diropendb =
@@ -151,7 +151,7 @@
if ($successtied) {
my $checked='';
if ($selhash{'store_'.$url}) {
- $checked=" checked";
+ $checked=' checked="checked"';
}
$selhash{"pre_${idx}_link"}=$url;
$selhash{"pre_${idx}_title"}=$title;
--bisitz1238881562--