[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm /interface loncommon.pm
raeburn
raeburn at source.lon-capa.org
Sun Jan 26 02:17:02 EST 2025
raeburn Sun Jan 26 07:17:02 2025 EDT
Modified files:
/loncom/homework inputtags.pm
/loncom/interface loncommon.pm
Log:
- WCAG 2 compliance
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.360 loncom/homework/inputtags.pm:1.361
--- loncom/homework/inputtags.pm:1.360 Sat Jan 25 17:51:52 2025
+++ loncom/homework/inputtags.pm Sun Jan 26 07:17:02 2025
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.360 2025/01/25 17:51:52 raeburn Exp $
+# $Id: inputtags.pm,v 1.361 2025/01/26 07:17:02 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -470,10 +470,10 @@
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
}
- my $labeltext = &mt('Enter answer');
- if ($Apache::lonhomework::type =~ /survey/) {
- $labeltext = &mt('Enter response');
- }
+ my $labeltext = &mt('Enter answer');
+ if ($Apache::lonhomework::type =~ /survey/) {
+ $labeltext = &mt('Enter response');
+ }
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
. ' onfocus="javascript:disableAutoComplete(\''.$input_tag_id.'\');"'
. ' type="text" '.$readonly.' name="'. $name . '"'
@@ -1695,23 +1695,23 @@
} else {
if ($message) {
if ($usediv) {
- $message = '<div class=LC_status_cell">'."\n".
- '<span class="'."$tdclass $css_class".'">'.$message.'</span></div>';
+ $message = '<span class="LC_prob_status">'."\n".
+ '<span class="'."$tdclass $css_class".'">'.$message.'</span>'."\n".
+ '</span>';
} else {
$message="<td class=\"$tdclass $css_class\">$message</td>";
}
} else {
if ($usediv) {
- $message = '<div class="LC_status_cell">'."\n".
- '<span class="'.$tdclass.'"></span></div>';
+ $message = '<span class="LC_prob_status '.$tdclass.'"></span>';
} else {
$message="<td class=\"$tdclass\"></td>";
}
}
if ($previousmsg) {
if ($usediv) {
- $previousmsg = '<div class="LC_status_cell">'."\n".
- '<span class="'."$tdclass LC_answer_previous".'">'.$previousmsg.'</span></div>';
+ $previousmsg = '<span class="'."LC_prob_status $tdclass LC_answer_previous".'">'.
+ $previousmsg.'</span>';
} else {
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
}
@@ -1756,8 +1756,7 @@
$trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>';
}
if ($usediv) {
- $trystr = '<div class="LC_status_cell">'."\n".
- '<span class="'.$tdclass.'">'.$trystr.'</span></div>';
+ $trystr = '<span class="LC_prob_status '.$tdclass.'">'.$trystr.'</span>';
} else {
$trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>';
}
@@ -1769,8 +1768,8 @@
$latemessage=&mt(' The last submission was after the Due Date ');;
if ($target eq 'web') {
if ($usediv) {
- $latemessage = '<div class="LC_status_cell">'."\n".
- '<span class="'."$tdclass LC_answer_late".'">'.$latemessage.'</span></div>';
+ $latemessage = '<span class="'."LC_prob_status $tdclass LC_answer_late".'">'.
+ $latemessage.'</span>';
} else {
$latemessage='<td class="'.$tdclass.' LC_answer_late">'.$latemessage.'</td>';
}
@@ -1824,13 +1823,14 @@
if ( $showbutton ) {
if ($target ne 'tex') {
if ($env{'form.disable_submit'}) {
- $button = '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" /> '.
+ $button = '<span class="LC_prob_status">'.
+ '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" /> </span>'.
'<div id="msg_submit_'.$id.'" style="display:none"></div>';
} else {
- $button =
+ $button = '<span class="LC_prob_status">'.
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
- value="'.&mt('Submit Answer').'" /> '.
+ value="'.&mt('Submit Answer').'" /> </span>'.
'<div id="msg_submit_'.$id.'" style="display:none">'.
&mt('Processing your submission ...').'</div>';
}
@@ -1846,11 +1846,7 @@
return $button.' \vskip 0 mm '.$output.' ';
} else {
if ($usediv) {
- $output =
- '<div class="LC_prob_status">'.
- '<div class="LC_prob_status_row">'.
- '<div class="LC_status_cell">'.
- $button.'</div>'."\n".$output;
+ $output = '<div>'.$button."\n".$output;
} else {
$output =
'<table><tr><td>'.$button.'</td>'.$output;
@@ -1858,16 +1854,16 @@
if ((!$no_previous) &&
(($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') ||
($env{'request.role.adv'}))) {
- if ($usediv) {
- $output .= '<div class="LC_status_cell">'.
- &previous_tries($id,$target).'</div>';
+ if ($usediv) {
+ $output .= '<span class="LC_prob_status">'.
+ &previous_tries($id,$target).'</span>';
} else {
- $output .= '<td class="'.$tdclass.'">'.
+ $output .= '<td class="'.$tdclass.'">'.
&previous_tries($id,$target).'</td>';
}
}
if ($usediv) {
- $output.= '</div></div>'."\n";
+ $output.= '</div>'."\n";
} else {
$output.= '</tr></table>';
}
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1446 loncom/interface/loncommon.pm:1.1447
--- loncom/interface/loncommon.pm:1.1446 Sat Jan 25 17:51:52 2025
+++ loncom/interface/loncommon.pm Sun Jan 26 07:17:02 2025
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1446 2025/01/25 17:51:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.1447 2025/01/26 07:17:02 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -8228,17 +8228,7 @@
}
.LC_prob_status {
- display: table;
- padding: 0;
- margin: 0;
-}
-
-.LC_prob_status_row {
- display: table-row;
-}
-
-.LC_status_cell {
- display: table-cell;
+ margin-top: 5px;
padding-top: 0;
padding-left: 0;
padding-bottom: 0;
More information about the LON-CAPA-cvs
mailing list