);
+ $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);
$r->print("");
- $r->print("".
+ $r->print("".
"\n");
- $r->print(" | ");
- } elsif ($env{'form.catalogmode'} eq 'groupimport') {
- $r->print(" | ');
+ } elsif ($env{'form.catalogmode'} eq 'import') {
+ $r->print(" | ");
+ $r->print(' | ');
$hash{"pre_${fnum}_link"}=$filelink;
+ $hash{"pre_${fnum}_title"}=$title;
+ if (!$hash{"pre_${fnum}_title"}) {
+ $hash{"pre_${fnum}_title"} = 'Not_retrieved';
+ }
$fnum++;
}
# Form to open or close sequences
if ($filelink=~/\.(page|sequence)$/) {
my $curdir = $startdir.$filecom[0].'/';
- my $anchor = $curdir;
- $anchor =~ s/\///g;
&begin_form($r,$curdir);
$indent--;
}
# General indentation
- if ($indent > 0 and $indent < 11) {
- $r->print("\n");
+ if ($indent > 0 and $indent < 12) {
+ $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");
+ $r->print("\n");
$count++;
}
- $r->print("\n") if $rem > 0;
+ $r->print("\n") if $rem > 0;
}
# Sequence open/close icon
if ($filelink=~/\.(page|sequence)$/) {
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
- $anchor =~ s/\///g;
+ $anchor =~ s/\W//g;
$r->print ('');
- $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+ $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");
}
# Filetype icons
- $r->print("\n");
+ $r->print("\n");
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
-
$r->print (" $listname ");
-
+ "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".
+ " target=\"_self\">$listname ");
+ $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+ &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
$r->print (" (metadata) ");
+ "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
+ " target=\"_self\">".&mt('metadata').") ");
# Close form to open/close sequence
if ($filelink=~/\.(page|sequence)$/) {
$r->print('');
}
- $r->print(" | \n");
+ $r->print("\n");
if ($hash{'display_attrs_0'} == 1) {
- my $title = &Apache::lonnet::gettitle($filelink,'title');
$r->print(' '.($title eq '' ? ' ' : $title).
' | '."\n");
}
- $r->print(' ',
+ $r->print(' | ',
$filecom[8]," | \n")
if $hash{'display_attrs_1'} == 1;
$r->print(' '.
- (localtime($filecom[9]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[9]))." \n")
if $hash{'display_attrs_2'} == 1;
$r->print(' '.
- (localtime($filecom[10]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[10]))." \n")
if $hash{'display_attrs_3'} == 1;
if ($hash{'display_attrs_4'} == 1) {
@@ -1002,7 +1067,6 @@ sub display_line {
$r->print(' '.($keywords eq '' ? ' ' : $keywords).
" | \n");
}
-#'
if ($hash{'display_attrs_6'} == 1) {
my $lang = &Apache::lonnet::metadata($filelink,'language');
@@ -1033,10 +1097,11 @@ sub display_line {
if($source eq 'open') {
my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+ &Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink);
$r->print(''."Yes "." | \n");
+ "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
+ " target=\"_self\">".&mt('Source Code')." "."\n");
} else { #A cuddled else. :P
$r->print(" | \n");
}
@@ -1045,6 +1110,7 @@ sub display_line {
# links
&dynmetaread($filelink);
$r->print('');
+ &coursecontext($r,$filelink);
&dynmetaprint($r,$filelink,'goto_list');
&dynmetaprint($r,$filelink,'comefrom_list');
&dynmetaprint($r,$filelink,'sequsage_list');
@@ -1052,65 +1118,82 @@ sub display_line {
&dynmetaprint($r,$filelink,'course_list');
$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).
" | \n");
- }
- $r->print("
\n");
}
+
+ if ($hash{'display_attrs_12'} == 1) {
+ my $subject = &Apache::lonnet::metadata($filelink,'subject');
+ # $keywords = ' ' if (!$keywords);
+ $r->print('');
+ $r->print($extrafield.'');
&begin_form ($r,$curdir);
my $indentm1 = $indent-1;
- if ($indentm1 < 11 and $indentm1 > 0) {
- $r->print("\n");
+ if ($indentm1 < 12 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");
+ $r->print ("\n");
$count++;
}
- $r->print ("\n") if $rem > 0;
+ $r->print ("\n") if $rem > 0;
}
$r->print ('');
- $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+ $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
$r->print (''.
+ .$quotable_curdir.'\')">'
+ .''.
"\n");
- $r->print ("$listname | \n");
+ $r->print ("$listname\n");
# Attributes
my $filelink = $startdir.$filecom[0].'/default';
if ($hash{'display_attrs_0'} == 1) {
- my $title = &Apache::lonnet::gettitle($filelink,'title');
+ my $title = &Apache::lonnet::gettitle($filelink);
$r->print(' '.($title eq '' ? ' ' : $title).
' | '."\n");
}
- $r->print(' ',
+ $r->print(' | ',
$filecom[8]," | \n")
if $hash{'display_attrs_1'} == 1;
$r->print(' '.
- (localtime($filecom[9]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[9]))." \n")
if $hash{'display_attrs_2'} == 1;
$r->print(' '.
- (localtime($filecom[10]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[10]))." \n")
if $hash{'display_attrs_3'} == 1;
if ($hash{'display_attrs_4'} == 1) {
@@ -1130,25 +1213,47 @@ sub display_line {
$r->print(' '.($lang eq '' ? ' ' : $lang).
" | \n");
}
+
if ($hash{'display_attrs_8'} == 1) {
$r->print(' | ');
}
if ($hash{'display_attrs_10'} == 1) {
$r->print(' | ');
}
- if ($hash{'display_attrs_11'} == 1) {
- $r->print(' | ');
- }
if ($hash{'display_attrs_7'} == 1) {
$r->print(' | ');
- }
- $r->print('
');
+ }
+ if ($hash{'display_attrs_11'} == 1) {
+ $r->print('