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

Diff for /loncom/interface/londocs.pm between versions 1.48 and 1.51

version 1.48, 2003/02/07 15:05:37 version 1.51, 2003/04/12 15:56:42
Line 188  sub editor { Line 188  sub editor {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);             my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }             unless ($name) {  $name=(split(/\//,$url))[-1]; }
            unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }             unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed));             $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
            $idx++;             $idx++;
         }          }
         $r->print('</table>');          $r->print('</table>');
Line 198  sub editor { Line 198  sub editor {
 # --------------------------------------------------------------- An entry line  # --------------------------------------------------------------- An entry line
   
 sub entryline {  sub entryline {
     my ($index,$title,$url,$folder,$allowed)=@_;      my ($index,$title,$url,$folder,$allowed,$residx)=@_;
     $title=~s/\&colon\;/\:/g;      $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(      $title=&HTML::Entities::encode(&HTML::Entities::decode(
      &Apache::lonnet::unescape($title)),'\"\<\>\&\'');       &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
Line 249  END Line 249  END
        }          } 
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
       if ($residx) {
          $url.=(($url=~/\?/)?'&':'?').'symb='.
          &Apache::lonnet::escape(&Apache::lonnet::symbclean(
             &Apache::lonnet::declutter('uploaded/'.
              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
              '.sequence').
              '___'.$residx.'___'.
      &Apache::lonnet::declutter($url)));
       }
     if ($isfolder) { $url.='&foldername='.      if ($isfolder) { $url.='&foldername='.
        &Apache::lonnet::escape($foldertitle); }         &Apache::lonnet::escape($foldertitle); }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
Line 472  ENDHEADERS Line 482  ENDHEADERS
     my $script='';      my $script='';
     my $allowed;      my $allowed;
     my $events='';      my $events='';
       my $buttons='';
     my $showdoc=0;      my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername']);         ['folder','foldername']);
Line 490  ENDHEADERS Line 501  ENDHEADERS
        }         }
     } else { # got called in sequence from course      } else { # got called in sequence from course
        $allowed=0;         $allowed=0;
        $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';         $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonxml::loadevents.         $events='onLoad="'.&Apache::lonmenu::loadevents.
            '" onUnload="'.&Apache::lonxml::unloadevents.'"';             '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
          $buttons=&Apache::lonmenu::menubuttons(1,undef);
     }      }
   
 # get course data  # get course data
Line 579  ENDNEWSCRIPT Line 591  ENDNEWSCRIPT
   }    }
 # -------------------------------------------------------------------- Body tag  # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.    $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events));              &Apache::loncommon::bodytag('Course Documents','',$events).
               $buttons);
   unless ($showdoc) {    unless ($showdoc) {
     if ($allowed) {      if ($allowed) {
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',         $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
Line 607  ENDCOURSEVERIFY Line 620  ENDCOURSEVERIFY
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');    ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }         unless ($folder=~/^default/) { $folder='default'; }
          my $postexec='';
          if ($folder eq 'default') {
      $r->print('<script>this.window.name="loncapaclient";</script>');
          } else {
              $postexec='self.close();';
          }
        $hadchanges=0;         $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($hadchanges) {         if ($hadchanges) {
    $r->print('<form method="post" action="/adm/roles">'.     $r->print(
 '<input type=hidden name=orgurl value="/adm/coursedocs" /><input type=hidden name=selectrole value=1 /><h3><font color="red">Changes will become active for your current session after <input type="submit" name="'.  '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 $ENV{'request.role'}.'" value="re-initializing course" />, or the next time you log in.</font></h3></form>');  '<form method="post" action="/adm/roles" target="loncapaclient">'.
   '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
   $ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.</font></h3></form>');
        }         }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';                       '.sequence';
Removed from v.1.48  
changed lines
  Added in v.1.51

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