[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework structuretags.pm
raeburn
raeburn at source.lon-capa.org
Fri Dec 13 20:44:31 EST 2013
raeburn Sat Dec 14 01:44:31 2013 EDT
Modified files: (Branch: version_2_11_X)
/loncom/homework structuretags.pm
Log:
- For 2.11
- Backport 1.515, 1.516.
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.512.2.4 loncom/homework/structuretags.pm:1.512.2.5
--- loncom/homework/structuretags.pm:1.512.2.4 Thu Aug 8 12:23:22 2013
+++ loncom/homework/structuretags.pm Sat Dec 14 01:44:31 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.512.2.4 2013/08/08 12:23:22 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.5 2013/12/14 01:44:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -637,7 +637,7 @@
'.&Apache::lonxml::message_location().'
</div>
'.
- '<table border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+ '<table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
}
sub problem_edit_footer {
@@ -2057,9 +2057,15 @@
}
$return = &Apache::run::run($code,$safeeval);
}
- if ($error) {
- &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running <while> on line').' '.$line.'</pre>');
- }
+ if ($error) {
+ &Apache::lonxml::error(
+ '<pre>'
+ .&mt('Code ran too long. It ran for more than [_1] seconds.',
+ $Apache::lonnet::perlvar{'lonScriptTimeout'})
+ .&mt('This occurred while running <while> on line [_1].',
+ $line)
+ .'</pre>');
+ }
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
}
@@ -2543,13 +2549,13 @@
.'<td><span class="LC_nobreak">'.&mt('Delete?').' '
.&Apache::edit::deletelist($target,$token)
.'</span></td>'
- .'<td align="left"><span id="math_'.$areaid.'">'
+ .'<td><span id="math_'.$areaid.'">'
.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
.'</span></td>'
.'<td>'
.&Apache::edit::insertlist($target,$token)
.'</td>'
- .'<td align="right" valign="top">' .
+ .'<td class="LC_edit_problem_latexhelper">' .
&Apache::loncommon::helpLatexCheatsheet().
&Apache::edit::end_row().
&Apache::edit::start_spanning_row()."\n".
More information about the LON-CAPA-cvs
mailing list