[LON-CAPA-cvs] cvs: loncom /interface loncoursegroups.pm londocs.pm lonhelper.pm lonmsgdisplay.pm lonnavmaps.pm lonpopulate.pm lonquickgrades.pm lonsearchcat.pm lontrackstudent.pm lonuserutils.pm slotrequest.pm /interface/spreadsheet lonspreadsheet.pm /interface/statistics lonproblemanalysis.pm lonstudentsubmissions.pm lonsubmissiontimeanalysis.pm lonsurveyreports.pm
bisitz
bisitz@source.lon-capa.org
Thu, 11 Dec 2008 14:55:27 -0000
This is a MIME encoded message
--bisitz1229007327
Content-Type: text/plain
bisitz Thu Dec 11 14:55:27 2008 EDT
Modified files:
/loncom/interface loncoursegroups.pm londocs.pm lonpopulate.pm
lonhelper.pm lonmsgdisplay.pm lonnavmaps.pm
lonquickgrades.pm lonsearchcat.pm
lontrackstudent.pm lonuserutils.pm slotrequest.pm
/loncom/interface/spreadsheet lonspreadsheet.pm
/loncom/interface/statistics lonproblemanalysis.pm
lonstudentsubmissions.pm
lonsubmissiontimeanalysis.pm
lonsurveyreports.pm
Log:
Replaced
<nobr>...</nobr>
by
<span class="LC_nobreak">...</span>
- lonsearchcat.pm: Added missing start tag for nobreak area
- lonsurveyreports.pm: Added missing end tag for nobreak area
--bisitz1229007327
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20081211145527.txt"
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.82 loncom/interface/loncoursegroups.pm:1.83
--- loncom/interface/loncoursegroups.pm:1.82 Sat Dec 6 12:49:17 2008
+++ loncom/interface/loncoursegroups.pm Thu Dec 11 14:55:15 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.82 2008/12/06 12:49:17 bisitz Exp $
+# $Id: loncoursegroups.pm,v 1.83 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1553,11 +1553,11 @@
my ($group,$status,$count,$text) = @_;
my $entry;
if ($count > 0) {
- $entry = '<nobr><a href="javascript:openGroupRoster('.
+ $entry = '<span class="LC_nobreak"><a href="javascript:openGroupRoster('.
"'$group','$status'".')">'.$text.'</a> - '.$count.
- '</nobr><br />';
+ '</span><br />';
} else {
- $entry = '<nobr>'.$text.' - '.$count.'</nobr><br />';
+ $entry = '<span class="LC_nobreak">'.$text.' - '.$count.'</span><br />';
}
return $entry;
}
@@ -2065,13 +2065,13 @@
if (@{$available} > 0 && $granularity eq 'Yes') {
$r->print('<td>
<fieldset><legend><b>'.$lt{'setf'}.'</b></legend>
- <nobr>
+ <span class="LC_nobreak">
<input type="button" value="'.&mt('check all').'"
onclick="javascript:checkAllTools(document.'.$formname.')" />
<input type="button" value="'.&mt('uncheck all').'"
onclick="javascript:uncheckAllTools(document.'.$formname.')" />
- </nobr>
+ </span>
</fieldset></td>');
}
$r->print('</tr></table>
@@ -2094,13 +2094,13 @@
if ($granularity eq 'Yes') {
$r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
<td colspan="6"> </td>
- <td align="center"><nobr><b>'.&mt('All:').'</b> ');
+ <td align="center"><span class="LC_nobreak"><b>'.&mt('All:').'</b> ');
foreach my $tool (@{$available}) {
$r->print('<label><input type="checkbox" name="togglefunc" '.
'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
' value="'.$tool.'">'.'<b>'.$tool.'</b></label> ');
}
- $r->print('</nobr></td></tr>');
+ $r->print('</span></td></tr>');
}
}
my %Sortby = ();
@@ -2134,7 +2134,7 @@
'<td>'.$id.'</td>'.
'<td>'.$section.'</td>');
if (@{$available} > 0) {
- $r->print('<td align="center"><nobr>'.
+ $r->print('<td align="center"><span class="LC_nobreak">'.
' ');
foreach my $tool (@{$available}) {
if ($granularity eq 'Yes') {
@@ -2145,7 +2145,7 @@
$tool.'" value="'.$user.'" />'.$tool.' ');
}
}
- $r->print('</nobr></td>');
+ $r->print('</span></td>');
}
$r->print(&Apache::loncommon::end_data_table_row()."\n");
}
@@ -2232,8 +2232,8 @@
if ($totaloptionalprivs) {
$r->print('
<br />
-<label><nobr><input type="radio" name="specificity" value="No" '.$specific{'No'}.' /> '.$lt{'algm'}.'</nobr></label><br />
-<label><nobr><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' /> '.$lt{'smgp'}.'</nobr></label><br /><br />');
+<label><span class="LC_nobreak"><input type="radio" name="specificity" value="No" '.$specific{'No'}.' /> '.$lt{'algm'}.'</span></label><br />
+<label><span class="LC_nobreak"><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' /> '.$lt{'smgp'}.'</span></label><br /><br />');
} else {
$r->print('<input type="hidden" name="specificity" value="No" />');
}
@@ -2509,7 +2509,7 @@
$r->print(&check_uncheck_tools($r,$available));
$r->print('
<td>
- <nobr>
+ <span class="LC_nobreak">
<fieldset><legend><b>'.$lt{'curf'}.'</b></legend>
<input type="button" value="'.&mt('check all').'"
onclick="javascript:checkAllTools(document.'.$formname.')" />
@@ -2517,7 +2517,7 @@
<input type="button" value="'.&mt('uncheck all').'"
onclick="javascript:uncheckAllTools(document.'.$formname.')" />
</fieldset>
- </nobr>
+ </span>
</td>
');
}
@@ -2552,14 +2552,14 @@
if ($granularity eq 'Yes') {
$r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
<td colspan="7"> </td>
- <td colspan="'.$colspan.'" align="center"><nobr><b>'.&mt('All:').
+ <td colspan="'.$colspan.'" align="center"><span class="LC_nobreak"><b>'.&mt('All:').
'</b> ');
foreach my $tool (@{$available}) {
$r->print('<label><input type="checkbox" name="togglefunc"'.
' onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
' value="'.$tool.'" />'.'<b>'.$tool.'</b></label> ');
}
- $r->print('</nobr></td></tr>');
+ $r->print('</span></td></tr>');
}
}
my %Sortby = ();
@@ -2587,25 +2587,25 @@
$r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').'
<td>');
if ($$current{$user}{changestate} eq 'reenable') {
- $r->print('<nobr><label>'.
+ $r->print('<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="reenable" value="'.$user.'" />'.
- $lt{'reen'}.'</label></nobr><br />');
+ $lt{'reen'}.'</label></span><br />');
} elsif ($$current{$user}{changestate} eq 'expire') {
- $r->print('<nobr><label>'.
+ $r->print('<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="expire" value="'.$user.'" />'.
- $lt{'expi'}.'</label></nobr><br />');
+ $lt{'expi'}.'</label></span><br />');
} elsif ($$current{$user}{changestate} eq 'activate') {
- $r->print('<nobr><label>'.
+ $r->print('<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="activate" value="'.$user.'" />'.
- $lt{'acti'}.'</label></nobr><br />');
+ $lt{'acti'}.'</label></span><br />');
}
- $r->print('<nobr><label>'.
+ $r->print('<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="deletion" value="'.$user.'" />'.
- $lt{'dele'}.'</label></nobr>');
+ $lt{'dele'}.'</label></span>');
if ($specificity eq 'Yes') {
- $r->print('<br /><nobr><label>'.
+ $r->print('<br /><span class="LC_nobreak"><label>'.
'<input type="checkbox" name="changepriv" value="'.$user.'" />'.$lt{'chpr'}.
- '</label></nobr>');
+ '</label></span>');
}
$r->print('
</td>'.
@@ -2616,7 +2616,7 @@
'<td>'.$start.'</td>'.
'<td>'.$end.'</td>');
if ($hastools) {
- $r->print('<td align="left"><nobr>'.
+ $r->print('<td align="left"><span class="LC_nobreak">'.
' ');
foreach my $tool (@{$$current{$user}{currtools}}) {
if ($granularity eq 'Yes') {
@@ -2632,23 +2632,23 @@
}
$r->print(' ');
}
- $r->print('</nobr></td>');
+ $r->print('</span></td>');
}
if ($addtools) {
$r->print('<td align="left">');
if ($granularity eq 'Yes') {
foreach my $tool (@{$$current{$user}{newtools}}) {
- $r->print('<nobr><label><input type="checkbox"
+ $r->print('<span class="LC_nobreak"><label><input type="checkbox"
name="user_'.$tool.'" value="'.
$user.'" />'.$tool.
- '</label></nobr> ');
+ '</label></span> ');
}
} else {
foreach my $tool (@{$$current{$user}{newtools}}) {
- $r->print('<nobr><input type="hidden"
+ $r->print('<span class="LC_nobreak"><input type="hidden"
name="user_'. $tool.'" value="'.
$user.'" />'.$tool.
- '</nobr> ');
+ '</span> ');
}
}
$r->print('</td>');
@@ -2669,13 +2669,13 @@
<td '.$colspan.'>
<fieldset>
<legend><b>'.$title.'</b></legend>
- <nobr>
+ <span class="LC_nobreak">
<input type="button" value="'.&mt('check all').'"
onclick="javascript:checkAll(document.'.$formname.'.'.$field.')" />
<input type="button" value="'.&mt('uncheck all').'"
onclick="javascript:uncheckAll(document.'.$formname.'.'.$field.')" />
- </nobr>
+ </span>
</fieldset>
</td>
');
@@ -3533,19 +3533,19 @@
}
$r->print(&Apache::lonhtmlcommon::topic_bar($image,$$lt{'endi'}).'
<b>'.$$lt{'gmma'}.':</b><br />'.$$lt{'adds'}.'<br />'.$$lt{'drops'}.'<br /><br />
- <nobr>'.$$lt{'auad'}.':
+ <span class="LC_nobreak">'.$$lt{'auad'}.':
<label><input type="radio" name="autoadd" value="on" />'.&mt('on').' </label><label><input type="radio" name="autoadd" value="off" checked="checked" />'.&mt('off').'</label>');
if ($action eq 'modify') {
$r->print(' ('.&mt('Currently set to [_1].','<b>'.$$lt{$add}.'</b>').')');
}
$r->print('
- </nobr><br />
- <nobr>'.$$lt{'auex'}.':
+ </span><br />
+ <span class="LC_nobreak">'.$$lt{'auex'}.':
<label><input type="radio" name="autodrop" value="on" />'.&mt('on').' </label><label><input type="radio" name="autodrop" value="off" checked="checked" />'.&mt('off').'</label>');
if ($action eq 'modify') {
$r->print(' ('.&mt('Currently set to [_1].','<b>'.$$lt{$drop}.'</b>').')');
}
- $r->print('</nobr><br /><br />'.$$lt{'mapr'});
+ $r->print('</span><br /><br />'.$$lt{'mapr'});
}
sub mapping_settings {
@@ -3705,16 +3705,16 @@
if ($privcount == 3) {
$dynamic .= '</tr><tr>';
}
- $dynamic .='<td><nobr><label><input type="checkbox" '.
+ $dynamic .='<td><span class="LC_nobreak"><label><input type="checkbox" '.
'name="userpriv_'.$priv.'" value="'.$user.'"';
if (grep/^\Q$priv\E$/,@{$defprivs}) {
$dynamic .= ' checked="checked" ';
}
$dynamic .= ' />'.$$toolprivs{$tool}{$priv}.
- '</label></nobr></td>';
+ '</label></span></td>';
}
}
- $r->print('<tr><td colspan="2"><nobr>'.$fixed.'</nobr></td></tr><tr>'.$dynamic.'</tr></table></td>');
+ $r->print('<tr><td colspan="2"><span class="LC_nobreak">'.$fixed.'</span></td></tr><tr>'.$dynamic.'</tr></table></td>');
} else {
$r->print('<td valign="top"><table width="100%"><tr><th colspan="2">'.$tool.'</th></tr><tr><td> </td></tr><tr><td> </td></tr></table></td>');
}
@@ -3741,8 +3741,8 @@
my $endform = &Apache::lonhtmlcommon::date_setter($formname,
'enddate',$endtime);
my $perpetual =
- '<nobr><label><input type="checkbox" name="no_end_date" />'.
- &mt('None').'</label></nobr>';
+ '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date" />'.
+ &mt('None').'</label></span>';
my $table = "<table class=\"LC_descriptive_input\">\n".
'<tr><td class="LC_description">'.&mt('Start:').'</td>'.
'<td>'.$startform.'</td>'.
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.318 loncom/interface/londocs.pm:1.319
--- loncom/interface/londocs.pm:1.318 Wed Dec 10 21:46:58 2008
+++ loncom/interface/londocs.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.318 2008/12/10 21:46:58 kaisler Exp $
+# $Id: londocs.pm,v 1.319 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1903,7 +1903,7 @@
my $ro_set=
((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
$rand_order_text ='
-<nobr><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></nobr>';
+<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
}
if ($ispage) {
my $pagename=&escape($pagetitle);
Index: loncom/interface/lonpopulate.pm
diff -u loncom/interface/lonpopulate.pm:1.56 loncom/interface/lonpopulate.pm:1.57
--- loncom/interface/lonpopulate.pm:1.56 Wed Jun 4 21:33:54 2008
+++ loncom/interface/lonpopulate.pm Thu Dec 11 14:55:15 2008
@@ -1,5 +1,5 @@
# automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.56 2008/06/04 21:33:54 bisitz Exp $
+# $Id: lonpopulate.pm,v 1.57 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -956,7 +956,7 @@
$r->print('
<tr>
<td>'.
-&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'<br />'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'<br /><nobr><label>'.&mt('[_1] owner acceptance of these conditions of use?','<b>Cancel</b>').' <input type="checkbox" name="cancel_agreement" value="1" /></label></nobr>
+&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'<br />'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'<br /><span class="LC_nobreak"><label>'.&mt('[_1] owner acceptance of these conditions of use?','<b>Cancel</b>').' <input type="checkbox" name="cancel_agreement" value="1" /></label></span>
</td>
</tr>
');
@@ -2935,11 +2935,11 @@
sub date_setting_table {
my ($starttime,$endtime,$action) = @_;
my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action);
- my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
+ my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"';
if (($action eq 'setdates' && defined($endtime) && $endtime == 0) || (($action eq 'setaccess' || $action eq 'updatenow') && ($endtime eq '' || $endtime == 0)) ) {
$perpetual .= ' checked';
}
- $perpetual.= ' />'.' no ending date</label></nobr>';
+ $perpetual.= ' />'.' no ending date</label></span>';
my $start_table = '';
$start_table .= "<table>\n";
$start_table .= '<tr><td align="right">Starting Date</td>'.
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.167 loncom/interface/lonhelper.pm:1.168
--- loncom/interface/lonhelper.pm:1.167 Sat Dec 6 12:49:18 2008
+++ loncom/interface/lonhelper.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.167 2008/12/06 12:49:18 bisitz Exp $
+# $Id: lonhelper.pm,v 1.168 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -624,9 +624,9 @@
$result .= "<a href=\"$returnPage\">" . &mt("End Helper") . "</a>";
}
else {
- $result .= '<nobr><input name="back" type="button" ';
+ $result .= '<span class="LC_nobreak"><input name="back" type="button" ';
$result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
- $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
+ $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></span>';
}
}
@@ -643,9 +643,9 @@
$result .= "<a href=\"$returnPage\">" . &mt('End Helper') . "</a>";
}
else {
- $result .= '<nobr><input name="back" type="button" ';
+ $result .= '<span class="LC_nobreak"><input name="back" type="button" ';
$result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
- $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
+ $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></span>';
}
}
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.101 loncom/interface/lonmsgdisplay.pm:1.102
--- loncom/interface/lonmsgdisplay.pm:1.101 Sun Dec 7 19:29:29 2008
+++ loncom/interface/lonmsgdisplay.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.101 2008/12/07 19:29:29 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.102 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1108,10 +1108,10 @@
}
my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
my $count = $n +1;
- $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
+ $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
$count.'.'.(($status eq 'new')?'</b>':'').' '.
'<input type="checkbox" name="delmark"'.
- ' value="'.$origID.'" /></nobr></td>');
+ ' value="'.$origID.'" /></span></td>');
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
$r->print('<td>'.(($status eq 'new')?'<b>':'').
'<a href="/adm/email?display='.$origID.$sqs.'">'.
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.420 loncom/interface/lonnavmaps.pm:1.421
--- loncom/interface/lonnavmaps.pm:1.420 Sat Dec 6 20:36:51 2008
+++ loncom/interface/lonnavmaps.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.420 2008/12/06 20:36:51 schafran Exp $
+# $Id: lonnavmaps.pm,v 1.421 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1828,7 +1828,7 @@
$result.='}
</script>
<form name="linkitems" method="post">
- <nobr><select name="toplink">'."\n";
+ <span class="LC_nobreak"><select name="toplink">'."\n";
foreach my $link (@linkorder) {
if (defined($linkitems->{$link})) {
if ($linkitems->{$link}{'text'} ne '') {
@@ -1839,7 +1839,7 @@
}
$result .= '</select> <input type="button" name="chgnav"
value="Go" onClick="javascript:changeNavDisplay()" />
- </nobr></form></td>'."\n";
+ </span></form></td>'."\n";
return $result;
}
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.44 loncom/interface/lonquickgrades.pm:1.45
--- loncom/interface/lonquickgrades.pm:1.44 Wed Dec 10 21:46:58 2008
+++ loncom/interface/lonquickgrades.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.44 2008/12/10 21:46:58 kaisler Exp $
+# $Id: lonquickgrades.pm,v 1.45 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -257,10 +257,19 @@
$r->print("$thisIndent$title</td>");
if ($totalAttempted) {
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td>"
- .&Apache::loncommon::end_data_table_row());
+ $r->print('<td valign="top">'
+ .$thisIndent
+ .'<span class="LC_nobreak">'
+ .$correct.' / '.$attempted.' / '.$total
+ .'</span></td>'
+ .&Apache::loncommon::end_data_table_row()
+ );
} else {
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td>"
+ $r->print('<td valign="top">'
+ .$thisIndent
+ .'<span class="LC_nobreak">'
+ .$correct.' / '.$total
+ .'</span></td>'
.&Apache::loncommon::end_data_table_row());
}
}
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.300 loncom/interface/lonsearchcat.pm:1.301
--- loncom/interface/lonsearchcat.pm:1.300 Thu Oct 16 22:58:15 2008
+++ loncom/interface/lonsearchcat.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.300 2008/10/16 22:58:15 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.301 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -794,10 +794,10 @@
'<br />'.
'<font size="-1">'.&searchhelp().'</font>'.'</td>'.
'<td><font size="-1">'.
- '<nobr>'.(' 'x3).$adv_search_link.'</nobr>'.'<br />'.
- '<nobr>'.(' 'x1).$userelatedwords.'</nobr>'.'<br />'.
- '<nobr>'.(' 'x1).$onlysearchdomain.'</nobr>'.'<br />'.
- '<nobr>'.(' 'x1).$inclext.'</nobr>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x3).$adv_search_link.'</span>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x1).$userelatedwords.'</span>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x1).$onlysearchdomain.'</span>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x1).$inclext.'</span>'.'<br />'.
'</font></td>'.
'</tr>'.$/;
#
@@ -1167,8 +1167,10 @@
$env{'form.show'},
undef,
(10,20,50,100,1000,10000));
- $scrout .= (' 'x2).&mt('[_1] Records per Page',$countselect).
- '</nobr>'.$/;
+ $scrout .= (' 'x2)
+ .'<span class="LC_nobreak">'
+ .&mt('[_1] Records per Page',$countselect)
+ .'</span>'.$/;
return $scrout;
}
@@ -2894,7 +2896,7 @@
## Output links (if necessary) for 'prev' and 'next' pages.
$r->print
('<table width="100%"><tr><td width="25%" align="right">'.
- '<nobr>'.$sortform.'</nobr>'.
+ '<span class="LC_nobreak">'.$sortform.'</span>'.
'</td><td width="25%" align="right">'.
&prev_next_buttons($min,$env{'form.show'},$total_results).
'</td><td align="right">'.
Index: loncom/interface/lontrackstudent.pm
diff -u loncom/interface/lontrackstudent.pm:1.23 loncom/interface/lontrackstudent.pm:1.24
--- loncom/interface/lontrackstudent.pm:1.23 Tue Feb 13 01:44:02 2007
+++ loncom/interface/lontrackstudent.pm Thu Dec 11 14:55:15 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lontrackstudent.pm,v 1.23 2007/02/13 01:44:02 albertel Exp $
+# $Id: lontrackstudent.pm,v 1.24 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -360,14 +360,14 @@
my $tablerow = qq{<tr class="$class"><td>}.($count+1).qq{</td>};
if ($src =~ m|^/adm/|) {
$tablerow .=
- '<td valign="top"><nobr>'.$title.'</nobr></td>';
+ '<td valign="top"><span class="LC_nobreak">'.$title.'</span></td>';
} else {
$tablerow .=
- '<td valign="top"><nobr>'.
+ '<td valign="top"><span class="LC_nobreak">'.
'<a href="'.$src.'">'.$title.'</a>'.
- '</nobr></td>';
+ '</span></td>';
}
- $tablerow .= '<td valign="top"><nobr>'.$timestamp.'</nobr></td>';
+ $tablerow .= '<td valign="top"><span class="LC_nobreak">'.$timestamp.'</span></td>';
if ($mode eq 'full_class') {
$tablerow.='<td valign="top">'.$student.'</td>';
}
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.75 loncom/interface/lonuserutils.pm:1.76
--- loncom/interface/lonuserutils.pm:1.75 Sat Dec 6 20:32:37 2008
+++ loncom/interface/lonuserutils.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.75 2008/12/06 20:32:37 schafran Exp $
+# $Id: lonuserutils.pm,v 1.76 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2457,7 +2457,7 @@
$cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label>';
$autocount ++;
} else {
- $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label></nobr></td></tr><tr><td><nobr>';
+ $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><span class="LC_nobreak"><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label></span></td></tr><tr><td><span class="LC_nobreak">';
$manualcount ++;
if ($in{'lockedtype'}) {
$cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Unlock').'</label>';
@@ -2466,7 +2466,7 @@
$cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Lock').'</label>';
$lockcount ++;
}
- $cellentry .= '</nobr></td></tr></table>';
+ $cellentry .= '</span></td></tr></table>';
}
$r->print("<td>$cellentry</td>\n");
} else {
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.83 loncom/interface/slotrequest.pm:1.84
--- loncom/interface/slotrequest.pm:1.83 Sat Sep 20 02:53:13 2008
+++ loncom/interface/slotrequest.pm Thu Dec 11 14:55:15 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.83 2008/09/20 02:53:13 raeburn Exp $
+# $Id: slotrequest.pm,v 1.84 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1136,7 +1136,7 @@
(@this_slot)) {
my (undef,$id)=split("\0",$entry);
my ($uname,$udom) = split(':',$consumed{$entry}{'name'});
- $ids.= '<nobr>';
+ $ids.= '<span class="LC_nobreak">';
foreach my $item (@stu_display_order) {
if ($stu_display{$item}) {
if ($item eq 'fullname') {
@@ -1147,7 +1147,7 @@
}
}
$ids.=&remove_link($slot,$entry,$uname,$udom,
- $consumed{$entry}{'symb'}).'</nobr><br />';
+ $consumed{$entry}{'symb'}).'</span><br />';
}
}
}
Index: loncom/interface/spreadsheet/lonspreadsheet.pm
diff -u loncom/interface/spreadsheet/lonspreadsheet.pm:1.51 loncom/interface/spreadsheet/lonspreadsheet.pm:1.52
--- loncom/interface/spreadsheet/lonspreadsheet.pm:1.51 Sat Aug 18 00:04:41 2007
+++ loncom/interface/spreadsheet/lonspreadsheet.pm Thu Dec 11 14:55:20 2008
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.51 2007/08/18 00:04:41 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.52 2008/12/11 14:55:20 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -140,11 +140,11 @@
if ($spreadsheet->is_default()) {
$filename = 'Default';
}
- my $save_dialog = '<nobr>'.
+ my $save_dialog = '<span class="LC_nobreak">'.
'<input type="submit" name="save" value="'.&mt('Save as').'" /> '.
'<input type="text" name="savefilename" size="30" value="'.
$truefilename.'" />'.
- '</nobr>';
+ '</span>';
my $makedefault_dialog = '<input type="submit" name="makedefault" '.
'value="'.&mt('Save as & Make This Sheet the Default').'"/>';
#
@@ -154,9 +154,9 @@
my $load_dialog = <<END;
<table bgcolor="$bgcolor">
<tr><td><input type="submit" name="load" value="$load" /></td>
- <td><nobr>
+ <td><span class="LC_nobreak">
<input type="text" name="loadfilename" size="20" value="$filename" />
- $link</nobr>
+ $link</span>
</td></tr>
<tr><td> </td><td>
<select name="fileselect" onchange="document.sheet.loadfilename.value=document.sheet.fileselect.value" >
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.132 loncom/interface/statistics/lonproblemanalysis.pm:1.133
--- loncom/interface/statistics/lonproblemanalysis.pm:1.132 Thu Oct 30 17:45:25 2008
+++ loncom/interface/statistics/lonproblemanalysis.pm Thu Dec 11 14:55:27 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.132 2008/10/30 17:45:25 bisitz Exp $
+# $Id: lonproblemanalysis.pm,v 1.133 2008/12/11 14:55:27 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1909,9 +1909,9 @@
$showprob_checkbox .= 'checked="checked" ';
}
$showprob_checkbox.= ' />';
- $Str.= '<nobr><label>'.
+ $Str.= '<span class="LC_nobreak"><label>'.
&mt('Show problem [_1]',$showprob_checkbox).
- '</label></nobr><br />';
+ '</label></span><br />';
##
my $analyze_selector = '<select name="AnalyzeOver" >';
$analyze_selector .= '<option value="tries" ';
@@ -1925,11 +1925,11 @@
$analyze_selector .= ' selected ' if ($env{'form.AnalyzeOver'} eq 'time');
$analyze_selector .= '>'.&mt('Time').'</option>';
$analyze_selector .= '</select>';
- $Str .= '<nobr><label>'.
+ $Str .= '<span class="LC_nobreak"><label>'.
&mt('Analyze Over [_1] [_2]',
$analyze_selector,
&Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
- '</label></nobr><br />'.$/;
+ '</label></span><br />'.$/;
##
my $numplots_selector = '<select name="NumPlots">';
if (! exists($env{'form.NumPlots'})
@@ -1942,9 +1942,9 @@
if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected="selected" '; }
$numplots_selector .= '>'.$i.'</option>';
}
- $numplots_selector .= '</select></nobr><br />';
- $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector).
- '</label></nobr>';
+ $numplots_selector .= '</select></span><br />';
+ $Str .= '<span class="LC_nobreak"><label>'.&mt('Number of Plots [_1]',$numplots_selector).
+ '</label></span>';
##
$Str .= '</td>';
##
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.50 loncom/interface/statistics/lonstudentsubmissions.pm:1.51
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.50 Thu Oct 30 17:45:25 2008
+++ loncom/interface/statistics/lonstudentsubmissions.pm Thu Dec 11 14:55:27 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.50 2008/10/30 17:45:25 bisitz Exp $
+# $Id: lonstudentsubmissions.pm,v 1.51 2008/12/11 14:55:27 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -265,9 +265,9 @@
$headers{'response'} .=
'<th colspan="'.scalar(@headers).'">'.
&mt('Response [_1]',$responses->[$i]).'</th>';
- $headers{'student'}.= '<th>'.join('</th><th><nobr>',
+ $headers{'student'}.= '<th>'.join('</th><th><span class="LC_nobreak">',
@headers).
- '</nobr></th>';
+ '</span></th>';
}
}
if ($part_span == 0) {
@@ -501,7 +501,7 @@
if (defined($respid)) {
$id .= ' '.$respid;
}
- $Str .= '<nobr>'.$id.'</nobr>'.(' 'x4);
+ $Str .= '<span class="LC_nobreak">'.$id.'</span>'.(' 'x4);
}
#
shift(@$headers); # Get rid of the Submission header
@@ -510,11 +510,11 @@
$correct = &html_format_essay_sub($response->{'Correct'});
shift(@$headers);
}
- $Str .= '<nobr>'.
+ $Str .= '<span class="LC_nobreak">'.
join('',
map {
(' 'x4).&mt($_.': [_1]',$response->{$_});
- } @$headers).'</nobr>';
+ } @$headers).'</span>';
if (@$headers || ! $single_response) {
$Str .= '<br />';
}
@@ -567,7 +567,7 @@
if ($resptype eq 'radiobutton') {
$submission = &HTML::Entities::encode($submission,'<>&"');
$submission =~ s/=([^=])$//;
- $submission = '<nobr>'.$submission.'</nobr>';
+ $submission = '<span class="LC_nobreak">'.$submission.'</span>';
}
$response->{'Submission'} = $submission;
#
Index: loncom/interface/statistics/lonsubmissiontimeanalysis.pm
diff -u loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.30 loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.31
--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.30 Thu Oct 30 17:45:25 2008
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm Thu Dec 11 14:55:27 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonsubmissiontimeanalysis.pm,v 1.30 2008/10/30 17:45:25 bisitz Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.31 2008/12/11 14:55:27 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -307,13 +307,13 @@
next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0);
$htmltable .=
'<tr>'.
- '<td align="right"><nobr>'.
+ '<td align="right"><span class="LC_nobreak">'.
&Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
- '</nobr></td>'.
+ '</span></td>'.
'<td> </td>'.
- '<td align="right"><nobr>'.
+ '<td align="right"><span class="LC_nobreak">'.
&Apache::lonlocal::locallocaltime($BinEnd[$i]).'</td>'.
- '</nobr></td>'.
+ '</span></td>'.
'<td align="right">'.$Ydata[$i].(' 'x3).'</td>'.
'<td> </td>'.
'<td align="right">'.$AnsData[$i].(' 'x3).'</td>'.
Index: loncom/interface/statistics/lonsurveyreports.pm
diff -u loncom/interface/statistics/lonsurveyreports.pm:1.20 loncom/interface/statistics/lonsurveyreports.pm:1.21
--- loncom/interface/statistics/lonsurveyreports.pm:1.20 Mon Dec 1 17:23:40 2008
+++ loncom/interface/statistics/lonsurveyreports.pm Thu Dec 11 14:55:27 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonsurveyreports.pm,v 1.20 2008/12/01 17:23:40 bisitz Exp $
+# $Id: lonsurveyreports.pm,v 1.21 2008/12/11 14:55:27 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -211,10 +211,10 @@
$Str .= '<tr><td>'.
'<input type="radio" name="problemchoice" id="'.$id.'" '.
'value="'.$value.'" '.$checked.'/>'.'</td>'.
- '<td><nobr>'.
+ '<td><span class="LC_nobreak">'.
'<label for="'.$id.'">'.$problem->{'res'}->compTitle.' ('.$problem->{'seq'}->compTitle.')'.'</label>'.
(' 'x2).
- '<a target="preview" href="'.$link.'">'.&mt('View survey').'</a>'.'</td></tr>'.$/;
+ '<a target="preview" href="'.$link.'">'.&mt('View survey').'</a>'.'</span></td></tr>'.$/;
}
$Str .= '</table>';
return $Str;
--bisitz1229007327--