--- loncom/interface/lonindexer.pm 2009/08/13 12:46:29 1.181.4.2 +++ loncom/interface/lonindexer.pm 2010/04/14 16:11:34 1.181.4.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.181.4.2 2009/08/13 12:46:29 raeburn Exp $ +# $Id: lonindexer.pm,v 1.181.4.6 2010/04/14 16:11:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -183,7 +183,7 @@ ENDSUBM $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< + END } elsif ($env{'form.catalogmode'} eq 'import') { @@ -194,11 +194,11 @@ END my $cl=&mt('Close'); my $gi=&mt('Import'); $closebutton=< + END $groupimportbutton=< +onclick="javascript:select_group()" /> END } # Additions made by Matthew to make the browser a little easier to deal @@ -319,10 +319,8 @@ function select_group() { function changeURL(val) { if (window.opener.document) { - var elementname = "$element"+"_value"; - var checkboxname = "$element"+"_setparmval"; + var elementname = "$element"; window.opener.document.forms["$form"].elements[elementname].value=val; - window.opener.document.forms["$form"].elements[checkboxname].checked=true; } else { alert("The file you selected is: "+val); } @@ -427,96 +425,101 @@ ENDHEADER for (my $i=0; $i<=16; $i++) { delete $hash{'display_attrs_'.$i}; if ($env{'form.attr'.$i} == 1) { - $attrchk[$i] = 'checked'; + $attrchk[$i] = 'checked="checked"'; $hash{'display_attrs_'.$i} = 1; } } } else { for (my $i=0; $i<=16; $i++) { - $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; + $attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1; } } -# ------------------------------- output state of file attributes to be showing -# All versions has to the last item -# since it does not take an extra col - my %lt=&Apache::lonlocal::texthash( - 'ti' => 'Title', - 'si' => 'Size', - 'la' => 'Last access', - 'lm' => 'Last modified', - 'st' => 'Statistics', - 'au' => 'Author', - 'kw' => 'Keywords', - 'sb' => 'Subject', - 'nt' => 'Notes', - 'ab' => 'Abstract', - 'ln' => 'Language', - 'gl' => 'Grade Level', - 'sd' => 'Standards', - 'sa' => 'Source Available', - 'sr' => 'Show resource', - 'li' => 'Linked/Related Resources', - 'av' => 'All versions', - 'ud' => 'Update Display', - 'pr' => 'Problems', - 'gr' => 'Graphics', - 'at' => 'All types', - 'hd' => 'Display Options', - ); - $r->print(< -$lt{'hd'} -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
- -END my @file_categories = &Apache::loncommon::filecategories(); my %select_file_categories; my @select_form_order = (''); $select_file_categories{''} = &mt('All file types'); foreach my $cat (@file_categories) { - my $types = join(",",&Apache::loncommon::filecategorytypes($cat)); - $select_file_categories{$types} = $cat; - push(@select_form_order,$types); - } + my $types = join(",",&Apache::loncommon::filecategorytypes($cat)); + $select_file_categories{$types} = &mt($cat); + push(@select_form_order,$types); + } $select_file_categories{'select_form_order'} = \@select_form_order; my $type_element= - &Apache::loncommon::select_form($typeselect,'only', - %select_file_categories); - $type_element = ''; - $r->print($type_element - .''); + &Apache::loncommon::select_form( + $typeselect, + 'only', + %select_file_categories); + my $type_selector = ''; + +# ------------------------------- output state of file attributes to be showing +# All versions has to the last item +# since it does not take an extra col + + my %lt=&Apache::lonlocal::texthash( + 'av' => 'All versions', + 'ud' => 'Update Display', + 'pr' => 'Problems', + 'gr' => 'Graphics', + 'at' => 'All types', + 'hd' => 'Display Options' + ); + my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16'); + my %disp_options = &Apache::lonlocal::texthash ( + 0 => 'Title', + 4 => 'Author', + 5 => 'Keywords', + 6 => 'Language', + 13 => 'Notes', + 1 => 'Size', + 2 => 'Last access', + 3 => 'Last modified', + 10 => 'Source Available', + 14 => 'Abstract', + 8 => 'Statistics', + 11 => 'Linked/Related Resources', + 7 => 'Show resource', + 12 => 'Subject', + 15 => 'Grade Level', + 16 => 'Standards', + ); + my $cell = 0; + my $numinrow = 4; + $r->print(' + +
+'.$lt{'hd'}.' +'."\n"); + foreach my $item (@disp_order) { + my $style = 'padding-left: 12px; padding-right: 8px;'; + if ($cell%$numinrow == 0) { + $r->print(''); + } + $cell ++; + if ($cell > 3 * $numinrow) { + $style .= ' padding-bottom: 6px;'; + } + if (defined($disp_options{$item})) { + $r->print(''."\n"); + } + if ($cell > 1 && $cell%$numinrow == 0) { + $r->print(''); + } + } $r->print(< + + + + +
'. + '
+ +$type_selector
+ +
$closebutton $groupimportbutton @@ -550,8 +553,8 @@ END &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); # -------------------------------------------------- Check All and Uncheck all if ($env{'form.catalogmode'} eq 'import') { - $r->print('
'); - $r->print(''); + $r->print('
'); + $r->print(''); } # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; @@ -584,15 +587,15 @@ END if ($hash{'display_attrs_11'} == 1); $r->print("".&mt("Resource")."\n") if ($hash{'display_attrs_7'} == 1); - $r->print("".&mt("Subject")."\n") + $r->print("".&mt("Subject")."\n") if ($hash{'display_attrs_12'} == 1); - $r->print("".&mt("Notes")."\n") + $r->print("".&mt("Notes")."\n") if ($hash{'display_attrs_13'} == 1); - $r->print("".&mt("Abstract")."\n") + $r->print("".&mt("Abstract")."\n") if ($hash{'display_attrs_14'} == 1); - $r->print("".&mt("Grade Level")."\n") + $r->print("".&mt("Grade Level")."\n") if ($hash{'display_attrs_15'} == 1); - $r->print("".&mt("Standards")."\n") + $r->print("".&mt("Standards")."\n") if ($hash{'display_attrs_16'} == 1); $r->print(''); @@ -880,7 +883,7 @@ sub display_line { $r->print("\n"); $r->print (''."\n"); @@ -889,14 +892,14 @@ sub display_line { $startdir.'" />'."\n"); $r->print (''."\n"); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); $r->print(&mt("Up")."
$tabtag\n"); return OK; } # Do we have permission to look at this? - if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); } + if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); } # make absolute links appear on different background if ($absolute) { $fileclr='#ccdd99'; } @@ -914,7 +917,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('\n"); $r->print("print("checked"); @@ -1032,7 +1035,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); } # Filetype icons @@ -1186,7 +1189,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print (''."\n"); $r->print (''.