[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm grades.pm /interface lonhtmlcommon.pm lonindexer.pm portfolio.pm
bisitz
bisitz@source.lon-capa.org
Fri, 05 Dec 2008 10:23:56 -0000
This is a MIME encoded message
--bisitz1228472636
Content-Type: text/plain
bisitz Fri Dec 5 10:23:56 2008 EDT
Modified files:
/loncom/homework bridgetask.pm grades.pm
/loncom/interface lonhtmlcommon.pm lonindexer.pm portfolio.pm
Log:
Replaced all hardcoded nowrap styles with LC_nobreak classes
--bisitz1228472636
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20081205102356.txt"
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.242 loncom/homework/bridgetask.pm:1.243
--- loncom/homework/bridgetask.pm:1.242 Thu Oct 23 08:05:28 2008
+++ loncom/homework/bridgetask.pm Fri Dec 5 10:23:50 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.242 2008/10/23 08:05:28 bisitz Exp $
+# $Id: bridgetask.pm,v 1.243 2008/12/05 10:23:50 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -473,7 +473,7 @@
my $file=$file_url.$partial_file;
$file=~s|/+|/|g;
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
- $file_list.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+ $file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
&Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
'</a></span></li>'."\n";
}
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.531 loncom/homework/grades.pm:1.532
--- loncom/homework/grades.pm:1.531 Thu Nov 20 15:19:15 2008
+++ loncom/homework/grades.pm Fri Dec 5 10:23:50 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.531 2008/11/20 15:19:15 jms Exp $
+# $Id: grades.pm,v 1.532 2008/12/05 10:23:50 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1643,7 +1643,7 @@
my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($thisweight<=$wgt) {
- $radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ $radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$thisweight.')" value="'.$thisweight.'" '.
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
@@ -4947,11 +4947,11 @@
=cut
sub scantron_CODEunique {
- my $result='<span style="white-space: nowrap;">
+ my $result='<span class="LC_nobreak">
<label><input type="radio" name="scantron_CODEunique"
value="yes" checked="checked" />'.&mt('Yes').' </label>
</span>
- <span style="white-space: nowrap;">
+ <span class="LC_nobreak">
<label><input type="radio" name="scantron_CODEunique"
value="no" />'.&mt('No').' </label>
</span>';
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.191 loncom/interface/lonhtmlcommon.pm:1.192
--- loncom/interface/lonhtmlcommon.pm:1.191 Wed Dec 3 19:34:01 2008
+++ loncom/interface/lonhtmlcommon.pm Fri Dec 5 10:23:56 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.191 2008/12/03 19:34:01 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.192 2008/12/05 10:23:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -467,7 +467,7 @@
}
</script>
ENDJS
- $result .= ' <span style="white-space: nowrap;">';
+ $result .= ' <span class="LC_nobreak">';
my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
# Month
my @Months = qw/January February March April May June
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.183 loncom/interface/lonindexer.pm:1.184
--- loncom/interface/lonindexer.pm:1.183 Fri Sep 19 09:08:53 2008
+++ loncom/interface/lonindexer.pm Fri Dec 5 10:23:56 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.183 2008/09/19 09:08:53 bisitz Exp $
+# $Id: lonindexer.pm,v 1.184 2008/12/05 10:23:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -957,9 +957,9 @@
}
# Set the icon for the file
my $iconname = &Apache::loncommon::icon($listname);
-#SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");
- $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
- $r->print('<td nowrap="nowrap" valign="top">');
+#SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
+ $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+ $r->print('<td valign="top"><span class="LC_nobreak">');
if ($env{'form.catalogmode'} eq 'interactive') {
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -967,7 +967,7 @@
$quotable_filelink,"')\">");
$r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
"\n");
- $r->print("</td><td nowrap='nowrap' valign='top'>");
+ $r->print('</span></td><td valign="top"><span class="LC_nobreak">');
} elsif ($env{'form.catalogmode'} eq 'import') {
$r->print("<form name='form$fnum' action=''>\n");
$r->print("<input type='checkbox' name='filelink"."' ".
@@ -977,7 +977,7 @@
$r->print("checked");
}
$r->print(" />\n");
- $r->print("</form></td><td nowrap='nowrap' valign='top'>");
+ $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');
$hash{"pre_${fnum}_link"}=$filelink;
$hash{"pre_${fnum}_title"}=$title;
if (!$hash{"pre_${fnum}_title"}) {
@@ -1034,12 +1034,12 @@
if ($filelink=~/\.(page|sequence)$/) {
$r->print('</form>');
}
- $r->print("</td>\n");
+ $r->print("</span></td>\n");
if ($hash{'display_attrs_0'} == 1) {
$r->print('<td> '.($title eq '' ? ' ' : $title).
' </td>'."\n");
}
- $r->print('<td align=right> ',
+ $r->print('<td align="right"> ',
$filecom[8]," </td>\n")
if $hash{'display_attrs_1'} == 1;
$r->print('<td> '.
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.199 loncom/interface/portfolio.pm:1.200
--- loncom/interface/portfolio.pm:1.199 Fri Nov 28 18:18:39 2008
+++ loncom/interface/portfolio.pm Fri Dec 5 10:23:56 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.199 2008/11/28 18:18:39 bisitz Exp $
+# $Id: portfolio.pm,v 1.200 2008/12/05 10:23:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1500,7 +1500,7 @@
}
$max_id ++;
my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
- $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
+ $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
}
$r->print('</table>');
}
@@ -1575,7 +1575,7 @@
sub actionbox {
my ($status,$num,$scope) = @_;
- my $output = '<span style="white-space: nowrap"><label>';
+ my $output = '<span class="LC_nobreak"><label>';
if ($status eq 'new') {
my $checkstate;
if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
@@ -1586,7 +1586,7 @@
&mt('Activate');
} else {
$output .= '<input type="checkbox" name="delete" value="'.$num.
- '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.
+ '" />'.&mt('Delete').'</label></span><br /><span class="LC_nobreak">'.
'<label><input type="checkbox" name="update" value="'.
$num.'" />'.&mt('Update');
}
@@ -1605,7 +1605,7 @@
undef,undef,1);
my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
'enddate_'.$num,$end,undef,undef,undef,1,undef,
- undef,undef,1). ' <span style="white-space: nowrap"><label>'.
+ undef,undef,1). ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="noend_'.
$num.'" '.$noend.' />'.&mt('No end date').
'</label></span>';
--bisitz1228472636--