[LON-CAPA-cvs] cvs: loncom /interface lonblockingmenu.pm lonnavmaps.pm
raeburn
raeburn at source.lon-capa.org
Sun Dec 14 22:08:53 EST 2025
raeburn Mon Dec 15 03:08:53 2025 EDT
Modified files:
/loncom/interface lonnavmaps.pm lonblockingmenu.pm
Log:
- WCAG 2 compliance.
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.509.2.13 loncom/interface/lonnavmaps.pm:1.509.2.13.2.1
--- loncom/interface/lonnavmaps.pm:1.509.2.13 Sat May 2 21:40:02 2020
+++ loncom/interface/lonnavmaps.pm Mon Mar 8 03:48:34 2021
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.509.2.13 2020/05/02 21:40:02 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.13.2.1 2021/03/08 03:48:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -4819,11 +4819,12 @@
my $date;
my @interval=$self->parmval("interval", $part);
my $due_date=$self->parmval("duedate", $part);
- if ($interval[0] =~ /\d+/) {
- my $first_access=&Apache::lonnet::get_first_access($interval[1],
- $self->{SYMB});
+ if ($interval[0] =~ /^(\d+)/) {
+ my $timelimit = $1;
+ my $first_access=&Apache::lonnet::get_first_access($interval[1],
+ $self->{SYMB});
if (defined($first_access)) {
- my $interval = $first_access+$interval[0];
+ my $interval = $first_access+$timelimit;
$date = (!$due_date || $interval < $due_date) ? $interval
: $due_date;
} else {
Index: loncom/interface/lonblockingmenu.pm
diff -u loncom/interface/lonblockingmenu.pm:1.33 loncom/interface/lonblockingmenu.pm:1.34
--- loncom/interface/lonblockingmenu.pm:1.33 Sat Dec 13 05:56:01 2025
+++ loncom/interface/lonblockingmenu.pm Mon Dec 15 03:08:53 2025
@@ -2,7 +2,7 @@
# Routines for configuring blocking of access to collaborative functions,
# and specific resources during an exam
#
-# $Id: lonblockingmenu.pm,v 1.33 2025/12/13 05:56:01 raeburn Exp $
+# $Id: lonblockingmenu.pm,v 1.34 2025/12/15 03:08:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -594,6 +594,7 @@
'defs' => 'Defined Start/End',
'trig' => 'Triggered by Activating Timer',
'setb' => 'Set by',
+ 'acti' => 'Action',
'even' => 'Event',
'blck' => 'Blocked?',
'star' => 'Start',
@@ -603,9 +604,10 @@
'when' => 'When using defined start/end times for an event, please set dates carefully.',
'yes' => 'Yes',
'no' => 'No',
+ 'titl' => 'Event title',
);
- $r->print('<h3>'.$lt{'cbds'}.'</h3>');
+ $r->print('<h2 class="LC_heading_2">'.$lt{'cbds'}.'</h2>');
# ---------------------------------------------------- Get Time Limit parameters
my %intervals = &get_timed_items();
@@ -660,7 +662,7 @@
END
} else {
$r->print($lt{'ncbc'}.'<br /><br />'.
- '<h4>'.$lt{'addn'}.'</h4>'.
+ '<h3 class="LC_heading_3">'.$lt{'addn'}.'</h3>'.
'<input type="hidden" name="blockaction" value="add" />');
}
}
@@ -777,7 +779,6 @@
my $addtimer = 0;
my %blocking = ();
my (%map_url,%resource_symb,%titles,$output);
- $output = '<h3>'.$lt{'head'}.'</h3>';
if ($env{'form.blockaction'} eq 'modify') {
foreach my $envkey (keys(%env)) {
if ($envkey =~ m/^form\.action_(\d+)$/) {
@@ -1107,7 +1108,7 @@
if ($readonly) {
$disabled = ' disabled="disabled"';
} else {
- $r->print('<th></th>');
+ $r->print('<th>'.$ltext->{'acti'}.'</th>');
}
$r->print(<<"END");
<th>$ltext->{'type'}</th>
@@ -1135,7 +1136,10 @@
} else {
$r->print(<<"ACT");
- <td valign="middle"><span class="LC_nobreak"><label>
+ <td valign="middle"><span class="LC_nobreak">
+ <fieldset class="LC_borderless">
+ <legend class="LC_visually-hidden">$ltext->{'acti'}</legend>
+ <label>
<input type="radio" name="action_$parmcount" value="modify" />$lt{'modi'}
</label></span><br />
<span class="LC_nobreak"><label>
@@ -1145,6 +1149,7 @@
<input type="radio" name="action_$parmcount" id="nochange_$parmcount"
value="nochange" checked="checked" />$lt{'noch'}
</label></span>
+ </fieldset>
</td>
ACT
}
@@ -1179,7 +1184,7 @@
}
$r->print(<<"END");
<td>
- <input type="text" name="title_$parmcount" size="15" value="$title" onfocus="$jschg" $disabled />
+ <input type="text" name="title_$parmcount" size="15" value="$title" onfocus="$jschg" $disabled aria-label="$ltext->{'titl'}" />
<input type="hidden" name="key_$parmcount" value="$blockid" />
<br />
<br />
@@ -1266,7 +1271,7 @@
<span class="LC_warning">$ltext->{'when'}</span></div>
<div id="show_timer" style="display:none">$intervalform</div>
</td>
- <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+ <td><input type="text" name="title_$parmcount" size="15" value="" aria-label="$ltext->{'titl'}" /></td>
END
$r->print('<td>'.&blocker_checkboxes($parmcount).'</td>'.
&Apache::loncommon::end_data_table_row().
@@ -1280,7 +1285,7 @@
my ($typeorder,$types) = &blocktype_text();
my $numinrow = 2;
my %currdocs;
- my $output = '<table>';
+ my $output = '<div role="grid" class="LC_grid">';
for (my $i=0; $i<@{$typeorder}; $i++) {
my $block = $typeorder->[$i];
my ($clickaction,$blockstatus);
@@ -1320,20 +1325,11 @@
my $rem = $i%($numinrow);
if ($rem == 0) {
if ($i > 0) {
- $output .= '</tr>';
+ $output .= '</div>';
}
- $output .= '<tr>';
- }
- if ($i == scalar(@{$typeorder})-1) {
- my $colsleft = $numinrow-$rem;
- if ($colsleft > 1) {
- $output .= '<td colspan="'.$colsleft.'">';
- } else {
- $output .= '<td>';
- }
- } else {
- $output .= '<td>';
+ $output .= '<div role="row" class="LC_grid_row">';
}
+ $output .= '<div role="gridcell" class="LC_grid_cell">';
my $item = $block.'_'.$parmcount;
if ($clickaction) {
$clickaction = ' onclick="'.$clickaction.'"';
@@ -1351,9 +1347,9 @@
&mt('Details').'</a>';
}
}
- $output .= '<br /></td>';
+ $output .= '<br /></div>';
}
- $output .= '</tr></table>'.
+ $output .= '</div></div>'.
'<input type="hidden" name="docs_maps_'.$parmcount.'"'.
' id="docs_maps_'.$parmcount.'" value="'.$currdocs{'maps'}.'" />'.
'<input type="hidden" name="docs_resources_'.$parmcount.'"'.
More information about the LON-CAPA-cvs
mailing list