--- loncom/interface/lonindexer.pm 2010/04/14 16:11:34 1.181.4.6 +++ loncom/interface/lonindexer.pm 2009/12/02 18:33:27 1.203 @@ -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.203 2009/12/02 18:33:27 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -104,7 +104,7 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); - my $fileclr='#ffffe6'; +#SB my $fileclr='#ffffe6'; my $line; my (@attrchk,@openpath,$typeselect); my $uri=$r->uri; @@ -177,7 +177,8 @@ ENDSUBM # --------------------- define extra fields and buttons in case of special mode if ($env{'form.catalogmode'} eq 'interactive') { - $extrafield=''. +#SB $extrafield=''. + $extrafield=''. ''; $colspan=" colspan='2' "; @@ -187,7 +188,8 @@ ENDSUBM END } elsif ($env{'form.catalogmode'} eq 'import') { - $extrafield=''. +#SB $extrafield=''. + $extrafield=''. ''; $colspan=" colspan='2' "; @@ -319,8 +321,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); } @@ -357,6 +361,7 @@ END my $js = <<"ENDHEADER"; ENDHEADER my ($headerdom)=($uri=~m{^/res/($match_domain)/}); - my %args = ( - 'domain' => $headerdom, - ); + if ($env{'form.catalogmode'}) { # "Popup mode" - $args{'only_body'} = 1; + $r->print(&Apache::loncommon::start_page('Browse published resources',$js, + {'only_body' => 1, + 'domain' => $headerdom,})); + } else { + # Only display page header and breadcrumbs in non-popup mode + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Browse published resources', + 'href' => '/res/fhwfdev/?launch=1', + }); + $r->print(&Apache::loncommon::start_page('Browse published resources',$js, + {'domain' => $headerdom,}) + .&Apache::lonhtmlcommon::breadcrumbs() + ); } - $r->print(&Apache::loncommon::start_page('Browse Resources',$js,\%args)); + # ---------------------------------- get state of file types to be showing if ($env{'form.only'}) { $typeselect = $env{'form.only'}; @@ -425,7 +442,7 @@ ENDHEADER for (my $i=0; $i<=16; $i++) { delete $hash{'display_attrs_'.$i}; if ($env{'form.attr'.$i} == 1) { - $attrchk[$i] = 'checked="checked"'; + $attrchk[$i] = 'checked'; $hash{'display_attrs_'.$i} = 1; } } @@ -435,91 +452,86 @@ ENDHEADER } } +# ------------------------------- 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} = &mt($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); - 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(''); - } - } + $type_element = ''; + $r->print($type_element + .''); $r->print(< - - - -
'. - '
- -$type_selector
- -
$closebutton $groupimportbutton @@ -531,21 +543,31 @@ END $storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; $storeuri=~s/\/+/\//g; # ---------------------------------------------------------------- Bread crumbs - $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','', - (($env{'form.catalogmode'} eq 'import')? - 'document.forms.fileattr':'')). - &Apache::lonhtmlcommon::select_recent('residx','resrecent', -'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')); + $r->print( + '

' + .&Apache::lonhtmlcommon::crumbs( + $storeuri, + '', + '', + (($env{'form.catalogmode'} eq 'import')? + 'document.forms.fileattr':'')) + .'
' + .&Apache::lonhtmlcommon::select_recent( + 'residx', + 'resrecent', + 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();') + .'

' + ); # -------------------------------------------------------- Resource Home Button my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'}; if ($reshome) { - $r->print("print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();'); } else { $r->print($reshome); } - $r->print("'>".&mt('Home').''); + $r->print("'>".&mt('Home').''); } $r->print('
'); # ------------------------------------------------------ Remember where we were @@ -553,51 +575,53 @@ 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"; #$r->print(&initdebug()); #$r->print(&writedebug("Omit:@Omit")) if (@Omit); #$r->print(&writedebug("Only:@Only")) if (@Only); - $r->print('
'."\n"); - $r->print(''."\n"); - $r->print("\n"); - $r->print("\n") + $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes") + .&Apache::loncommon::start_data_table_header_row()); + $r->print("\n"); + $r->print("\n") if ($hash{'display_attrs_0'} == 1); - $r->print("\n") if ($hash{'display_attrs_1'} == 1); - $r->print("\n") + $r->print('\n") if ($hash{'display_attrs_1'} == 1); + $r->print("\n") if ($hash{'display_attrs_2'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_3'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_4'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_5'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_6'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_8'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_10'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_11'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_7'} == 1); - $r->print("\n") - if ($hash{'display_attrs_12'} == 1); - $r->print("\n") - if ($hash{'display_attrs_13'} == 1); - $r->print("\n") - if ($hash{'display_attrs_14'} == 1); - $r->print("\n") - if ($hash{'display_attrs_15'} == 1); - $r->print("\n") - if ($hash{'display_attrs_16'} == 1); - $r->print(''); + $r->print("\n") + if ($hash{'display_attrs_12'} == 1); + $r->print("\n") + if ($hash{'display_attrs_13'} == 1); + $r->print("\n") + if ($hash{'display_attrs_14'} == 1); + $r->print("\n") + if ($hash{'display_attrs_15'} == 1); + $r->print("\n") + if ($hash{'display_attrs_16'} == 1); + + $r->print(&Apache::loncommon::end_data_table_header_row()); + + # ----------------- read in what directories have previously been set to "open" foreach (keys %hash) { @@ -647,15 +671,13 @@ END # -------- recursively go through all the directories and output as appropriate &scanDir ($r,$toplevel,$indent,\%hash); - # -------------------------------------------------------------- end the tables - $r->print('
".&mt('Name')."".&mt('Title')."".&mt('Name')."".&mt('Title')."".&mt("Size")." (".&mt("bytes").") ". - "".&mt("Last accessed")."'.&mt("Size")." (".&mt("bytes").") ". + "".&mt("Last accessed")."".&mt("Last modified")."".&mt("Last modified")."".&mt("Author(s)")."".&mt("Author(s)")."".&mt("Keywords")."".&mt("Keywords")."".&mt("Language")."".&mt("Language")."".&mt("Usage Statistics")."
(". - &mt("Courses/Network Hits").") ".&mt('updated periodically')."		".&mt("Usage Statistics")."
(". + &mt("Courses/Network Hits").") ".&mt('updated periodically')."		".&mt("Source Available")."".&mt("Source Available")."".&mt("Linked/Related Resources")."".&mt("Linked/Related Resources")."".&mt("Resource")."".&mt("Resource")."".&mt("Subject")."".&mt("Notes")."".&mt("Abstract")."".&mt("Grade Level")."".&mt("Standards")."
".&mt("Subject")."".&mt("Notes")."".&mt("Abstract")."".&mt("Grade Level")."".&mt("Standards")."
'); + $r->print(&Apache::loncommon::end_data_table()); + # ---------------------------- embed hidden information useful for group import $r->print("
"); $r->print("
"); -# -------------------------------------------------------------- end the tables - $r->print('
'); # --------------------------------------------------- end the output and return $r->print(&Apache::loncommon::end_page()."\n"); @@ -852,7 +874,7 @@ sub display_line { $pathprefix=$startdir; } my $dirptr=16384; - my $fileclr="#ffffe6"; +#SB my $fileclr="#ffffe6"; my $iconpath= $r->dir_config('lonIconsURL') . '/'; my @filecom = split (/\&/,$line); @@ -861,6 +883,7 @@ sub display_line { my $fnptr = $filecom[3]&$dirptr; my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources'); $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened'; + my $nowOpen = ($diropen eq 'opened' ? 1 : 0); my $tabtag=''; my $i=0; @@ -879,7 +902,9 @@ sub display_line { $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1]; $updir=~s/\/+/\//g; - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!? + $r->print($extrafield); $r->print("\n"); $r->print ('
print(&Apache::loncommon::inhibit_menu_check('input')); $r->print (''."\n"); - $r->print (''."\n"); - $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (''."\n"); + $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); - $r->print(&mt("Up")."$tabtag\n"); + $r->print(&mt("Up")."
$tabtag"); + $r->print(&Apache::loncommon::end_data_table_row()); 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])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); } # make absolute links appear on different background - if ($absolute) { $fileclr='#ccdd99'; } +#SB if ($absolute) { $fileclr='#ccdd99'; } # display domain if ($filecom[1] eq 'domain') { $r->print (''."\n") if ($env{'form.dirPointer'} eq "on"); - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?" + $r->print($extrafield); $r->print(""); &begin_form ($r,$filecom[0]); my $anchor = $filecom[0]; $anchor =~ s/\W//g; $r->print (''); - $r->print (''); - $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. +$r->print (''); + $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print ('print (' class="LC_icon" />'."\n"); - $r->print (&mt("Domain")." - $listname "); + $r->print (' class="LC_fileicon" />'."\n"); + $r->print (&mt("Domain")." - $listname "); if (&Apache::lonnet::domain($listname,'description')) { - $r->print("(".&Apache::lonnet::domain($listname,'description'). + $r->print("
(".&Apache::lonnet::domain($listname,'description'). ")"); } - $r->print ("$tabtag\n"); + $r->print("$tabtag"); + $r->print(&Apache::loncommon::end_data_table_row()); return OK; # display user directory @@ -938,48 +965,54 @@ sub display_line { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\W//g; - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row() + .$extrafield.''); &begin_form ($r,$curdir); $r->print (''."\n"); + 'whitespace_21.gif" class="LC_icon" />'."\n"); $r->print (''); - $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (''); + $r->print ('print (' alt="'.$msg.'"/>'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print (''.$msg.''); + $iconpath.'quill.gif" class="LC_fileicon" />'); my $domain=(split(m|/|,$startdir))[2]; my $plainname=&Apache::loncommon::plainname($listname,$domain); - $r->print ($listname); - if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); } - $r->print (''.$tabtag.''."\n"); - return OK; + $r->print ($listname.''); + + if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); } + $r->print(''.$tabtag); + $r->print(&Apache::loncommon::end_data_table_row()); + return OK; } # display file - if (($fnptr == 0 and $filecom[3] ne '') or $absolute) { - my $title; - my $filelink = $pathprefix.$filecom[0]; - if ($hash{'display_attrs_0'} == 1) { - $title = &Apache::lonnet::gettitle($filelink); - } - my @file_ext = split (/\./,$listname); - my $curfext = $file_ext[-1]; - if (@Omit) { - foreach (@Omit) { return OK if (lc($curfext) eq $_); } - } - if (@Only) { - my $skip = 1; - foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); } - return OK if ($skip > 0); - } - # Set the icon for the file - my $iconname = &Apache::loncommon::icon($listname); - $r->print(''. - ''); + if (($fnptr == 0 and $filecom[3] ne '') or $absolute) { + my $title; + my $filelink = $pathprefix.$filecom[0]; + if ($hash{'display_attrs_0'} == 1) { + $title = &Apache::lonnet::gettitle($filelink); + } + my @file_ext = split (/\./,$listname); + my $curfext = $file_ext[-1]; + if (@Omit) { + foreach (@Omit) { return OK if (lc($curfext) eq $_); } + } + if (@Only) { + my $skip = 1; + foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); } + return OK if ($skip > 0); + } + # Set the icon for the file + my $iconname = &Apache::loncommon::icon($listname); +#SB $r->print("); + $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!? + $r->print(''); if ($env{'form.catalogmode'} eq 'interactive') { my $quotable_filelink = &Apache::loncommon::escape_single($filelink); @@ -987,7 +1020,7 @@ sub display_line { $quotable_filelink,"')\">"); $r->print("\"\"". "\n"); - $r->print(''); + $r->print(''); } elsif ($env{'form.catalogmode'} eq 'import') { $r->print("
\n"); $r->print("print("checked"); } $r->print(" />\n"); - $r->print('
'); + $r->print(''); $hash{"pre_${fnum}_link"}=$filelink; $hash{"pre_${fnum}_title"}=$title; if (!$hash{"pre_${fnum}_title"}) { @@ -1012,34 +1045,27 @@ sub display_line { $indent--; } # General indentation - if ($indent > 0 and $indent < 16) { - $r->print("\"\"\n"); - } elsif ($indent >0) { - my $ten = int($indent/10.); - my $rem = $indent%10.0; my $count = 0; - while ($count < $ten) { - $r->print("\"\"\n"); - $count++; + while ($count < $indent) { + $r->print(''); + $count++; } - $r->print("\"\"\n") if $rem > 0; - } # Sequence open/close icon if ($filelink=~/\.(page|sequence)$/) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\W//g; $r->print (''); - $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (''); + $r->print (''); + $r->print ('print (' alt="'.$msg.'" />'. "\n"); } # Filetype icons - $r->print("\"\"\n"); + $r->print("\"\"\n"); my $quotable_filelink = &Apache::loncommon::escape_single($filelink); $r->print (" print(''); } - $r->print("\n"); + $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } - $r->print(' ', + $r->print(' ', $filecom[8]," \n") if $hash{'display_attrs_1'} == 1; - $r->print(' '. + $r->print(' '. (&Apache::lonlocal::locallocaltime($filecom[9]))." \n") if $hash{'display_attrs_2'} == 1; - $r->print(' '. + $r->print(' '. (&Apache::lonlocal::locallocaltime($filecom[10]))." \n") if $hash{'display_attrs_3'} == 1; if ($hash{'display_attrs_4'} == 1) { my $author = &Apache::lonnet::metadata($filelink,'author'); - $r->print(' '.($author eq '' ? ' ' : $author). + $r->print(' '.($author eq '' ? ' ' : $author). " \n"); } if ($hash{'display_attrs_5'} == 1) { @@ -1080,7 +1106,6 @@ sub display_line { $r->print(' '.($keywords eq '' ? ' ' : $keywords). " \n"); } -#' if ($hash{'display_attrs_6'} == 1) { my $lang = &Apache::lonnet::metadata($filelink,'language'); @@ -1092,11 +1117,13 @@ sub display_line { # statistics &dynmetaread($filelink); $r->print(""); - for (qw(count course stdno avetries difficulty disc clear technical - correct helpful depth)) { - &dynmetaprint($r,$filelink,$_); - } + for (qw(count course stdno avetries difficulty disc clear technical + correct helpful depth)) { + + dynmetaprint($r,$filelink,$_); + } + $r->print(" \n"); } @@ -1119,85 +1146,89 @@ sub display_line { &dynmetaread($filelink); $r->print(''); &coursecontext($r,$filelink); - for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) { - &dynmetaprint($r,$filelink,$_); - } - $r->print(''); + for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) { + dynmetaprint($r,$filelink,$_); + } + $r->print(''); } - if ($hash{'display_attrs_7'} == 1) { + + + + if ($hash{'display_attrs_7'} == 1) { # Show resource my $output=&showpreview($filelink); - $r->print(' '.($output eq '' ? ' ':$output). + $r->print(''.($output eq '' ? ' ':$output). " \n"); - } - if ($hash{'display_attrs_12'} == 1) { - my $subject = &Apache::lonnet::metadata($filelink,'subject'); - $r->print(' '.($subject eq '' ? ' ' : $subject). - " \n"); - } - - if ($hash{'display_attrs_13'} == 1) { - my $notes = &Apache::lonnet::metadata($filelink,'notes'); - $r->print(' '.($notes eq '' ? ' ' : $notes). - " \n"); - } - - if ($hash{'display_attrs_14'} == 1) { - my $abstract = &Apache::lonnet::metadata($filelink,'abstract'); - $r->print(' '.($abstract eq '' ? ' ' : $abstract). - " \n"); - } - - if ($hash{'display_attrs_15'} == 1) { - my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel'); - $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel). - " \n"); - } - - if ($hash{'display_attrs_16'} == 1) { - my $standards = &Apache::lonnet::metadata($filelink,'standards'); - $r->print(' '.($standards eq '' ? ' ' : $standards). - " \n"); - } - - $r->print("\n"); } + + if ($hash{'display_attrs_12'} == 1) { + my $subject = &Apache::lonnet::metadata($filelink,'subject'); + $r->print(' '.($subject eq '' ? ' ' : $subject). + " \n"); + } + + if ($hash{'display_attrs_13'} == 1) { + my $notes = &Apache::lonnet::metadata($filelink,'notes'); + $r->print(' '.($notes eq '' ? ' ' : $notes). + " \n"); + } + + if ($hash{'display_attrs_14'} == 1) { + my $abstract = &Apache::lonnet::metadata($filelink,'abstract'); + $r->print(' '.($abstract eq '' ? ' ' : $abstract). + " \n"); + } + + if ($hash{'display_attrs_15'} == 1) { + my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel'); + $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel). + " \n"); + } + + if ($hash{'display_attrs_16'} == 1) { + my $standards = &Apache::lonnet::metadata($filelink,'standards'); + $r->print(' '.($standards eq '' ? ' ' : $standards). + " \n"); + } + + $r->print(&Apache::loncommon::end_data_table_row()); +} + + # -- display directory if ($fnptr == $dirptr) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\W//g; - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?) +# $r->print(''); + $r->print($extrafield.''); &begin_form ($r,$curdir); my $indentm1 = $indent-1; - if ($indentm1 < 16 and $indentm1 > 0) { - $r->print("\"\"\n"); - } else { - my $ten = int($indentm1/10.); - my $rem = $indentm1%10.0; - my $count = 0; - while ($count < $ten) { - $r->print ("\"\"\n"); - $count++; - } - $r->print ("\"\"\n") if $rem > 0; + my $count = 0; + while ($count < $indentm1) { + $r->print (''); + $count++; } $r->print (''); - $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (''); + $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); - $r->print ('' - .''.&mt('Open Folder').''. - "\n"); - $r->print ("$listname\n"); + + my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons"); + my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif'; + $r->print ('' + .''.&mt('Open Folder').''. + "\n"); + $r->print ("$listname\n"); # Attributes my $filelink = $startdir.$filecom[0].'/default'; @@ -1206,13 +1237,13 @@ sub display_line { $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } - $r->print(' ', + $r->print(' ', $filecom[8]," \n") if $hash{'display_attrs_1'} == 1; - $r->print(' '. + $r->print(' '. (&Apache::lonlocal::locallocaltime($filecom[9]))." \n") if $hash{'display_attrs_2'} == 1; - $r->print(' '. + $r->print(' '. (&Apache::lonlocal::locallocaltime($filecom[10]))." \n") if $hash{'display_attrs_3'} == 1; @@ -1233,6 +1264,7 @@ sub display_line { $r->print(' '.($lang eq '' ? ' ' : $lang). " \n"); } + if ($hash{'display_attrs_8'} == 1) { $r->print(' '); } @@ -1241,41 +1273,41 @@ sub display_line { } if ($hash{'display_attrs_7'} == 1) { $r->print(' '); - } - if ($hash{'display_attrs_12'} == 1) { - my $subject = &Apache::lonnet::metadata($filelink,'subject'); - $r->print(' '.($subject eq '' ? ' ' : $subject). - " \n"); - } - if ($hash{'display_attrs_11'} == 1) { - $r->print(' '); - } - if ($hash{'display_attrs_12'} == 1) { - my $subject = &Apache::lonnet::metadata($filelink,'subject'); - $r->print(' '.($subject eq '' ? ' ' : $subject). - " \n"); - } - if ($hash{'display_attrs_13'} == 1) { - my $notes = &Apache::lonnet::metadata($filelink,'notes'); - $r->print(' '.($notes eq '' ? ' ' : $notes). - " \n"); - } - if ($hash{'display_attrs_14'} == 1) { - my $abstract = &Apache::lonnet::metadata($filelink,'abstract'); - $r->print(' '.($abstract eq '' ? ' ' : $abstract). - " \n"); - } - if ($hash{'display_attrs_15'} == 1) { - my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel'); - $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel). - " \n"); - } - if ($hash{'display_attrs_16'} == 1) { - my $standards = &Apache::lonnet::metadata($filelink,'standards'); - $r->print(' '.($standards eq '' ? ' ' : $standards). - " \n"); - } - $r->print(''); + } + if ($hash{'display_attrs_11'} == 1) { + $r->print(' '); + } + if ($hash{'display_attrs_12'} == 1) { + my $subject = &Apache::lonnet::metadata($filelink,'subject'); + $r->print(' '.($subject eq '' ? ' ' : $subject). + " \n"); + } + if ($hash{'display_attrs_13'} == 1) { + my $notes = &Apache::lonnet::metadata($filelink,'notes'); + $r->print(' '.($notes eq '' ? ' ' : $notes). + " \n"); + } + + if ($hash{'display_attrs_14'} == 1) { + my $abstract = &Apache::lonnet::metadata($filelink,'abstract'); + $r->print(' '.($abstract eq '' ? ' ' : $abstract). + " \n"); + } + + if ($hash{'display_attrs_15'} == 1) { + my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel'); + $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel). + " \n"); + } + + if ($hash{'display_attrs_16'} == 1) { + my $standards = &Apache::lonnet::metadata($filelink,'standards'); + $r->print(' '.($standards eq '' ? ' ' : $standards). + " \n"); + } + + + $r->print(&Apache::loncommon::end_data_table_row()); } } @@ -1324,7 +1356,6 @@ sub showpreview { close(FH); } } - $output=''.$output.''; } elsif ($embstyle eq 'img') { $output=''.&mt('Preview').''; } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {