Diff for /loncom/interface/portfolio.pm between versions 1.121 and 1.121.2.1

version 1.121, 2006/06/26 22:23:27 version 1.121.2.1, 2006/06/27 15:38:08
Line 526  sub display_access { Line 526  sub display_access {
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);      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]',$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>';      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) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
Line 973  sub access_setting_table { Line 986  sub access_setting_table {
               $passwd.'" /></td>');                $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
     $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');  
     &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);      #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
     $r->print('</td><td>&nbsp;</td><td valign="top">');      #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
     &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);      #$r->print('</td><td>&nbsp;</td><td valign="top">');
     $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');      #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
     if (@courses > 0 || @groups > 0) {      #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
         $r->print('<td colspan="3" valign="top">');      #if (@courses > 0 || @groups > 0) {
     } else {      #    $r->print('<td colspan="3" valign="top">');
         $r->print('<td valign="top">');      #} else {
     }      #    $r->print('<td valign="top">');
     &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);      #}
     $r->print('</td>');      #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
     if (@courses > 0 || @groups > 0) {      #$r->print('</td>');
         $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');      #if (@courses > 0 || @groups > 0) {
     } else {      #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
         $r->print('<td>&nbsp;</td><td valign="top">');      #} else {
     }      #    $r->print('<td>&nbsp;</td><td valign="top">');
     &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);      #}
       #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   

Removed from v.1.121  
changed lines
  Added in v.1.121.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>