[LON-CAPA-cvs] cvs: loncom /auth restrictedaccess.pm /homework chemresponse.pm inputtags.pm /interface grouproster.pm loncommon.pm
bisitz
bisitz@source.lon-capa.org
Thu, 11 Dec 2008 14:52:35 -0000
bisitz Thu Dec 11 14:52:35 2008 EDT
Modified files:
/loncom/auth restrictedaccess.pm
/loncom/homework inputtags.pm chemresponse.pm
/loncom/interface grouproster.pm loncommon.pm
Log:
Replaced
<nobr>...</nobr>
by
<span class="LC_nobreak">...</span>
Index: loncom/auth/restrictedaccess.pm
diff -u loncom/auth/restrictedaccess.pm:1.6 loncom/auth/restrictedaccess.pm:1.7
--- loncom/auth/restrictedaccess.pm:1.6 Sat Jul 22 23:10:45 2006
+++ loncom/auth/restrictedaccess.pm Thu Dec 11 14:52:26 2008
@@ -97,7 +97,7 @@
$r->print('<br /><br /><br />');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_row());
- $r->print('<td><nobr>'.&mt('Passphrase: ').'</nobr></td>'.
+ $r->print('<td><span class="LC_nobreak">'.&mt('Passphrase: ').'</span></td>'.
'<td><input type="password" size="20" name="pass1" /></td>');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::start_data_table_row());
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.252 loncom/homework/inputtags.pm:1.253
--- loncom/homework/inputtags.pm:1.252 Tue Dec 9 00:27:20 2008
+++ loncom/homework/inputtags.pm Thu Dec 11 14:52:30 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.252 2008/12/09 00:27:20 raeburn Exp $
+# $Id: inputtags.pm,v 1.253 2008/12/11 14:52:30 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1223,7 +1223,7 @@
$trystr = '\vskip 0 mm ';
}
} else {
- $trystr = "<td><nobr>".$tries_text." $tries";
+ $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
if ($Apache::lonhomework::parsing_a_task) {
} elsif($env{'request.state'} ne 'construct') {
$trystr.="/$maxtries";
@@ -1232,7 +1232,7 @@
$trystr.="/".$Apache::inputtags::params{'maxtries'};
}
}
- $trystr.="</nobr></td>";
+ $trystr.="</span></td>";
}
}
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.82 loncom/homework/chemresponse.pm:1.83
--- loncom/homework/chemresponse.pm:1.82 Sun Sep 21 20:28:27 2008
+++ loncom/homework/chemresponse.pm Thu Dec 11 14:52:30 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.82 2008/09/21 20:28:27 raeburn Exp $
+# $Id: chemresponse.pm,v 1.83 2008/12/11 14:52:30 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -234,7 +234,7 @@
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
if ($options !~ /multipart/) { $options.=',multipart'; }
- $result .='<nobr>'.
+ $result .='<span class="LC_nobreak">'.
&Apache::edit::text_arg('Starting Molecule:','molecule',
$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
@@ -242,10 +242,10 @@
$result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
$molecule,$options);
- $result .='</nobr><br /><nobr>';
+ $result .='</span><br /><span class="LC_nobreak">';
$result .=&Apache::edit::text_arg('Correct Answer:','answer',
$token,40);
- $result .='</nobr><br /><nobr>';
+ $result .='</spann><br /><span class="LC_nobreak">';
$result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
'jmeanswer',$token);
my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
@@ -254,7 +254,7 @@
&Apache::edit::html_element_name('answer'),
&Apache::edit::html_element_name('jmeanswer'),
$jmeanswer,$options);
- $result .='</nobr><br />';
+ $result .='</span><br />';
$result .=&Apache::edit::checked_arg('Options:','options',
[ ['autoez','Auto E,Z stereochemistry'],
['multipart','Multipart Structures'],
@@ -410,7 +410,7 @@
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5);
$result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5);
- $result .='<nobr>';
+ $result .='<span class="LC_nobreak">';
$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
@@ -423,7 +423,7 @@
$result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
$molecule,$options);
- $result.="</nobr><br />";
+ $result.="</span><br />";
$result .=&Apache::edit::checked_arg('Options:','options',
[ ['reaction','Is a reaction'],
['border','Draw a border'] ],
Index: loncom/interface/grouproster.pm
diff -u loncom/interface/grouproster.pm:1.6 loncom/interface/grouproster.pm:1.7
--- loncom/interface/grouproster.pm:1.6 Sat Dec 6 20:31:14 2008
+++ loncom/interface/grouproster.pm Thu Dec 11 14:52:34 2008
@@ -350,8 +350,8 @@
$privlist =~ s/, $//;
$output .= '<td>'.$privlist.'</td>';
} elsif ($view_details) {
- $output .= '<td><nobr>'.join(' ',
- @{$$userinfo{'currtools'}}).'</nobr></td>';
+ $output .= '<td><span class="LC_nobreak">'.join(' ',
+ @{$$userinfo{'currtools'}}).'</span></td>';
}
}
$output .= &Apache::loncommon::end_data_table_row();
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.713 loncom/interface/loncommon.pm:1.714
--- loncom/interface/loncommon.pm:1.713 Wed Dec 10 21:46:58 2008
+++ loncom/interface/loncommon.pm Thu Dec 11 14:52:34 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.713 2008/12/10 21:46:58 kaisler Exp $
+# $Id: loncommon.pm,v 1.714 2008/12/11 14:52:34 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1686,17 +1686,17 @@
sub display_filter {
if (!$env{'form.show'}) { $env{'form.show'}=10; }
if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
- return '<nobr><label>'.&mt('Records [_1]',
+ return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
&Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
(&mt('all'),10,20,50,100,1000,10000))).
- '</label></nobr> <nobr>'.
+ '</label></span> <span class="LC_nobreak">'.
&mt('Filter [_1]',
&select_form($env{'form.displayfilter'},
'displayfilter',
('currentfolder' => 'Current folder/page',
'containing' => 'Containing phrase',
'none' => 'None'))).
- '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+ '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
}
sub gradeleveldescription {