Diff for /loncom/interface/londocs.pm between versions 1.121 and 1.123

version 1.121, 2004/04/26 16:56:26 version 1.123, 2004/05/06 17:55:03
Line 301  sub editor { Line 301  sub editor {
   
 # ---------------- if they are for this folder and user allowed to make changes  # ---------------- if they are for this folder and user allowed to make changes
  if (($allowed) && ($ENV{'form.folder'} eq $folder)) {   if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
 # set parameters  # set parameters and change order
     if (defined($ENV{'form.setparms'})) {      if (defined($ENV{'form.setparms'})) {
  my $idx=$ENV{'form.setparms'};   my $idx=$ENV{'form.setparms'};
   # set parameters
  if ($ENV{'form.randpick_'.$idx}) {   if ($ENV{'form.randpick_'.$idx}) {
     &Apache::lonratedt::storeparameter($idx,'randompick',$ENV{'form.randpick_'.$idx},'int_pos');      &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
  } else {   } else {
     &Apache::lonratedt::delparameter($idx,'randompick');      &Apache::lonratedt::delparameter($idx,'parameter_randompick');
  }   }
  if ($ENV{'form.hidprs_'.$idx}) {   if ($ENV{'form.hidprs_'.$idx}) {
     &Apache::lonratedt::storeparameter($idx,'hiddenresource','yes','string_yesno');      &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
  } else {   } else {
     &Apache::lonratedt::delparameter($idx,'hiddenresource');      &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
  }   }
  if ($ENV{'form.encprs_'.$idx}) {   if ($ENV{'form.encprs_'.$idx}) {
     &Apache::lonratedt::storeparameter($idx,'encrypturl','yes','string_yesno');      &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
  } else {   } else {
     &Apache::lonratedt::delparameter($idx,'encrypturl');      &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
  }   }
   
  ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');   ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
Line 325  sub editor { Line 326  sub editor {
     $r->print('<p><font color="red">'.$errtext.'</font></p>');      $r->print('<p><font color="red">'.$errtext.'</font></p>');
     return;      return;
  }   }
    if ($ENV{'form.newpos'}) {
   # change order
   
       my $newpos=$ENV{'form.newpos'}-1;
       $r->print('Sorting '.$idx.' -> '.$newpos);
       ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
       if ($fatal) {
    $r->print('<p><font color="red">'.$errtext.'</font></p>');
    return;
       }
   
    }
          
   
     }      }
 # upload a file, if present  # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&             if (($ENV{'form.uploaddoc.filename'}) &&
Line 463  sub entryline { Line 478  sub entryline {
      &Apache::lonnet::unescape($title)),'"<>&\'');       &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;      my $renametitle=$title;
     my $foldertitle=$title;      my $foldertitle=$title;
       my $orderidx=$Apache::lonratedt::order[$index];
     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) {       if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) { 
  $foldertitle=&Apache::lontexconvert::msgtexconverted($4);   $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
  $renametitle=$4;   $renametitle=$4;
Line 479  sub entryline { Line 495  sub entryline {
  # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');   # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     }      }
     if ($allowed) {      if ($allowed) {
    my $incindex=$index+1;
    my $selectbox='';
    if ($folder!~/^supplemental/) {
       $selectbox=
    '<select name="newpos" onChange="this.form.submit()">';
       for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
    if ($i==$incindex) {
       $selectbox.='<option value="" selected="1">('.$i.')</option>';
    } else {
       $selectbox.='<option value="'.$i.'">'.$i.'</option>';
    }
       }
       $selectbox.='</select>';
    }
  my %lt=&Apache::lonlocal::texthash(   my %lt=&Apache::lonlocal::texthash(
                 'up' => 'Move Up',                  'up' => 'Move Up',
  'dw' => 'Move Down',   'dw' => 'Move Down',
Line 487  sub entryline { Line 517  sub entryline {
  $line.=(<<END);   $line.=(<<END);
 <form name="entry_$index" action="/adm/coursedocs" method="post">  <form name="entry_$index" action="/adm/coursedocs" method="post">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="setparms" value="$index" />  <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>  <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>  <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
Line 495  sub entryline { Line 525  sub entryline {
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>  <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>  <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td><td bgcolor="#DDDDDD">  </table></td>
   <td>$selectbox
   </td><td bgcolor="#DDDDDD">
 <a href='javascript:removeres("$folderpath","$index","$renametitle");'>  <a href='javascript:removeres("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>  <font size="-2" color="#990000">$lt{'rm'}</font></a>
 <a href='javascript:changename("$folderpath","$index","$renametitle");'>  <a href='javascript:changename("$folderpath","$index","$renametitle");'>
Line 538  END Line 570  END
  $folderpath.=$folderarg.'&'.$foldername;   $folderpath.=$folderarg.'&'.$foldername;
  $url.='folderpath='.&Apache::lonnet::escape($folderpath);   $url.='folderpath='.&Apache::lonnet::escape($folderpath);
  $parameterset=&mt('Randomly Pick: ').   $parameterset=&mt('Randomly Pick: ').
     '<input type="text" size="4" name="randpick_'.$index.'" value="'.      '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
     &Apache::lonratedt::getparameter($index,'randompick').'" />';      (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
     }      }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
  '" border="0"></a></td>'.   '" border="0"></a></td>'.
Line 549  END Line 581  END
        'hd' => 'Hidden',         'hd' => 'Hidden',
        'ec' => 'URL hidden',         'ec' => 'URL hidden',
        'sp' => 'Store Parameters');         'sp' => 'Store Parameters');
    my $enctext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
    my $hidtext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
  $line.=(<<ENDPARMS);   $line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>  <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="checkbox" name="hidprs_$index" /> $lt{'hd'}</td>  <input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
 <td bgcolor="#BBBBFF"><font size='-2'>  <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="checkbox" name="encprs_$index" /> $lt{'ec'}</td>  <input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>  <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 <td bgcolor="#BBBBFF"><font size='-2'>  <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="submit" value="$lt{'sp'}" />  <input type="submit" value="$lt{'sp'}" />

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


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