-
- |
- |
- |
- |
- |
-
-
- |
- |
- |
- |
- |
-
+
+
-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
@@ -519,11 +548,21 @@ 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) {
@@ -541,17 +580,17 @@ 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_tableBrowseRes")
.&Apache::loncommon::start_data_table_header_row());
$r->print("".&mt('Name')." | \n");
+ $r->print(" | \n");
$r->print("".&mt('Title')." | \n")
if ($hash{'display_attrs_0'} == 1);
$r->print(''.&mt("Size")." (".&mt("bytes").") ".
@@ -581,6 +620,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());
@@ -714,6 +757,8 @@ sub scanDir {
sub get_list {
my ($r,$uri)=@_;
my @list=();
+ my $listerror;
+
(my $luri = $uri) =~ s/\//_/g;
if ($env{'form.updatedisplay'}) {
foreach (keys %hash) {
@@ -737,10 +782,20 @@ sub get_list {
$hash{'dirlist_files_'.$luri} = join("\n",@list);
} else {
# is really a directory
- @list = &Apache::lonnet::dirlist($uri);
+ (my $listref,$listerror) = &Apache::lonnet::dirlist($uri);
+ if (ref($listref) eq 'ARRAY') {
+ @list = @{$listref};
+ }
$hash{'dirlist_files_'.$luri} = join("\n",@list);
$hash{'dirlist_timestamp_files_'.$luri} = time;
}
+#Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
+ if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host') || ($listerror eq 'no_host')) {
+ $r->print("" . &mt("Directory does not exist."). "
");
+ } elsif ($listerror eq 'con_lost') {
+ $r->print("" . &mt("Directory temporarily not accessible."). "
");
+ }
+
return @list=&match_ext($r,@list);
}
@@ -850,7 +905,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 +926,23 @@ sub display_line {
$r->print("\n");
$r->print ('$tabtag");
+ $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,8 +960,8 @@ sub display_line {
$anchor =~ s/\W//g;
$r->print ('');
$r->print ('');
- $r->print (' print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
+ $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'.
"\n");
my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
$r->print ('(".&Apache::lonnet::domain($listname,'description').
")");
}
- $r->print("$tabtag");
+ $r->print(" | $tabtag");
$r->print(&Apache::loncommon::end_data_table_row());
return OK;
@@ -936,10 +990,10 @@ $r->print (' '."\n");
$r->print ('');
- $r->print ('');
+ $r->print ('');
$r->print ('print (' name="'.$msg.'"/>'.
+ $r->print (' alt="'.$msg.'"/>'.
"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
$r->print ('print(''.$tabtag);
+# Wishlistlink
+ $r->print(' | '.
+ ' '.$tabtag);
$r->print(&Apache::loncommon::end_data_table_row());
return OK;
}
@@ -984,17 +1043,17 @@ $r->print ('");
$r->print("![\"\"](",$iconpath,"select.gif) ".
"\n");
- $r->print(' | ');
+ $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"}) {
@@ -1011,8 +1070,8 @@ $r->print ('\n");
+ $r->print(' ');
$count++;
}
# Sequence open/close icon
@@ -1022,29 +1081,31 @@ $r->print ('');
$r->print ('');
- $r->print ('');
+ $r->print ('');
$r->print ('print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
+ $r->print (' alt="'.$msg.'" />'.
"\n");
}
# Filetype icons
$r->print(" \n");
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
- $r->print (" $listname ");
+ $r->print (" $listname ");
$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
- $r->print (" (".&mt('metadata').") ");
+ $r->print (" (".&mt('metadata').") ");
# Close form to open/close sequence
if ($filelink=~/\.(page|sequence)$/) {
$r->print('');
}
- $r->print(" | \n");
+ $r->print("\n");
+# Wishlistlink
+ $r->print(''.
+ ' | ');
if ($hash{'display_attrs_0'} == 1) {
$r->print(' '.($title eq '' ? ' ' : $title).
' | '."\n");
@@ -1081,17 +1142,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 +1171,9 @@ $r->print (''.($output eq '' ? ' ':$output).
" \n");
}
@@ -1149,6 +1204,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,26 +1234,32 @@ $r->print ('\n");
+ $r->print ('
');
$count++;
}
$r->print ('');
$r->print ('');
- $r->print ('
print (' name="'.$msg.'" class="LC_fileicon" />'.
+ $r->print (' alt="'.$msg.'" class="LC_fileicon" />'.
"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
- $r->print (''
- .'
'.
- "\n");
- $r->print ("$listname\n");
+ $r->print (''
+ .'
'
+ ."\n");
+ $r->print ("$listname");
+# Wishlistlink
+ $r->print(''.
+ ' | ');
# Attributes
my $filelink = $startdir.$filecom[0].'/default';
@@ -1252,6 +1325,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());
}
@@ -1262,15 +1348,18 @@ sub coursecontext {
my $filesymb=&Apache::lonnet::symbread($filelink);
if ($filesymb) {
my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
- $r->print(&mt('Already in this course:
[_1] in folder/map [_2].
',
- &Apache::lonnet::gettitle($resource),
- &Apache::lonnet::gettitle($map)));
+ $r->print(
+ &mt('Already in this course:').'
'
+ .&mt('[_1] in folder/map [_2]',
+ &Apache::lonnet::gettitle($resource),
+ &Apache::lonnet::gettitle($map))
+ .'
');
}
}
sub showpreview {
my ($filelink)=@_;
- if ($filelink=~m-^(/ext/|http://)-) {
+ if ($filelink=~m-^(/ext/|https?://)-) {
return &mt('External Resource, preview not enabled');
}
my ($curfext)=($filelink=~/\.(\w+)$/);
@@ -1301,7 +1390,6 @@ sub showpreview {
close(FH);
}
}
- $output=''.$output.'';
} elsif ($embstyle eq 'img') {
$output='
';
} elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
@@ -1332,7 +1420,7 @@ sub begin_form {
$uri=&Apache::loncommon::escape_single($uri);
$r->print ('