Diff for /loncom/interface/portfolio.pm between versions 1.186 and 1.187

version 1.186, 2007/07/10 20:51:46 version 1.187, 2008/01/21 11:36:07
Line 99  sub display_common { Line 99  sub display_common {
  my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');   my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
   
  # FIXME: This line should be deleted once Portfolio uses breadcrumbs   # FIXME: This line should be deleted once Portfolio uses breadcrumbs
  $r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));
   
         $r->print(<<"TABLE");           $r->print(<<"TABLE"); 
 <table id="LC_portfolio_actions">  <table id="LC_portfolio_actions">
Line 267  sub display_directory { Line 267  sub display_directory {
     } else {      } else {
         $r->print('<form method="post" action="'.$url.'">');          $r->print('<form method="post" action="'.$url.'">');
  $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',   $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
       'Using the portfolio file list'));        &mt('Using the portfolio file list')));
         $r->print('<table id="LC_browser">'.          $r->print('<table id="LC_browser">'.
   '<tr><th colspan="2">Actions'.                    '<tr>'
   &Apache::loncommon::help_open_topic('Portfolio FileAction').                   .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
   '</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.                   .'<th>&nbsp;</th><th>&nbsp;</th>'
   &Apache::loncommon::help_open_topic('Portfolio OpenFile').                   .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
   '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.                   .'<th>'.&mt('Size').'</th>'
   &Apache::loncommon::help_open_topic('Portfolio ShareFile').                   .'<th>'.&mt('Last Modified').'</th>'
   '</th></tr>');                   .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
                    .'</tr>');
     }      }
     $r->print("\n".&group_form_data()."\n");      $r->print("\n".&group_form_data()."\n");
   
Line 449  sub display_directory { Line 450  sub display_directory {
         $r->print('</table>');          $r->print('</table>');
         if ($can_delete) {          if ($can_delete) {
             $r->print('              $r->print('
         <input type="submit" name="doit" value="Delete Checked Files" />'.          <input type="submit" name="doit" value="'.&mt('Delete Checked Files').'" />'.
  &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'   &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
         <input type="hidden" name="action" value="delete" />          <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />          <input type="hidden" name="currentpath" value="'.$current_path.'" />
Line 564  sub delete_confirmed { Line 565  sub delete_confirmed {
        $env{'form.currentpath'}.         $env{'form.currentpath'}.
        $delete_file);         $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
     $r->print('<span class="LC_error">'.      $r->print('<span class="LC_error">'
                      &mt('An error occurred ([_1]) while trying to delete                         .&mt('An error occurred ([_1]) while trying to delete [_2].'
                          [_2].',$result,&display_file(undef, $delete_file)).                           ,$result,&display_file(undef, $delete_file))
                       '</span><br /><br />');                        .'</span><br /><br />');
         } else {          } else {
             $r->print(&mt('File: [_1] deleted.',              $r->print(&mt('File: [_1] deleted.',
                           &display_file(undef,$delete_file)));                            &display_file(undef,$delete_file)));
Line 774  sub display_access { Line 775  sub display_access {
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
  $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));   $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access')));
  $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings')));
  $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access')));
         &access_setting_table($r,$url,$file_name,$access_controls{$file_name},          &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
                               $action);                                $action);
         my $button_text = {          my $button_text = {
                         'continue' => &mt('Proceed'),                          'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),                          'cancel' => &mt('Back to Directory'),
                       };                        };
         &close_form($r,$url,$button_text);          &close_form($r,$url,$button_text);
     } else {      } else {
Line 1198  sub access_setting_table { Line 1199  sub access_setting_table {
 sub standard_settings {  sub standard_settings {
     my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,      my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
       $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;        $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
     $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');      $r->print('<h3>'.&mt('Public access: [_1]',&mt($publictext)).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
Line 1214  sub standard_settings { Line 1215  sub standard_settings {
     $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><td width="40">&nbsp;</td><td valign="top">');      $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
     $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');      $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',&mt($guesttext)).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
Line 1260  sub standard_settings { Line 1261  sub standard_settings {
             'action' => 'chgconditions',              'action' => 'chgconditions',
             'currentpath' => $env{'form.currentpath'},              'currentpath' => $env{'form.currentpath'},
         );          );
     $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');      $r->print('<h3>'.&mt('Conditional access: [_1]',&mt($conditionstext)).'</h3>');
     if ($numconditionals > 0) {      if ($numconditionals > 0) {
         my $count = 1;          my $count = 1;
         my $chg = 'none';          my $chg = 'none';
Line 1365  sub display_access_row { Line 1366  sub display_access_row {
         }          }
         $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
     } else {      } else {
         $r->print(&mt('No [_1]-based conditions defined.<br />',$type).          $r->print(&mt('No [_1]-based conditions defined.',$type).'<br />'
                   &additional_item($type));                    .&additional_item($type));
     }      }
     return;      return;
 }  }
Line 1955  sub createdir { Line 1956  sub createdir {
     }      }
     if ($found_file){      if ($found_file){
        $r->print('<span class="LC_error">'.&mt('Unable to create a directory named').' <strong>'.$newdir.         $r->print('<span class="LC_error">'.&mt('Unable to create a directory named').' <strong>'.$newdir.
                ' </strong>'.&mt('a file or directory by that name already exists.').'</span><br />');                 '</strong>. '.&mt('A file or directory by that name already exists.').'</span><br />');
     } else {      } else {
         my ($uname,$udom) = &get_name_dom();          my ($uname,$udom) = &get_name_dom();
         my $port_path = &get_port_path();          my $port_path = &get_port_path();
Line 1967  sub createdir { Line 1968  sub createdir {
         }          }
     }      }
     if ($newdir ne $env{'form.newdir'}) {      if ($newdir ne $env{'form.newdir'}) {
         $r->print(&mt("The new directory name was changed from:<br /><strong>").$env{'form.newdir'}."</strong> ".&mt('to')." <strong>$newdir </strong>");            $r->print(&mt("The new directory name was changed from:")."<br /><strong>".$env{'form.newdir'}."</strong> ".&mt('to')." <strong>$newdir </strong>");  
     }      }
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }

Removed from v.1.186  
changed lines
  Added in v.1.187


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