[BACK]Return to portfolio.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/portfolio.pm between versions 1.109 and 1.117

version 1.109, 2006/06/22 15:33:35 version 1.117, 2006/06/22 19:11:13
Line 31  use Apache::lonfeedback; Line 31  use Apache::lonfeedback;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::longroup;  use Apache::longroup;
 use lib '/home/httpd/lib/perl';  use HTML::Entities;
 use LONCAPA;  use LONCAPA;
   
 # receives a file name and path stub from username/userfiles/portfolio/  # receives a file name and path stub from username/userfiles/portfolio/
Line 40  sub make_anchor { Line 40  sub make_anchor {
     my ($url, $filename, $current_path, $current_mode, $field_name,      my ($url, $filename, $current_path, $current_mode, $field_name,
         $continue_select,$group) = @_;          $continue_select,$group) = @_;
     if ($continue_select ne 'true') {$continue_select = 'false'};      if ($continue_select ne 'true') {$continue_select = 'false'};
     my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name;      my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;
     if (defined($group)) {      if (defined($group)) {
         $anchor .= '&group='.$group;          $anchor .= '&amp;group='.$group;
     }      }
     $anchor .= '">'.$filename.'</a>';      $anchor .= '">'.$filename.'</a>';
     return $anchor;      return $anchor;
Line 63  sub display_common { Line 63  sub display_common {
  'createdir' => 'Create Subdirectory',   'createdir' => 'Create Subdirectory',
  'createdir_label' =>    'createdir_label' => 
  'Create subdirectory in current directory:');   'Create subdirectory in current directory:');
       my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
     $r->print(<<"TABLE");       $r->print(<<"TABLE"); 
 <table border="0" cellspacing="2" cellpadding="2">  <table id="LC_portfolio_actions">
   <form method="post" enctype="multipart/form-data">    <tr id="LC_portfolio_upload">
     <tr valign="middle">      <td class="LC_label">
       <td bgcolor="#ccddaa" align="right">        $text{'upload_label'}
         $text{'upload_label'}      </td>
       </td>      <td class="LC_value">$groupitem
       <td bgcolor="#ccddaa" align="left">$groupitem        <form method="post" enctype="multipart/form-data" action="$escuri">
         <input name="uploaddoc" type="file" />          <input name="uploaddoc" type="file" />
  <input type="hidden" name="currentpath" value="$current_path" />   <input type="hidden" name="currentpath" value="$current_path" />
  <input type="hidden" name="action" value="$env{"form.action"}" />   <input type="hidden" name="action" value="$env{"form.action"}" />
  <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />   <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
  <input type="hidden" name="mode" value="$env{"form.mode"}" />   <input type="hidden" name="mode" value="$env{"form.mode"}" />
  <input type="submit" name="storeupl" value="$text{'upload'}" />   <input type="submit" name="storeupl" value="$text{'upload'}" />
       </td>        </form>
     </tr>      </td>
   </form>    </tr>
   <form method="post">    <tr id="LC_portfolio_createdir">
     <tr>      <td class="LC_label">
       <td bgcolor="#ccddaa" align="right">        $text{'createdir_label'}
         $text{'createdir_label'}      </td>
       </td>      <td class="LC_value">
       <td bgcolor="#ccddaa" align="left">        <form method="post" action="$escuri">
         <input name="newdir" type="input" />$groupitem          <input name="newdir" type="input" />$groupitem
         <input type="hidden" name="currentpath" value="$current_path" />          <input type="hidden" name="currentpath" value="$current_path" />
         <input type="hidden" name="action" value="$env{"form.action"}" />          <input type="hidden" name="action" value="$env{"form.action"}" />
         <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />          <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
         <input type="hidden" name="mode" value="$env{"form.mode"}" />          <input type="hidden" name="mode" value="$env{"form.mode"}" />
         <input type="submit" name="createdir" value="$text{'createdir'}" />          <input type="submit" name="createdir" value="$text{'createdir'}" />
       </td>        </form>
     </tr>      </td>
   </form>    </tr>
 </table>  </table>
 TABLE  TABLE
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     $r->print('<font size="+2">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');      $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '';          my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){          for (my $i = 1; $i< @tree; $i++){
Line 106  TABLE Line 107  TABLE
             $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');              $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
         }          }
     }      }
     $r->print('</font>');      $r->print('</span>');
     &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
     $r->print('<br /><form method=post action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});      $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"});
     if (defined($group)) {      if (defined($group)) {
         $r->print('&group='.$group);          $r->print('&amp;group='.$group);
     }      }
     $r->print('">'.      $r->print('">'.
       &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',        &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
Line 153  sub display_directory { Line 154  sub display_directory {
  return;   return;
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.  
             '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');  
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');          $r->print('<form method="post" name="checkselect" action="'.$url.'">');
           $r->print('<table class="LC_browser">'.
               '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {      } else {
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.  
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');  
         $r->print('<form method="post" action="'.$url.'">');          $r->print('<form method="post" action="'.$url.'">');
           $r->print('<table class="LC_browser">'.
               '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }      }
     if (defined($group)) {      if (defined($group)) {
         $r->print("\n".$groupitem."\n");          $r->print("\n".$groupitem."\n");
Line 189  sub display_directory { Line 190  sub display_directory {
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);          my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {      if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
    my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');      undef($colspan);
                 } else {  
                     $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');  
                 }                  }
    $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');                   $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');   my $css_class = 'LC_browser_file';
    my $line;
                 my $version_flag;                  my $version_flag;
                 if (exists($versioned{$fname})) {                  if (exists($versioned{$fname})) {
                    $version_flag = "*";                     $version_flag = "*";
Line 208  sub display_directory { Line 210  sub display_directory {
                my $fullpath = $current_path.$filename;                 my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);                  $fullpath = &prepend_group($fullpath,$group);
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
                     $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"');                      $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
                     if ($$checked_files{$filename} eq 'selected') {      if ($$checked_files{$filename} eq 'selected') {
                         $r->print("CHECKED");                          $line.=" checked ";
                     }                      }
                     $r->print('></td>');      $line.=' /></td>';
                 } else {                  } else {
                     if (exists $locked_files{$fullpath}) {                      if (exists $locked_files{$fullpath}) {
                         $r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');                          $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>';
    $css_class= 'LC_browser_file_locked';
                     } else {                      } else {
  my $cat='<img alt="'.&mt('Catalog Information').   my $cat='<img alt="'.&mt('Catalog Information').
     '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';      '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />                          $line.='<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>                              <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>
                             <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>                              <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
                             </td>');                              </td>';
                     }                      }
       $r->print('<tr class="'.$css_class.'">');
       $r->print($line);
                 }                  }
                 my $curr_access;                  my $curr_access;
                 my $pub_access = 0;                  my $pub_access = 0;
Line 256  sub display_directory { Line 261  sub display_directory {
                     }                      }
                     $curr_access = join('+ ',@allaccesses);                      $curr_access = join('+ ',@allaccesses);
                 }                  }
                 $r->print('<td><img src="'.&Apache::loncommon::icon($filename).'"></td>');                  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.                  $r->print('<td><a href="'.$href_location.$filename.'">'.
     $filename.'</a></td>');       $filename.'</a></td>'); 
                 $r->print('<td>'.$size.'</td>');                  $r->print('<td>'.$size.'</td>');
                 $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');                  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
                 $r->print('<td><nobr>'.&mt($curr_access).'&nbsp;&nbsp;&nbsp;'.                  $r->print('<td><span style="white-space: nowrap">'.&mt($curr_access).'&nbsp;&nbsp;&nbsp;'.
                           '<a href="'.$url.'?access='.$filename.                            '<a href="'.$url.'?access='.$filename.
                           '&amp;currentpath='.$current_path.$groupecho.                            '&amp;currentpath='.$current_path.$groupecho.
                           '">'.&mt('View/Change').'</a></nobr></td>');                            '">'.&mt('View/Change').'</a></span></td>');
                 $r->print('</tr>');                   $r->print('</tr>'); 
             }              }
         }          }
Line 316  sub close_form { Line 321  sub close_form {
               $group.'" />');                $group.'" />');
     }      }
     $r->print('</p></form>');      $r->print('</p></form>');
     $r->print('<form action="'.$url.'" method="POST">      $r->print('<form action="'.$url.'" method="post">
                <p>                 <p>
               <input type="hidden" name="currentpath" value="'.                <input type="hidden" name="currentpath" value="'.
       $env{'form.currentpath'}.'" />');        $env{'form.currentpath'}.'" />');
Line 331  sub close_form { Line 336  sub close_form {
 sub display_file {  sub display_file {
     my ($path,$filename)=@_;      my ($path,$filename)=@_;
     my $display_file_text;      my $display_file_text;
       my $file_start='<span class="LC_filename">';
       my $file_end='</span>';
     if (!defined($path)) { $path=$env{'form.currentpath'}; }      if (!defined($path)) { $path=$env{'form.currentpath'}; }
     if (!defined($filename)) {       if (!defined($filename)) { 
         $filename=$env{'form.selectfile'};          $filename=$env{'form.selectfile'};
         $display_file_text = '<tt>'.$path.$filename.'</tt>';          $display_file_text = $file_start.$path.$filename.$file_end;
     } elsif (ref($filename) eq "ARRAY") {      } elsif (ref($filename) eq "ARRAY") {
         foreach (@$filename) {          foreach my $file (@$filename) {
             $display_file_text .= '<tt>'.$path.$_.'</tt><br />';              $display_file_text .= $file_start.$path.$file.$file_end.'<br />';
         }          }
     } elsif (ref($filename) eq "SCALAR") {      } elsif (ref($filename) eq "SCALAR") {
         $display_file_text = '<tt>'.$path.$filename.'</tt>';                  $display_file_text = $file_start.$path.$$filename.$file_end;
       } else {
    $display_file_text = $file_start.$path.$filename.$file_end;
     }      }
     return $display_file_text;      return $display_file_text;
 }  }
Line 394  sub delete_confirmed { Line 403  sub delete_confirmed {
        $env{'form.currentpath'}.         $env{'form.currentpath'}.
        $delete_file);         $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
  $r->print('<font color="red"> An error occured ('.$result.   $r->print('<span class="LC_error"> An error occured ('.$result.
   ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');    ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
         }          }
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group));
Line 419  sub delete_dir_confirmed { Line 428  sub delete_dir_confirmed {
        $directory_name);         $directory_name);
                 
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An error occured (dir) ('.$result.   $r->print('<span class="LC_error"> An error occured (dir) ('.$result.
   ') while trying to delete '.$directory_name.'</font><br />');    ') while trying to delete '.$directory_name.'</span><br />');
     } else {      } else {
         # now remove from recent          # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');  #        $r->print('<br /> removing '.$directory_name.'<br /');
Line 459  sub rename_confirmed { Line 468  sub rename_confirmed {
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path($group);      my $port_path = &get_port_path($group);
     if ($filenewname eq '') {      if ($filenewname eq '') {
  $r->print('<font color="red">'.   $r->print('<span class="LC_error">'.
   &mt("Error: no valid filename was provided to rename to.").    &mt("Error: no valid filename was provided to rename to.").
   '</font><br />');    '</span><br />');
  $r->print(&done(undef,$url,$group));   $r->print(&done(undef,$url,$group));
  return;   return;
     }       } 
Line 470  sub rename_confirmed { Line 479  sub rename_confirmed {
             $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},              $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
             $port_path.$env{'form.currentpath'}.$filenewname);              $port_path.$env{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An errror occured ('.$result.   $r->print('<span class="LC_error">'.
   ') while trying to rename '.&display_file().' to '.    &mt('An errror occured ([_1]) while trying to rename [_2]'
   &display_file(undef,$filenewname).'</font><br />');        .' to [_3]',$result,&display_file(),
         &display_file('',$filenewname)).'</span><br />');
     }      }
     if ($filenewname ne $env{'form.filenewname'}) {      if ($filenewname ne $env{'form.filenewname'}) {
         $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");          $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
         '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
         '<strong>'.&display_file('',$filenewname).'</strong>'));
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group));
 }  }
Line 547  sub update_access { Line 559  sub update_access {
             my $updated_controls = $access_controls{$file_name};              my $updated_controls = $access_controls{$file_name};
             my ($showstart,$showend);              my ($showstart,$showend);
             $r->print(&Apache::loncommon::start_data_table());              $r->print(&Apache::loncommon::start_data_table());
             $r->print(&Apache::loncommon::start_data_table_row());              $r->print(&Apache::loncommon::start_data_table_header_row());
             $r->print('<th>'.&mt('Type of change').'</th><th>'.              $r->print('<th>'.&mt('Type of change').'</th><th>'.
                       &mt('Access control').'</th><th>'.&mt('Dates available').                        &mt('Access control').'</th><th>'.&mt('Dates available').
                       '</th><th>'.&mt('Additional information').'</th>');                        '</th><th>'.&mt('Additional information').'</th>');
             $r->print(&Apache::loncommon::end_data_table_row());              $r->print(&Apache::loncommon::end_data_table_header_row());
             foreach my $chg (sort(keys(%processing))) {              foreach my $chg (sort(keys(%processing))) {
                 if (@{$processing{$chg}} > 0) {                  if (@{$processing{$chg}} > 0) {
                     if ($chg eq 'delete') {                      if ($chg eq 'delete') {
                         if (!($deloutcome eq 'ok')) {                          if (!($deloutcome eq 'ok')) {
                             $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);                              $errors .='<span class="LC_error">'.
    &mt('A problem occurred deleting access controls: [_1]',$deloutcome).
    '</span>';
                             next;                              next;
                         }                          }
                     }                      }
Line 658  sub update_access { Line 672  sub update_access {
             $r->print(&Apache::loncommon::end_data_table());              $r->print(&Apache::loncommon::end_data_table());
         } else {          } else {
             if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {              if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
                 $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome);                  $errors .= '<span class="LC_error">'.
       &mt('A problem occurred storing access control settings: [_1]',$outcome).
       '</span>';
             }              }
         }          }
         if ($errors) {           if ($errors) { 
Line 693  sub update_access { Line 709  sub update_access {
         &close_form($r,$url,$group);          &close_form($r,$url,$group);
     } else {      } else {
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.          $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
                   '&currentpath='.$env{'form.currentpath'}.'">'.                    '&amp;currentpath='.$env{'form.currentpath'}.'">'.
                    &mt('Display all access settings for this file').'</a>');                     &mt('Display all access settings for this file').'</a>');
     }      }
     return;      return;
Line 830  sub access_setting_table { Line 846  sub access_setting_table {
     $r->print('<table border="0"><tr><td valign="top">');      $r->print('<table border="0"><tr><td valign="top">');
     $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');      $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_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>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_header_row());
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
     if ($public) {      if ($public) {
         $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.          $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
Line 846  sub access_setting_table { Line 862  sub access_setting_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('Password-protected access:').' '.$guesttext.'</h3>');      $r->print('<h3>'.&mt('Password-protected access:').' '.$guesttext.'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_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').
               '</th><th>'. &mt('Password').'</th>');                '</th><th>'. &mt('Password').'</th>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_header_row());
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
     my $passwd;      my $passwd;
     if ($guest) {      if ($guest) {
Line 926  sub display_access_row { Line 942  sub display_access_row {
         my $uctype = $type;          my $uctype = $type;
         $uctype =~ s/^(\w)/uc($1)/e;          $uctype =~ s/^(\w)/uc($1)/e;
         $r->print(&Apache::loncommon::start_data_table());          $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_row());          $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</td><th>'.          $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
               &mt('Dates available').'</th>');                &mt('Dates available').'</th>');
         if (($type eq 'course') || ($type eq 'group')) {          if (($type eq 'course') || ($type eq 'group')) {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).              $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
Line 938  sub display_access_row { Line 954  sub display_access_row {
         } elsif ($type eq 'domains') {          } elsif ($type eq 'domains') {
             @all_doms = &Apache::loncommon::get_domains();              @all_doms = &Apache::loncommon::get_domains();
         }          }
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_header_row());
    $r->print(&Apache::loncommon::start_data_table_row());
         foreach my $key (@{$items}) {          foreach my $key (@{$items}) {
             if (($type eq 'course') || ($type eq 'group')) {              if (($type eq 'course') || ($type eq 'group')) {
                 &course_row($r,$status,$type,$key,$access_controls,                  &course_row($r,$status,$type,$key,$access_controls,
Line 951  sub display_access_row { Line 968  sub display_access_row {
             }              }
         }          }
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
         $r->print(&Apache::loncommon::start_data_table_row());  
         if ($status eq 'old') {          if ($status eq 'old') {
       $r->print(&Apache::loncommon::start_data_table_row());
             $r->print('<td colspan="',$colspan.'">'.&additional_item($type).              $r->print('<td colspan="',$colspan.'">'.&additional_item($type).
                       '</td>');                        '</td>');
       $r->print(&Apache::loncommon::end_data_table_row());
         }          }
         $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
     } else {      } else {
Line 964  sub display_access_row { Line 982  sub display_access_row {
     return;      return;
 }  }
   
 sub course_row {  sub course_js {
     my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;      return qq|
     my %content;  
     my $defdom = $env{'user.domain'};  
     if ($status eq 'old') {  
         $defdom =  $$access_controls{$item}{'domain'};   
     }  
     $r->print(&Apache::loncommon::coursebrowser_javascript($defdom));  
     $r->print(qq|  
 <script type="text/javascript">  <script type="text/javascript">
 function setRoleOptions(caller,num,cdom,cnum,type) {  function setRoleOptions(caller,num,cdom,cnum,type) {
     addIndexnum = getCallerIndex(caller);      addIndexnum = getCallerIndex(caller);
Line 1011  function getIndex(name,value) { Line 1022  function getIndex(name,value) {
 }  }
   
 </script>  </script>
 |);  |;
     $r->print(&Apache::loncommon::start_data_table_row());  }
   
   sub course_row {
       my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
       my $content;
       my $defdom = $env{'user.domain'};
       if ($status eq 'old') {
           $content = $$access_controls{$item}; 
           $defdom =  $content->{'domain'};
       }
       my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
    .&course_js();
     my $crsgrptext = 'Groups';      my $crsgrptext = 'Groups';
     if ($type eq 'group') {      if ($type eq 'group') {
         $crsgrptext = 'Teams';          $crsgrptext = 'Teams';
     }      }
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     $type);                                                      $type);
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td>');      $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
     if ($status eq 'old') {      if ($status eq 'old') {
         my $cid = $content{'domain'}.'_'.$content{'number'};          my $cid = $content->{'domain'}.'_'.$content->{'number'};
         my %course_description = &Apache::lonnet::coursedescription($cid);          my %course_description = &Apache::lonnet::coursedescription($cid);
         $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content{'number'}.'" />'.$course_description{'description'}.'</td>');          $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
     } elsif ($status eq 'new') {      } elsif ($status eq 'new') {
         my $uctype = $type;          my $uctype = $type;
         $uctype =~ s/^(\w)/uc($1)/e;          $uctype =~ s/^(\w)/uc($1)/e;
Line 1036  function getIndex(name,value) { Line 1058  function getIndex(name,value) {
               &mt($crsgrptext).'</th></tr>');                &mt($crsgrptext).'</th></tr>');
     if ($status eq 'old') {      if ($status eq 'old') {
         my $max_id = 0;          my $max_id = 0;
         foreach my $role_id (sort(keys(%{$content{'roles'}}))) {          foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
             if ($role_id > $max_id) {              if ($role_id > $max_id) {
                 $max_id = $role_id;                  $max_id = $role_id;
             }              }
             $max_id ++;              $max_id ++;
             my $role_selects = &role_selectors($num,$role_id,$status,$type,\%content,'display');              my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display');
             $r->print('<tr><td><nobr><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></nobr><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');              $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
         }          }
         $r->print('</table><br />'.&mt('Add a roles-based condition').'&nbsp;<input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content{domain}','$content{number}','Course'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');          $r->print('</table><br />'.&mt('Add a roles-based condition').'&nbsp;<input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content->{'domain'}','$content->{'number'}','Course'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
     } elsif ($status eq 'new') {      } elsif ($status eq 'new') {
         my $role_id = 1;          my $role_id = 1;
         my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');          my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
         $r->print('<tr><td><input type="checkbox" name="add_role_'.$num.'" value="'.$role_id.'" checked="checked" />'.&mt('Add').'<input type="hidden" name="grplist_'.$num.'_'.$role_id.'" /></td>'.$role_selects);          $r->print('<tr><td><input type="checkbox" name="add_role_'.$num.'" value="'.$role_id.'" checked="checked" />'.&mt('Add').'<input type="hidden" name="grplist_'.$num.'_'.$role_id.'" /></td>'.$role_selects);
         $r->print('</tr></table></td>');          $r->print('</tr></table></td>');
     }      }
     $r->print(&Apache::loncommon::end_data_table_row());  
     return;      return;
 }  }
   
 sub domains_row {  sub domains_row {
     my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;      my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
     $r->print(&Apache::loncommon::start_data_table_row());  
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     'domains');                                                      'domains');
     my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true"/>'.      my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true">'.
                      ' <option value="">'.&mt('Please select').'</option>';                       ' <option value="">'.&mt('Please select').'</option>';
     $r->print(&Apache::loncommon::start_data_table_row());  
     if ($status eq 'old') {      if ($status eq 'old') {
         my $content =  $$access_controls{$item};          my $content =  $$access_controls{$item};
  foreach my $dom (@{$all_doms}) {   foreach my $dom (@{$all_doms}) {
Line 1079  sub domains_row { Line 1098  sub domains_row {
             $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';              $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
         }          }
     }      }
       $dom_select .= '</select>';
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.$dom_select.      $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.$dom_select.
               '</td><td>'.&dateboxes($num,$start,$end).'</td>');                '</td><td>'.&dateboxes($num,$start,$end).'</td>');
     $r->print(&Apache::loncommon::end_data_table_row());  
     $r->print(&Apache::loncommon::start_data_table_row());  
 }  }
   
 sub users_row {  sub users_row {
     my ($r,$status,$item,$access_controls,$now,$then) = @_;      my ($r,$status,$item,$access_controls,$now,$then) = @_;
     $r->print(&Apache::loncommon::start_data_table_row());  
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     'users');                                                      'users');
     my $curr_user_list;      my $curr_user_list;
Line 1096  sub users_row { Line 1113  sub users_row {
         $curr_user_list = &sort_users($content->{'users'});          $curr_user_list = &sort_users($content->{'users'});
     }      }
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc  ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30"  rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');      $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc  ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30"  rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');
     $r->print(&Apache::loncommon::end_data_table_row());  
 }  }
   
 sub additional_item {  sub additional_item {
Line 1107  sub additional_item { Line 1123  sub additional_item {
   
 sub actionbox {  sub actionbox {
     my ($status,$num,$scope) = @_;      my ($status,$num,$scope) = @_;
     my $output = '<nobr><label>';      my $output = '<span style="white-space: nowrap"><label>';
     if ($status eq 'new') {      if ($status eq 'new') {
         $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.          $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.
         &mt('Activate');          &mt('Activate');
     } else {      } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.          $output .= '<input type="checkbox" name="delete" value="'.$num.
                    '" />'.&mt('Delete').'</label><br /><nobr>'.                     '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.
                    '<label><input type="checkbox" name="update" value="'.                     '<label><input type="checkbox" name="update" value="'.
                    $num.'" />'.&mt('Update');                     $num.'" />'.&mt('Update');
     }      }
     $output .= '</label></nobr><input type="hidden" name="scope_'.$num.                '" value="'.$scope.'" />';      $output .= '</label></span><input type="hidden" name="scope_'.$num.                '" value="'.$scope.'" />';
     return $output;      return $output;
 }  }
                                                                                                                                                                         
Line 1132  sub dateboxes { Line 1148  sub dateboxes {
                             undef,undef,1);                              undef,undef,1);
     my $enddate = &Apache::lonhtmlcommon::date_setter('portform',      my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
                                'enddate_'.$num,$end,undef,undef,undef,1,undef,                                 'enddate_'.$num,$end,undef,undef,undef,1,undef,
                                 undef,undef,1). '&nbsp;&nbsp;<nobr><label>'.                                  undef,undef,1). '&nbsp;&nbsp;<span style="white-space: nowrap"><label>'.
                                 '<input type="checkbox" name="noend_'.                                  '<input type="checkbox" name="noend_'.
                                 $num.'" '.$noend.' />'.&mt('No end date').                                  $num.'" '.$noend.' />'.&mt('No end date').
                                 '</label></nobr>';                                  '</label></span>';
                                                                                                                                                                         
     my $output = &mt('Start: ').$startdate.'<br />'.&mt('End: ').$enddate;      my $output = &mt('Start: ').$startdate.'<br />'.&mt('End: ').$enddate;
     return $output;      return $output;
Line 1278  sub select_files { Line 1294  sub select_files {
         $java_files.=',';          $java_files.=',';
     }      }
     my $javascript =(<<ENDSMP);      my $javascript =(<<ENDSMP);
         <script language='javascript'>          <script type="text/javascript">
         function finishSelect() {          function finishSelect() {
 ENDSMP  ENDSMP
     $javascript .= 'fileList = "'.$java_files.'";';      $javascript .= 'fileList = "'.$java_files.'";';
Line 1338  sub upload { Line 1354  sub upload {
     }      }
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);      my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.'.          $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');                    '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
         $r->print(&done('Back',$url,$group));          $r->print(&done('Back',$url,$group));
     }       } 
     elsif ($found_file){      elsif ($found_file){
         if ($locked_file){          if ($locked_file){
             $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.              $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');                    '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
             $r->print(&done('Back',$url,$group));                    $r->print(&done('Back',$url,$group));      
         } else {             } else {   
             $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.              $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});                    '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
             $r->print(&done('Back',$url,$group));              $r->print(&done('Back',$url,$group));
         }          }
Line 1356  sub upload { Line 1372  sub upload {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',          my $result=&Apache::lonnet::userfileupload('uploaddoc','',
          $port_path.$env{'form.currentpath'});           $port_path.$env{'form.currentpath'});
         if ($result !~ m|^/uploaded/|) {          if ($result !~ m|^/uploaded/|) {
             $r->print('<font color="red"> An errror occured ('.$result.              $r->print('<span class="LC_error">'.'An errror occured ('.$result.
               ') while trying to upload '.&display_file().'</font><br />');                ') while trying to upload '.&display_file().'</span><br />');
     $r->print(&done('Back',$url,$group));      $r->print(&done('Back',$url,$group));
         } else {          } else {
             $r->print(&done(undef,$url,$group));              $r->print(&done(undef,$url,$group));
Line 1400  sub createdir { Line 1416  sub createdir {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});      my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {      if ($newdir eq '') {
     $r->print('<font color="red">'.      $r->print('<span class="LC_error">'.
       &mt("Error: no directory name was provided.").        &mt("Error: no directory name was provided.").
       '</font><br />');        '</span><br />');
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group));
     return;      return;
     }      }
Line 1416  sub createdir { Line 1432  sub createdir {
         }          }
     }      }
     if ($found_file){      if ($found_file){
        $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.         $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
                ' </strong>a file or directory by that name already exists.</font><br />');                 ' </strong>a file or directory by that name already exists.</span><br />');
     } else {      } else {
         my ($uname,$udom) = &get_name_dom($group);          my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path($group);          my $port_path = &get_port_path($group);
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,          my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
          $port_path.$env{'form.currentpath'}.$newdir);           $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {          if ($result ne 'ok') {
        $r->print('<font color="red"> An errror occured ('.$result.         $r->print('<span class="LC_error">'.'An errror occured ('.$result.
           ') while trying to create a new directory '.&display_file().'</font><br />');            ') while trying to create a new directory '.&display_file().'</span><br />');
         }          }
     }      }
     if ($newdir ne $env{'form.newdir'}) {      if ($newdir ne $env{'form.newdir'}) {
Line 1529  sub handler { Line 1545  sub handler {
                                       $env{'request.course.id'}.'/'.$group))) {                                        $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root($group);                      $portfolio_root = &get_portfolio_root($group);
                 } else {                  } else {
                     $r->print('You do not have the privileges required to access the shared files space for this group');                      $r->print('You do not have the privileges required to access the shared files space for this group.');
                     $earlyout = 1;                      $earlyout = 1;
                 }                  }
             } else {              } else {
Line 1563  sub handler { Line 1579  sub handler {
     }      }
     $r->rflush();      $r->rflush();
  if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){   if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
        $r->print('<font color="red"> No file was selected to upload.'.         $r->print('<span class="LC_error">'.
                'To upload a file, click <strong>Browse...</strong>'.        'No file was selected to upload.'.
                ', select a file, then click <strong>Upload</strong>,</font>');        'To upload a file, click <strong>Browse...</strong>'.
         ', select a file, then click <strong>Upload</strong>.'.
         '</span>');
  }   }
     if ($env{'form.meta'}) {      if ($env{'form.meta'}) {
         &open_form($r,$url);          &open_form($r,$url);
Removed from v.1.109  
changed lines
  Added in v.1.117

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