--- loncom/interface/lonindexer.pm 2010/04/14 16:11:34 1.181.4.6 +++ loncom/interface/lonindexer.pm 2009/12/02 18:22:20 1.181.6.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.181.4.6 2010/04/14 16:11:34 raeburn Exp $ +# $Id: lonindexer.pm,v 1.181.6.2 2009/12/02 18:22:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -319,8 +319,10 @@ function select_group() { function changeURL(val) { if (window.opener.document) { - var elementname = "$element"; + var elementname = "$element"+"_value"; + var checkboxname = "$element"+"_setparmval"; 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); } @@ -435,91 +437,85 @@ ENDHEADER } } - 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} = &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); - 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(' -
+ 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'}.' -'."\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(< - - +
'. - '
+$lt{'hd'} + -$type_selector
+ + + + + + + + + + + + + + + + + + + + + + +
 
 
- +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); + } + $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 + .''); + $r->print(< $closebutton $groupimportbutton @@ -587,15 +583,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(''); @@ -899,7 +895,7 @@ sub display_line { } # Do we have permission to look at this? - if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); } + if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); } # make absolute links appear on different background if ($absolute) { $fileclr='#ccdd99'; } @@ -1300,8 +1296,12 @@ sub showpreview { my $output=''; my $embstyle=&Apache::loncommon::fileembstyle($curfext); if ($embstyle eq 'ssi') { - my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink. - '.tmp'; + my $cache = $Apache::lonnet::perlvar{'lonDocRoot'}.$filelink; + if ($env{'request.gcicontext'} eq 'buildtest') { + $cache .= '.tn'; + } else { + $cache .= '.tmp'; + } if ((!$env{'form.updatedisplay'}) && (-e $cache)) { open(FH,$cache);