'.&mt('Open after').' '.
+ ''.&mt('Open after').' '.
&Apache::lonhtmlcommon::date_setter($chooserform,'start',$starttime,'','','','','','','',1,1).
- ' '.&mt('Closed before').' '.
+ ' '.&mt('Closed before').' '.
&Apache::lonhtmlcommon::date_setter($chooserform,'end',$endtime,'','','','','','','',1,1).
'
'.
' '.
'';
}
if ($env{'form.command'} eq 'manageresv') {
- $output .= '
';
+ $output .= ''.
+ ''.&mt('Action').' '.&mt('Name').' ';
+ } else {
+ $output .= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ''.&mt('Action').' '.&mt('Name').' '.
+ &Apache::loncommon::end_data_table_header_row();
+ }
+ my $shownsymb;
+ if ($env{'request.role.adv'}) {
+ $shownsymb = $symb;
+ } elsif (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) {
+ $shownsymb = &Apache::lonenc::encrypted($symb);
} else {
- $output .= &Apache::loncommon::start_data_table();
+ $shownsymb = $symb;
}
+ $shownsymb = &escape($shownsymb);
foreach my $slot (@{$available}) {
my $description=&get_description($slot,$slots->{$slot});
my $form;
@@ -1559,7 +1591,6 @@ ENDSCRIPT
}
}
}
- my $escsymb=&escape($symb);
if (!$form) {
my $name;
if ($formname) {
@@ -1572,7 +1603,7 @@ ENDSCRIPT
$form=<
-
+
@@ -1685,11 +1716,20 @@ sub remove_link {
undef($udom);
}
+ my $shownsymb;
+ if ($env{'request.role.adv'}) {
+ $shownsymb = $symb;
+ } elsif (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) {
+ $shownsymb = &Apache::lonenc::encrypted($symb);
+ } else {
+ $shownsymb = $symb;
+ }
+
$slotname = &escape($slotname);
$entry = &escape($entry);
$uname = &escape($uname);
$udom = &escape($udom);
- $symb = &escape($symb);
+ $symb = &escape($shownsymb);
return <<"END_LINK";
');
$r->print('');
$r->print('
- '.&mt('Show').'
- '.&mt('Student Display').'
- '.&mt('Open').'
- '.&mt('Slot Name Filter').'
+ '.&mt('Show').'
+ '.&mt('Student Display').'
+ '.&mt('Open').'
+ '.&mt('Slot Name Filter').'
'.&mt('Options').'
- '.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
+ '.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order,'show').
'
'.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display,
6,\%stu_display_fields,
- \@stu_display_order).'
+ \@stu_display_order,'studisplay').'
- '.&Apache::loncommon::select_form($when,'when',\%when_fields).
+ '.&Apache::loncommon::select_form($when,'when',\%when_fields,'','','when').
'
- '.&Apache::loncommon::select_form($name_filter_type,
+ '.&Apache::loncommon::select_form($name_filter_type,
'name_filter_type',
- \%name_filter_type_fields).
- ' '.
+ \%name_filter_type_fields,'','','name_filter_type').
+ ' '.
&Apache::lonhtmlcommon::textbox('name_filter_value',
$env{'form.name_filter_value'},
- 15).
- '
+ 15,'aria-label="'.&mt('Name filter').'"').
+ '
-
-
- '.&mt('Deleted slots:').'
- '.$show_radio.&mt('Show').'
-
-
- '.$hide_radio.&mt('Hide').'
-
-
-
+
+ '.&mt('Deleted slots').'
+ '.$show_radio.&mt('Show').'
+ '.$hide_radio.&mt('Hide').'
+
+
');
$r->print('
');
@@ -1874,7 +1910,7 @@ sub show_table {
my $linkstart=''.&mt('Action').'';
foreach my $which (@show_order) {
if ($which ne 'proctor' && exists($show{$which})) {
$tableheader .= ' '.$linkstart.$which.'">'.$show_fields{$which}.' ';
@@ -2041,11 +2077,11 @@ sub show_table {
my ($edit,$delete,$showlog,$remove_all);
if ($mgr) {
$edit=(<<"EDITLINK");
-$lt{'edit'}
+$lt{'edit'}
EDITLINK
$delete=(<<"DELETELINK");
-$lt{'delete'}
+$lt{'delete'}
DELETELINK
$remove_all=&remove_link($slot,'remove all').' ';
@@ -2058,7 +2094,7 @@ DELETELINK
}
$showlog=(<<"LOGLINK");
-$lt{'slotlog'}
+$lt{'slotlog'}
LOGLINK
if ($slots{$slot}{'type'} ne 'schedulable_student') {
@@ -2298,7 +2334,10 @@ sub manage_reservations {
my $slotheader = ''.
&mt('Your reservation status for any such assignments is listed below:').
'
'.
- ''."\n";
+ ''."\n".
+ ''.
+ ''.&mt('Resource or Folder').' '.
+ ''.&mt('Reservation Status').' '."\n";
my $shownheader = 0;
my $currmap;
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
@@ -2332,8 +2371,8 @@ sub manage_reservations {
$arrowstate = 'closed';
}
$row .= ''.$spacers.' '.
+ 'id="arrow'.$mapnum.'" '.'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" tabindex="0" '.
+ 'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" onkeydown="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
$icon.(' ' x6).' '."\n";
if (ref($output{$currmap}) eq 'HASH') {
my $formnum = $mapnum.'_'.$reservable+1;
@@ -2366,6 +2405,14 @@ sub manage_reservations {
$currcontainer = $parent{$depth};
} elsif (ref($resource)) {
my $symb = $resource->symb();
+ my $src = $resource->src();
+ my ($shownsymb,$shownsrc);
+ $shownsymb = $resource->shown_symb();
+ if ($resource->encrypted()) {
+ $shownsrc = &Apache::lonenc::encrypted($src);
+ } else {
+ $shownsrc = $src;
+ }
next if (!$resource->is_problem() && !$resource->is_tool() &&
!$resource->is_sequence() && !$resource->is_page());
$count ++;
@@ -2397,7 +2444,7 @@ sub manage_reservations {
for (my $i=0; $i<$depth; $i++) {
$r->print(' ');
}
- $r->print(''.
+ $r->print(' '.
' '.
- ''.&mt('Changes/page:').' '.
- &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
- (&mt('all'),5,10,20,50,100,1000,10000)).
- ' ';
+ my $output = ''.
+ ''.&mt('Changes/page:').' '.
+ ''.&mt('Window during which changes occurred:').' ';
+ if (ref($allsymbs) eq 'ARRAY') {
+ $output.= ''.&mt('Resource').' '.
+ ''.&mt('Context').' ';
+ } else {
+ $output.= ''.&mt('Action').' ';
+ }
+ $output .= ''.
+ &Apache::lonmeta::selectbox('show',$curr->{'show'},'','show',undef,
+ (&mt('all'),5,10,20,50,100,1000,10000)).
+ ' ';
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'log_start_date',
$curr->{'log_start_date'},undef,
@@ -2929,13 +2984,13 @@ sub display_filter {
undef,undef,undef,undef,undef,undef,$nolink);
my $crstype = &Apache::loncommon::course_type();
my %lt = &reservationlog_contexts($crstype);
- $output .= ''.&mt('Window during which changes occurred:').
- ' '.&mt('After:').
- ' '.$startform.' '.&mt('Before:').' '.
- $endform.'
';
+ $output .= ''.&mt('After:').' '.
+ ''.$startform.' '.
+ ''.&mt('Before:').' '.
+ ''.$endform.'
'.
+ ' ';
if (ref($allsymbs) eq 'ARRAY') {
- $output .= ''.&mt('Resource').' '.
- '{'resource'} eq 'any') {
$output .= ' selected="selected"';
}
@@ -2948,8 +3003,8 @@ sub display_filter {
}
$output .= ' '.$title.' ';
}
- $output .= ' '.
- &mt('Context:').' ';
+ $output .= ' '.
+ '';
foreach my $chgtype ('any','user','manage','parameter') {
my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {
@@ -2959,8 +3014,7 @@ sub display_filter {
}
$output .= ' ';
} else {
- $output .= ''.&mt('Action').' '.
- '{'action'} eq 'any') {
$output .= ' selected="selected"';
}
@@ -2974,7 +3028,7 @@ sub display_filter {
}
$output .= ' ';
}
- $output .= '
'.
+ $output .= '
'.
'
'.
''.
@@ -3027,12 +3081,12 @@ sub upload_start {
my ($r)=@_;
$r->print(
&Apache::grades::checkforfile_js()
- .'
'.&mt('Upload a file containing the slot definitions').' '
+ .''.&mt('Upload a file containing the slot definitions').' '
.'