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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.60 and 1.65

version 1.60, 2004/06/07 22:34:12 version 1.65, 2004/11/08 22:42:20
Line 38  use Apache::loncommon(); Line 38  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsg;  use Apache::lonmsg;
   use Apache::lonmenu;
   use Apache::lonnet;
   
 sub handler {  sub handler {
   
Line 89  sub handler { Line 91  sub handler {
   my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);    my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
   
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.    &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
     if ($ENV{'environment.remote'} eq 'off') {
         &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
                                                  # browse/upload + new file page.
     }
     &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
   
     my $numdir = 0;
     my $numres = 0;
       
   # Start off the directory table.    # Start off the directory table.
     $r->print('<h3>Directory Contents:</h3>');
   $r->print('<table border="0" cellspacing="2" cellpadding="2">'.    $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.
     '<tr><th>&nbsp;</th><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.              '<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.
     &mt('Title').'</th>'.              '<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.
     '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified').              '<th bgcolor="#DDDDDD">'.&mt('Name').'</th>'.
               '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.
       '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.
               '<th bgcolor="#DDDDDD">'.&mt('Last Modified').
     '</th></tr>');      '</th></tr>');
   
   my $filename;    my $filename;
Line 112  sub handler { Line 125  sub handler {
      my $extension='';       my $extension='';
      if ($filename=~/\.(\w+)$/) { $extension=$1; }       if ($filename=~/\.(\w+)$/) { $extension=$1; }
      if ($cmode&$dirptr) {       if ($cmode&$dirptr) {
  putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs);   putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
      } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {       } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
  putresource($r, $uname, $filename, $thisdisfn, $resdir,    putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, 
      $targetdir, $linkdir, $cmtime,\%bombs);       $targetdir, $linkdir, $cmtime,\%bombs,\$numres);
      } else {       } else {
  # "hidden" extension and not a directory, so hide it away.   # "hidden" extension and not a directory, so hide it away.
      }       }
Line 173  sub getEffectiveUrl { Line 186  sub getEffectiveUrl {
   
 sub startpage {  sub startpage {
     my ($r, $uname, $udom, $thisdisfn) = @_;      my ($r, $uname, $udom, $thisdisfn) = @_;
           my $currdir = '/priv/'.$uname.$thisdisfn;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
       
     $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');      $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
       
     $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1));      my $pagetitle; 
       my $formaction='/priv/'.$uname.'/'.$thisdisfn;
       $formaction=~s/\/+/\//g;
       $pagetitle .= ('<form name="dirs" method="post" action="'.$formaction
                 .'" target="_parent">'.
           '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'.
           &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'top','/priv','','-1').
           &Apache::lonhtmlcommon::select_recent('construct','recent',
                    'this.form.action=this.form.recent.value;this.form.submit()').
                 '</form>');
        &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
       if ($ENV{'environment.remote'} eq 'off') {
    $ENV{'request.noversionuri'}=$currdir;
    $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
       } else {
    $r->print($pagetitle);
       }
       $r->print(&Apache::loncommon::help_open_menu('','','','',3,'Authoring'));
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);      my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script>  <script>
 // Store directory location for menu bar to find  // Store directory location for menu bar to find
Line 188  parent.lastknownpriv='/~$uname/$thisdisf Line 218  parent.lastknownpriv='/~$uname/$thisdisf
   
 // Confirmation dialogues  // Confirmation dialogues
   
       function currdiract(theform) {
           if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
               document.publishdir.filename.value = theform.filename.value
               pubdir(document.publishdir)
           }
           if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publishsub') {
               document.publishdir.filename.value = theform.filename.value
               pubrecdir(document.publishdir)
           }
           if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
               window.location=theform.filename.value+'default.meta'
           }
           if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
               document.printdir.postdata.value=theform.filename.value
               document.printdir.submit();
           }
       }
     
     function pubdir(theform) {      function pubdir(theform) {
  if (confirm('Publish complete directory?')) {   if (confirm('Publish complete directory?')) {
               forcepub(theform)
     theform.submit();      theform.submit();
         }          }
     }      }
    function pubrecdir(theform) {      function pubrecdir(theform) {
  if (confirm('Publish directory and all subdirectories?')) {   if (confirm('Publish directory and all subdirectories?')) {
               forcepub(theform);
             theform.pubrec.value='1';              theform.pubrec.value='1';
     theform.submit();      theform.submit();
         }          }
     }      }
   
       function forcepub(theform) {
           if (confirm('Force publication of unmodified files? - OK=yes; Cancel=No.')) {
               theform.forcerepub.value="ON";
           } 
       }
   
       function checkUpload(theform) {
           if (theform.file == '') {
               alert("Please use 'Browse..' to choose a file first, before uploading")
               return 
           }
           theform.submit()  
       }
   
       function SetPubDir(theform,printForm) {
           if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
               window.location = theform.filename.value
               return
           }
           if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
               pubdir(theform)
           }
           if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") {
               pubrecdir(theform)
           }
           if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
               window.location=theform.filename.value+'default.meta'
           }
           if (theform.diraction.options[theform.diraction.selectedIndex].value == "print") {
               theform.action = '/adm/printout'
               theform.postdata.value = theform.filename.value
               theform.submit()
           }
           return
       }
       function SetResChoice(theform) {
         var activity = theform.reschoice.options[theform.reschoice.selectedIndex].value
         if ((activity == 'rename') || (activity == 'copy') || (activity == 'move')) {
             changename(theform,activity)
         }
         if (activity == 'publish') {
             var pubform = document.pubresource
             pubform.filename.value = theform.filename.value
             pubform.submit()
         }
         if (activity == 'delete') {
             var delform = document.delresource
             delform.filename.value = theform.filename.value
             if (confirm("Are you sure you want to delete "+theform.filename.value+"?")) {
                 delform.submit()
             }
         }
         if (activity == 'obsolete') {
             alert("Mark as obsolete - still to be implemented") 
         }
         if (activity == 'print') {
             document.printresource.postdata = theform.filename.value
             document.printresource.curseed = getcurseed()
             document.printresource.problemtype = getproblemtype()
             document.printresource.submit()
         }
         if (activity == 'retrieve') {
             retrieveres.filename.value = theform.filename.value
             retrieveres.submit()
         }
         return
       }
       function changename(theform,activity) {
           var newname=prompt('New Name');
           if (newname == "" || !newname)  {
               return
           }
           document.moveresource.newfilename.value = newname
           document.moveresource.filename.value = theform.filename.value
           document.moveresource.action.value = activity
           document.moveresource.submit();
       }
   
       function getcurseed() {
         if (parent.document.lonhomework
              &&
             parent.document.lonhomework.rndseed
              &&
             parent.document.lonhomework.rndseed.value) {
                 return parent.document.lonhomework.rndseed.value;
         }
         return 0;
       }
                                                                                                         
       function getproblemtype() {
           if (parent.document.lonhomework) {
               var optionelement;
               var valueIndex=0;
               for (var optionIndex=0;
                   optionIndex < parent.document.lonhomework.problemtype.options.length;
                   optionIndex++)
               {
                   optionElement=parent.document.lonhomework.problemtype.options[optionIndex];
                   if (optionElement.selected) {
                       return optionElement.value;
                   }
               }
           }
           return 0;
       }
 </script>  </script>
 ENDPUBDIRSCRIPT  ENDPUBDIRSCRIPT
       $r->print($pubdirscript);
   
     $r->print('<h2>'.&mt('Construction Space Directory').'</h2>'.  
       '<script type="text/javascript">top.document.title = \''.  
       $thisdisfn.'/ - LON-CAPA Construction Space\';</script>'.  
       $pubdirscript.  
               '<form method="post" action="/adm/publish" target="_parent">'.  
               '<table><tr><td><input type="hidden" name="filename" value="/~'.  
                $uname.$thisdisfn.'/" />'.  
               '<input type="button" onClick="pubdir(this.form);" value="'.  
 &mt('Publish Directory').'" />'.  
               '<input type="hidden" name="pubrec" value="" />'.  
               '<input type="button" onClick="pubrecdir(this.form);" value="'.  
 &mt('Publish Directory and Sub Directories').'" /></td><td>'.  
 '<input type="button" onClick="window.location='."'/~".  
                $uname.$thisdisfn."/default.meta'".'" value="'.  
 &mt('Edit Directory Catalog Information').'" /></td></tr><tr><td><input type="checkbox" name="forcerepub" /> '.&mt('Force publication of unmodified files').'.</td><td>&nbsp;</td></tr></table></form>');  
       
     if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {      if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
  $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.   $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
   '</h3>');    '</h3>');
     }      }
     my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/';  }
     $formaction=~s/\/+/\//g;  
     $r->print('<form name="dirs" method="post" action="'.$formaction  sub dircontrols {
       .'" target="_top">'.      my ($r,$uname,$udom,$thisdisfn) = @_;
       &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').      $r->print(<<END);
       &Apache::lonhtmlcommon::select_recent('construct','recent',          <table cellspacing="4" cellpadding="4" width="100%">
          'this.form.action=this.form.recent.value;this.form.submit()').           <tr>
       '</form>');            <th bgcolor="#DDDDDD">Actions for current directory</th>
     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);            <th bgcolor="#DDDDDD">Upload a new document</th>
             <th bgcolor="#DDDDDD">Create a new directory or LON-CAPA document</th>
           </tr>
           <tr>
            <td bgcolor="#ccddaa" valign="top" align="center">
             <form name="curractions" method="post" action="">
              <select name="dirtask" onChange="currdiract(this.form)">
               <option>Select action</option>
               <option value="publish">Publish directory</option>
               <option value="publishsub">Publish with subdirectories</option>
               <option value="editcat">Edit catalog information</option>
               <option value="printdir">Print contents of directory</option>
              </select>
              <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
             </form>
             <form name="publishdir" method="post" action="/adm/publish" target="_parent">
              <input type="hidden" name="pubrec" value="" />
              <input type="hidden" name="filename" value="" />
              <input type="hidden" name="forcerepub" value="NO" />
             </form>
             <form name="printdir" method="post" action="/adm/printout" target="_parent">
              <input type="hidden" name="postdata" value="" />
              <input type="hidden" name="curseed" value="0" />
              <input type="hidden" name="problemtype" value="0" />
             </form>
            </td>
            <td bgcolor="#ccddaa" valign="top" align="center">
       <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
         <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
         <input type="file" name="upfile" size="20" />
         <input type="button" value="Upload file"  onclick="checkUpload(this.form)" />
       </form>
    </td>
    <td bgcolor="#ccddaa" align="center">
       <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
         <nobr>
    <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
     <select name="action">
       <option>Select action</option>
       <option value="newfile">New file:</option>
       <option value="newhtmlfile">New HTML file:</option>
       <option value="newproblemfile">New problem:</option>
                       <option value="newpagefile">New assembled page:</option>
                       <option value="newsequencefile">New assembled sequence:</option>
                       <option value="newrightsfile">New custom rights file:</option>
                       <option value="newstyfile">New style file:</option>
       <option value="newdir">New subdirectory:</option>
     </select>&nbsp;<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onclick="document.fileaction.submit()" />
    </nobr>
    </form>
     </td>
            </tr>
           </table>
           <br />
           <br />
   END
   }
   
   sub resourceactions {
       my ($r,$uname,$udom,$thisdisfn) = @_;
       $r->print(<<END);
          <form name="moveresource" action="/adm/cfile" target="_parent" method="post">
            <input type="hidden" name="filename" value="" />
            <input type="hidden" name="newfilename" value="" />
            <input type="hidden" name="action" value="" />
          </form>
          <form name="delresource" action="/adm/cfile" target="_parent" method="post">
            <input type="hidden" name="filename" value="" />
            <input type="hidden" name="action" value="delete" />
          </form>
          <form name="pubresource" action="/adm/publish" target="_parent" method="post">
            <input type="hidden" name="pubrec" value="" />
            <input type="hidden" name="filename" value="" />
            <input type="hidden" name="forcerepub" value="NO" />
          </form>
          <form name="printresource" action="/adm/printout" target="_parent" method="post">
              <input type="hidden" name="postdata" value="" />
              <input type="hidden" name="curseed" value="" />
              <input type="hidden" name="problemtype" value="" />
          </form>
          <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
              <input type="hidden" name="filename" value="" />
          </form>
   END
 }  }
   
 #  #
Line 256  sub getCopyRightString { Line 480  sub getCopyRightString {
     my $fullname = shift;      my $fullname = shift;
     return &Apache::lonnet::metadata($fullname, 'copyright');      return &Apache::lonnet::metadata($fullname, 'copyright');
 }  }
   
   sub getSourceRightString {
       my $fullname = shift;
       return &Apache::lonnet::metadata($fullname, 'sourceavail');
   }
 #  #
 #  Put out a directory table row:  #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)  #    putdirectory(r, base, here, dirname, modtime)
Line 266  sub getCopyRightString { Line 495  sub getCopyRightString {
 #      modtime - Encoded modification time.  #      modtime - Encoded modification time.
 #   # 
 sub putdirectory {  sub putdirectory {
     my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs) = @_;      my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;
     
     # construct the display filename: the directory name unless ..:      # construct the display filename: the directory name unless ..:
           
     my $disfilename = $dirname;      my $disfilename = $dirname;
     if ($dirname eq '..') {      if ($dirname eq '..') {
  $disfilename = '<i>'.&mt('Parent Directory').'</i>';   $disfilename = '<i>'.&mt('Parent Directory').'</i>';
     }      }
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||      unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) {
     ($dirname eq '.')) {  
  my $kaputt=0;   my $kaputt=0;
  foreach (keys %{$bombs}) {   foreach (keys %{$bombs}) {
     if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }      if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
Line 287  sub putdirectory { Line 514  sub putdirectory {
  &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(   &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
         $construct.'/'.$dirname.'/default.meta'          $construct.'/'.$dirname.'/default.meta'
  ));   ));
           my $actionitem = '';
           if ($dirname eq '..') {
               $actionitem = 'Go to ...';
           } else {
               $actionitem = 
                       '<form name="dirselect_'.$$numdir.
                       '" action="/adm/publish" target="_parent">'.
                       '<select name="diraction" onChange="SetPubDir(this.form,document)">'.
                         '<option selected="selected">'.&mt('Select action').'</option>'.
                         '<option value="open">'.&mt('Open').'</option>'.
                         '<option value="publish">'.&mt('Publish').'</option>'.
                         '<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.
                         '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
                         '<option value="printdir">'.&mt('Print directory').
                       '</select>'.
                        '<input type="hidden" name="filename" value="'.$here.'/'.$dirname.'" />'.
                        '<input type="hidden" name="pubrec" value="" />'.
                        '<input type="hidden" name="forcerepub" value="" />'.
                        '<input type="hidden" name="curseed" value="0" />'.
                        '<input type="hidden" name="problemtype" value="0" />'.
                        '<input type="hidden" name="postdata" value="" />'.
                      '</form>';
               $$numdir ++;
           }
  $r->print('<tr bgcolor="#CCCCFF">'.   $r->print('<tr bgcolor="#CCCCFF">'.
   '<td><img src="'.    '<td><img src="'.
   $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.    $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
   '<td>'.&mt('Go to ...').'</td>'.    '<td>'.$actionitem.'</td>'.
   '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.    '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.
   $disfilename.'</a></font></td>'.    $disfilename.'</a></font></td>'.
         '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.          '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
   $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.    $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
   $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.    $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
   '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.    '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
   "</tr>\n");    "</tr>\n");
     }      }
     return OK;      return OK;
 }  }
 #  #
 #   Put a table row for a file resource.  #   Put a table row for a file resource.
 #  #
 sub putresource {  sub putresource {
     my ($r, $uname, $filename, $thisdisfn,       my ($r, $udom, $uname, $filename, $thisdisfn, 
  $resdir, $targetdir, $linkdir,   $resdir, $targetdir, $linkdir,
  $cmtime,$bombs) = @_;   $cmtime,$bombs,$numres) = @_;
       my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');      my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';      my $bgcolor='#FFAA99';
     my $title='&nbsp;';      my $title='&nbsp;';
     my $publish_button=&mt('Publish');      my $publish_button=&mt('Publish');
   #    my $action_buttons=
   #        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
   # $uname.'/'.$thisdisfn.'/'.$filename.'">'.
   # &mt('Delete').'</a>';
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
  my ($rdev,$rino,$rmode,$rnlink,   my ($rdev,$rino,$rmode,$rnlink,
     $ruid,$rgid,$rrdev,$rsize,      $ruid,$rgid,$rrdev,$rsize,
     $ratime,$rmtime,$rctime,      $ratime,$rmtime,$rctime,
     $rblksize,$rblocks)=stat($resdir.'/'.$filename);      $rblksize,$rblocks)=stat($resdir.'/'.$filename);
  $publish_button=&mt('Re-Publish');   $publish_button=&mt('Re-publish');
  if ($rmtime>=$cmtime) {   if ($rmtime>=$cmtime) {
               $pubstatus = 'published';
     $status=&mt('Published').'<br />'.      $status=&mt('Published').'<br />'.
  &mt(&getCopyRightString($targetdir.'/'.$filename));   &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
    &mt(&getSourceRightString($targetdir.'/'.$filename));
     $bgcolor='#CCFF88';      $bgcolor='#CCFF88';
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                   $pubstatus = 'obsolete';
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';                  $bgcolor='#AAAAAA';
     }              }
   #    } else {
   # $action_buttons='';
   #    }
     $title='<a href="/res/'.$targetdir.'/'.$filename.      $title='<a href="/res/'.$targetdir.'/'.$filename.
  '.meta" target=cat>'.   '.meta" target=cat>'.
  &getTitleString($targetdir.'/'.$filename).'</a>';   &getTitleString($targetdir.'/'.$filename).'</a>';
  } else {   } else {
               $pubstatus = 'modified';
     $status=&mt('Modified').'<br />'.      $status=&mt('Modified').'<br />'.
  &mt(&getCopyRightString($targetdir.'/'.$filename));   &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
    &mt(&getSourceRightString($targetdir.'/'.$filename));
             $bgcolor='#FFFF77';              $bgcolor='#FFFF77';
   #    $action_buttons='';
     $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.      $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
  &getTitleString($targetdir.'/'.$filename).'</a>';   &getTitleString($targetdir.'/'.$filename).'</a>';
     if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {      if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
Line 345  sub putresource { Line 609  sub putresource {
  $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.    $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
     ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';      ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
  $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.   $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';      $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }      }
     my $editlink='';      my $editlink='';
     my $editlink2='';      my $editlink2='';
     if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {      if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
  $editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';   $editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('Edit').'</a>)';
     }      }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {      if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
  $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';   $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';
  $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';   $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
     }      }
     if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {      if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
  $editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.   $editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';        $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
     }      }
       my $pub_select = '';
       &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
     $r->print('<tr bgcolor="'.$bgcolor.'">'.      $r->print('<tr bgcolor="'.$bgcolor.'">'.
       '<td>'.($filename=~/[\#\~]$/?'&nbsp;':        '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
       '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').        '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
       '<td><a target="_parent" href="/adm/publish?filename=/~'.                '<td>'.$pub_select.'</td>'.
       $uname.$thisdisfn.'/'.$filename.'">'.$publish_button.'</a>'.  
       '</td>'.  
       '<td><font face="arial">'.        '<td><font face="arial">'.
       '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.        '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
                $filename.'</a></font>'.$editlink2.$editlink.                 $filename.'</a></font>'.$editlink2.$editlink.
       '</td>'.        '</td>'.
       '<td>'.$title.'</td>'.        '<td>'.$title.'</td>'.
Line 376  sub putresource { Line 640  sub putresource {
       "</tr>\n");        "</tr>\n");
     return OK;      return OK;
 }  }
   
   sub create_pubselect {
       my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
       $$pub_select = '
   <form name="resselect_'.$$numres.'" action="">
   <select name="reschoice"  onChange="SetResChoice(this.form)">
   <option>'.&mt('Select action').
   '<option value="rename"/>'.&mt('Rename').
   '<option value="move"/>'.&mt('Move').
   '<option value="copy"/>'.&mt('Copy').
   '<option value="publish"/>'.$publish_button;
       if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
           $$pub_select .= '
   <option value="delete"/>'.&mt('Delete');
       } else {
           $$pub_select .= '
   <option value="obsolete"/>'.&mt('Mark obsolete');
       }
       $$pub_select .= '
   <option value="print"/>'.&mt('Print');
   
   # check for versions
       my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);
       if ($versions > 0) {
           $$pub_select .='
   <option value="retrieve"/>'.&mt('Retrieve old version');
       }
       $$pub_select .= '
   </select>
   <input type="hidden" name="filename" value="/~'.
    $uname.'/'.$thisdisfn.'/'.$filename.'"></form>';
       $$numres ++;
   }
   
   sub check_for_versions {
       my ($r,$fn,$udom,$uname) = @_;
       my $versions = 0;
       my $docroot=$r->dir_config('lonDocRoot');
       my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;
       my $resdir=$resfn;
       $resdir=~s/\/[^\/]+$/\//;
       $fn=~/\/([^\/]+)\.(\w+)$/;
       my $main=$1;
       my $suffix=$2;
       opendir(DIR,$resdir);
       while (my $filename=readdir(DIR)) {
           if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
               $versions ++;        
           }
       }
       return $versions;
   }
   
 #  #
 #   Categorize files in the directory.  #   Categorize files in the directory.
 #   For each file in a list of files in a file directory,   #   For each file in a list of files in a file directory, 
Removed from v.1.60  
changed lines
  Added in v.1.65

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