[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm

[raeburn]

raeburn		Fri Jul  7 21:51:10 2006 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  Bug 4903.  Also portfolio path prepended to path to file in "Allowing access to file  .." title for screens used to enter additional access control and also confirmation screen.  
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.132 loncom/interface/portfolio.pm:1.133
--- loncom/interface/portfolio.pm:1.132	Fri Jul  7 21:20:40 2006
+++ loncom/interface/portfolio.pm	Fri Jul  7 21:51:07 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.132 2006/07/08 01:20:40 raeburn Exp $
+# $Id: portfolio.pm,v 1.133 2006/07/08 01:51:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -534,7 +534,7 @@
 }
 
 sub display_access {
-    my ($r,$url,$group,$can_setacl) = @_;
+    my ($r,$url,$group,$can_setacl,$port_path) = @_;
     my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name,$group);
@@ -542,7 +542,7 @@
                                                                         $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);
-    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
     if ($can_setacl) {
         &open_form($r,$url);
@@ -698,7 +698,7 @@
 
 
 sub update_access {
-    my ($r,$url,$group) = @_;
+    my ($r,$url,$group,$port_path) = @_;
     my $totalprocessed = 0;
     my %processing;
     my %title  = (
@@ -724,7 +724,7 @@
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
-              $file_name).'</h3>'."\n");
+              $port_path.$file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name,$group);
     my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -820,7 +820,10 @@
         }
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
                   '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
-                   &mt('Display all access settings for this file').'</a>');
+                   &mt('Display all access settings for this file').'</a>'.
+                  '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.
+                  '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
+                  $group_arg.'">'.&mt('Return to directory listing').'</a>');
     }
     return;
 }
@@ -1774,6 +1777,7 @@
         $can_setacl = 1;
     }
 
+    my $port_path = &get_port_path($group);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -1851,10 +1855,10 @@
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
         $env{'form.action'} = 'chgaccess';
-        &display_access($r,$url,$group,$can_setacl);
+        &display_access($r,$url,$group,$can_setacl,$port_path);
     } elsif ($env{'form.action'} eq 'chgaccess') {
         if ($can_setacl) {
-            &update_access($r,$url,$group);
+            &update_access($r,$url,$group,$port_path);
         } else {
             &missing_priv($r,$url,'setacl',$group);
         }