--- loncom/interface/lonindexer.pm 2009/03/17 22:27:44 1.191 +++ loncom/interface/lonindexer.pm 2009/12/07 02:27:25 1.203.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.191 2009/03/17 22:27:44 schulted Exp $ +# $Id: lonindexer.pm,v 1.203.2.1 2009/12/07 02:27:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -184,7 +184,7 @@ ENDSUBM $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< + END } elsif ($env{'form.catalogmode'} eq 'import') { @@ -196,11 +196,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 @@ -361,6 +361,7 @@ END my $js = <<"ENDHEADER"; ENDHEADER my ($headerdom)=($uri=~m{^/res/($match_domain)/}); - $r->print(&Apache::loncommon::start_page('Content Library',$js, - {'domain' => $headerdom,})); + + if ($env{'form.catalogmode'}) { + # "Popup mode" + $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() + ); + } + # ---------------------------------- get state of file types to be showing if ($env{'form.only'}) { $typeselect = $env{'form.only'}; @@ -420,7 +439,7 @@ ENDHEADER # ---------------------------------- get state of file attributes to be showing if ($env{'form.attrs'}) { - for (my $i=0; $i<=14; $i++) { + for (my $i=0; $i<=16; $i++) { delete $hash{'display_attrs_'.$i}; if ($env{'form.attr'.$i} == 1) { $attrchk[$i] = 'checked'; @@ -428,8 +447,8 @@ ENDHEADER } } } else { - for (my $i=0; $i<=14; $i++) { - $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; + for (my $i=0; $i<=16; $i++) { + $attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1; } } @@ -448,6 +467,8 @@ ENDHEADER 'nt' => 'Notes', 'ab' => 'Abstract', 'ln' => 'Language', + 'gl' => 'Grade Level', + 'sd' => 'Standards', 'sa' => 'Source Available', 'sr' => 'Show resource', 'li' => 'Linked/Related Resources', @@ -459,31 +480,33 @@ ENDHEADER 'hd' => 'Display Options' ); $r->print(<
$lt{'hd'} -
- + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + +
 
 
@@ -495,19 +518,20 @@ END $select_file_categories{''} = &mt('All file types'); foreach my $cat (@file_categories) { my $types = join(",",&Apache::loncommon::filecategorytypes($cat)); - $select_file_categories{$types} = $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); + &Apache::loncommon::select_form( + $typeselect, + 'only', + %select_file_categories); $type_element = ''; $r->print($type_element .'
'); $r->print(< $closebutton $groupimportbutton @@ -519,15 +543,25 @@ 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 { @@ -541,15 +575,14 @@ 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 #$r->print(&initdebug()); #$r->print(&writedebug("Omit:@Omit")) if (@Omit); #$r->print(&writedebug("Only:@Only")) if (@Only); - $r->print('

'); - $r->print(&Apache::loncommon::start_data_table("LC_tableOfContent") + $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes") .&Apache::loncommon::start_data_table_header_row()); $r->print("".&mt('Name')."\n"); $r->print("".&mt('Title')."\n") @@ -581,6 +614,10 @@ END if ($hash{'display_attrs_13'} == 1); $r->print("".&mt("Abstract")."\n") if ($hash{'display_attrs_14'} == 1); + $r->print("".&mt("Grade Level")."\n") + if ($hash{'display_attrs_15'} == 1); + $r->print("".&mt("Standards")."\n") + if ($hash{'display_attrs_16'} == 1); $r->print(&Apache::loncommon::end_data_table_header_row()); @@ -850,7 +887,7 @@ sub display_line { my $tabtag=''; my $i=0; - while ($i<=14) { + while ($i<=16) { $tabtag=join('',$tabtag," ") if ($i != 9 && $hash{'display_attrs_'.$i} == 1); @@ -871,24 +908,23 @@ sub display_line { $r->print("\n"); $r->print (''."\n"); $r->print(&Apache::loncommon::inhibit_menu_check('input')); - $r->print (''."\n"); $r->print (''."\n"); - $r->print ('print (' name="'.$msg.'" type="image" class="LC_icon" />'. + $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'. "\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])); } + 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 #SB if ($absolute) { $fileclr='#ccdd99'; } @@ -906,16 +942,16 @@ sub display_line { $anchor =~ s/\W//g; $r->print (''); $r->print (''); - $r->print ('print (' name="'.$msg.'" type="image" class="LC_icon" />'. + $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 (' 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"); @@ -936,15 +972,15 @@ $r->print (''."\n"); $r->print (''); - $r->print (''); + $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + '.gif" class="LC_fileicon"'); + $r->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.''); @@ -984,17 +1020,17 @@ $r->print ('"); $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"}) { @@ -1011,8 +1047,8 @@ $r->print ('\n"); + $r->print(''); $count++; } # Sequence open/close icon @@ -1022,14 +1058,14 @@ $r->print (''); $r->print (''); - $r->print (''); + $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_icon" />'. + '.gif" class="LC_fileicon"'); + $r->print (' alt="'.$msg.'" />'. "\n"); } # Filetype icons - $r->print("\"\"\n"); + $r->print("\"\"\n"); my $quotable_filelink = &Apache::loncommon::escape_single($filelink); $r->print (" print ('\n"); + $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); @@ -1081,17 +1117,13 @@ $r->print ('"); - &dynmetaprint($r,$filelink,'count'); - &dynmetaprint($r,$filelink,'course'); - &dynmetaprint($r,$filelink,'stdno'); - &dynmetaprint($r,$filelink,'avetries'); - &dynmetaprint($r,$filelink,'difficulty'); - &dynmetaprint($r,$filelink,'disc'); - &dynmetaprint($r,$filelink,'clear'); - &dynmetaprint($r,$filelink,'technical'); - &dynmetaprint($r,$filelink,'correct'); - &dynmetaprint($r,$filelink,'helpful'); - &dynmetaprint($r,$filelink,'depth'); + + for (qw(count course stdno avetries difficulty disc clear technical + correct helpful depth)) { + + dynmetaprint($r,$filelink,$_); + } + $r->print(" \n"); } @@ -1114,11 +1146,9 @@ $r->print (''.($output eq '' ? ' ':$output). " \n"); } @@ -1149,6 +1179,18 @@ $r->print ('\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()); } @@ -1167,15 +1209,15 @@ $r->print ('\n"); + $r->print (''); $count++; } $r->print (''); $r->print (''); - $r->print ('print (' name="'.$msg.'" class="LC_icon" />'. + $r->print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); @@ -1183,7 +1225,7 @@ $r->print ('print ('' - .''.&mt('Open Folder').''. "\n"); $r->print ("$listname\n"); @@ -1252,6 +1294,19 @@ $r->print ('\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()); } @@ -1277,8 +1332,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); @@ -1301,7 +1360,6 @@ sub showpreview { close(FH); } } - $output=''.$output.''; } elsif ($embstyle eq 'img') { $output=''.&mt('Preview').''; } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) { @@ -1332,7 +1390,7 @@ sub begin_form { $uri=&Apache::loncommon::escape_single($uri); $r->print ('
'."\n"); $r->print (''.