Diff for /loncom/interface/portfolio.pm between versions 1.112 and 1.113

version 1.112, 2006/06/22 15:56:03 version 1.113, 2006/06/22 16:51:00
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 border="0" cellspacing="2" cellpadding="2">
   <form method="post" enctype="multipart/form-data">    <tr valign="middle">
     <tr valign="middle">      <td bgcolor="#ccddaa" align="right">
       <td bgcolor="#ccddaa" align="right">        $text{'upload_label'}
         $text{'upload_label'}      </td>
       </td>      <td bgcolor="#ccddaa" align="left">$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>
     <tr>      <td bgcolor="#ccddaa" align="right">
       <td bgcolor="#ccddaa" align="right">        $text{'createdir_label'}
         $text{'createdir_label'}      </td>
       </td>      <td bgcolor="#ccddaa" align="left">
       <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);
Line 108  TABLE Line 109  TABLE
     }      }
     $r->print('</font>');      $r->print('</font>');
     &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('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.          $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>');              '<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.'">');  
     } else {      } else {
           $r->print('<form method="post" action="'.$url.'">');
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.          $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>');              '<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.'">');  
     }      }
     if (defined($group)) {      if (defined($group)) {
         $r->print("\n".$groupitem."\n");          $r->print("\n".$groupitem."\n");
Line 190  sub display_directory { Line 191  sub display_directory {
     if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {      if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');                      $r->print('<tr bgcolor="#FFAA99"><td><img alt="'.&mt('open folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 } else {                  } else {
                     $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');                      $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><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>'); 
Line 256  sub display_directory { Line 257  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>');
Line 693  sub update_access { Line 694  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 1277  sub select_files { Line 1278  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.'";';

Removed from v.1.112  
changed lines
  Added in v.1.113


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