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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.80 and 1.86

version 1.80, 2005/05/19 03:22:04 version 1.86, 2005/07/12 15:55:58
Line 111  sub handler { Line 111  sub handler {
             '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.              '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.
     '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.      '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.
             '<th bgcolor="#DDDDDD">'.&mt('Last Modified').              '<th bgcolor="#DDDDDD">'.&mt('Last Modified').
     '</th></tr>');      '</th></tr>'."\n");
   
   my $filename;    my $filename;
   my $dirptr=16384; # Mask indicating a directory in stat.cmode.    my $dirptr=16384; # Mask indicating a directory in stat.cmode.
Line 290  parent.lastknownpriv='/~$uname$thisdisfn Line 290  parent.lastknownpriv='/~$uname$thisdisfn
           document.retrieveres.filename.value = theform.filename.value            document.retrieveres.filename.value = theform.filename.value
           document.retrieveres.submit()            document.retrieveres.submit()
       }        }
         if (activity == 'cleanup') {
             document.cleanup.filename.value = theform.filename.value
             document.cleanup.submit()
         }
       return        return
     }      }
     function changename(theform,activity) {      function changename(theform,activity) {
Line 315  ENDPUBDIRSCRIPT Line 319  ENDPUBDIRSCRIPT
   
 sub dircontrols {  sub dircontrols {
     my ($r,$uname,$udom,$thisdisfn) = @_;      my ($r,$uname,$udom,$thisdisfn) = @_;
       my %lt=&Apache::lonlocal::texthash(
                                          cnpd => 'Cannot publish directory',
                                          cnrd => 'Cannot retrieve directory',
                                          mcdi => 'Must create new subdirectory inside a directory',
                                          pubr => 'Publish this Resource',
                                          pubd => 'Publish this Directory',
                                          rtrv => 'Retrieve Old Version',
                                          pubs => 'Publish with Subdirectories',
                                          list => 'List Directory',
                                          uplo => 'Upload file',  
                                          dele => 'Delete',
                                          edit => 'Edit Catalog Information', 
                                          sela => 'Select Action',
                                          nfil => 'New file',
                                          nhtm => 'New HTML file',
                                          nprb => 'New problem',
                                          npag => 'New assembled page',
                                          nseq => 'New assembled sequence',
                                          ncrf => 'New custom rights file',
                                          nsty => 'New style file',
                                          nlib => 'New library file',
                                          nsub => 'New subdirectory',
                                          renm => 'Rename current file to',
                                          move => 'Move current file to',
                                          copy => 'Copy current file to',
                                          type => 'Type Name Here',
                                          go => 'Go',
                                          prnt => 'Print contents of directory',
                                          crea => 'Create a new directory or LON-CAPA document',
          acti => 'Actions for current directory',
          updc => 'Upload a new document'
                                         );
     $r->print(<<END);      $r->print(<<END);
         <table cellspacing="4" cellpadding="4" width="100%">          <table cellspacing="4" cellpadding="4" width="100%">
          <tr>           <tr>
           <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Actions for current directory</b></font></td>            <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'acti'}</b></font></td>
           <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</b></font></td>            <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'updc'}</b></font></td>
           <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Create a new directory or LON-CAPA document</b></font></td>            <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'crea'}</b></font></td>
         </tr>          </tr>
         <tr>          <tr>
          <td bgcolor="#ccddaa" valign="top" align="center">           <td bgcolor="#ccddaa" valign="top" align="center">
           <form name="curractions" method="post" action="">            <form name="curractions" method="post" action="">
            <select name="dirtask" onChange="currdiract(this.form)">             <select name="dirtask" onchange="currdiract(this.form)">
             <option>Select action</option>              <option>$lt{'sela'}</option>
             <option value="publish">Publish directory</option>              <option value="publish">$lt{'pubd'}</option>
             <option value="editcat">Edit catalog information</option>              <option value="editcat">$lt{'edit'}</option>
             <option value="printdir">Print contents of directory</option>              <option value="printdir">$lt{'prnt'}</option>
            </select>             </select>
            <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />             <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
           </form>            </form>
Line 345  sub dircontrols { Line 381  sub dircontrols {
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">      <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
       <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />        <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
       <input type="file" name="upfile" size="20" />        <input type="file" name="upfile" size="20" />
       <input type="button" value="Upload file"  onclick="checkUpload(this.form)" />        <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
     </form>      </form>
  </td>   </td>
  <td bgcolor="#ccddaa" align="center">   <td bgcolor="#ccddaa" align="center">
     <form name="fileaction" method="post" action="/adm/cfile" target="_parent">      <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
       <nobr>        <nobr>
  <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />   <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
   <select name="action">    <select name="action">
     <option>Select Action</option>      <option value="Select Action">$lt{'sela'}</option>
     <option value="newfile">New file:</option>      <option value="newfile">$lt{'nfil'}:</option>
     <option value="newhtmlfile">New HTML file:</option>      <option value="newhtmlfile">$lt{'nhtm'}:</option>
     <option value="newproblemfile">New problem:</option>      <option value="newproblemfile">$lt{'nprb'}:</option>
                     <option value="newpagefile">New assembled page:</option>                              <option value="newpagefile">$lt{'npag'}:</option>
                     <option value="newsequencefile">New assembled sequence:</option>                              <option value="newsequencefile">$lt{'nseq'}:</option>
                     <option value="newrightsfile">New custom rights file:</option>                              <option value="newrightsfile">$lt{'ncrf'}:</option>
                     <option value="newstyfile">New style file:</option>                              <option value="newstyfile">$lt{'nsty'}:</option>
     <option value="newdir">New subdirectory:</option>                              <option value="newlibraryfile">$lt{'nlib'}:</option>
       <option value="newdir">$lt{'nsub'}:</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()" />    </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>   </nobr>
  </form>   </form>
Line 377  sub pubbuttons { Line 414  sub pubbuttons {
               '<table><tr><td><input type="hidden" name="filename" value="/~'.                '<table><tr><td><input type="hidden" name="filename" value="/~'.
                $uname.$thisdisfn.'/" />'.                 $uname.$thisdisfn.'/" />'.
               '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.                '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
 '<input type="button" onClick="window.location='."'/~".  '<input type="button" onclick="window.location='."'/~".
                $uname.$thisdisfn."/default.meta'".'" value="'.                 $uname.$thisdisfn."/default.meta'".'" value="'.
 &mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');  &mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
 }  }
Line 404  sub resourceactions { Line 441  sub resourceactions {
        <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">         <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
            <input type="hidden" name="filename" value="" />             <input type="hidden" name="filename" value="" />
        </form>         </form>
          <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
              <input type="hidden" name="filename" value="" />
          </form>
 END  END
 }  }
   
Line 473  sub putdirectory { Line 513  sub putdirectory {
             $actionitem =               $actionitem = 
                     '<form name="dirselect_'.$$numdir.                      '<form name="dirselect_'.$$numdir.
                     '" action="/adm/publish" target="_parent">'.                      '" action="/adm/publish" target="_parent">'.
                     '<select name="diraction" onChange="SetPubDir(this.form,document)">'.                      '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
                       '<option selected="selected">'.&mt('Select action').'</option>'.                        '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.                        '<option value="open">'.&mt('Open').'</option>'.
                       '<option value="publish">'.&mt('Publish').'</option>'.                        '<option value="publish">'.&mt('Publish').'</option>'.
Line 481  sub putdirectory { Line 521  sub putdirectory {
                       '<option value="editcat">'.&mt('Edit catalog information').'</option>'.                        '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
                       '<option value="printdir">'.&mt('Print directory').'</option>'.                        '<option value="printdir">'.&mt('Print directory').'</option>'.
                     '</select>'.                      '</select>'.
                      '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.                       '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
                      '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.                       '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="postdata" value="" />'.                       '<input type="hidden" name="postdata" value="" />'.
                    '</form>';                     '</form>';
Line 489  sub putdirectory { Line 529  sub putdirectory {
         }          }
  $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" alt="folder" /></td>'.
   '<td>'.$actionitem.'</td>'.    '<td>'.$actionitem.'</td>'.
   '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.    '<td><font face="arial"><a href="'.&HTML::Entities::encode($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> '.
Line 508  sub putresource { Line 548  sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn,       my ($r, $udom, $uname, $filename, $thisdisfn, 
  $resdir, $targetdir, $linkdir,   $resdir, $targetdir, $linkdir,
  $cmtime,$bombs,$numres) = @_;   $cmtime,$bombs,$numres) = @_;
       &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
     my $pubstatus = 'unpublished';      my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');      my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';      my $bgcolor='#FFAA99';
Line 556  sub putresource { Line 597  sub putresource {
     }      }
  }   }
  $title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.    $title.="\n".'<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" alt="bomb" />':'Edit Metadata').'</a>';
  $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.   $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';      $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }      }
Line 569  sub putresource { Line 610  sub putresource {
  $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';   $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';
  $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';   $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
     }      }
       if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
    $editlink.=' (<a href="/adm/cleanup?filename=/~'.$uname.
       $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</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>)';
Line 577  sub putresource { Line 622  sub putresource {
     &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);      &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).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.                '<td>'.$pub_select.'</td>'.
       '<td><font face="arial">'.        '<td><font face="arial">'.
       '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.        '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
Line 594  sub create_pubselect { Line 639  sub create_pubselect {
     my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;      my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
     $$pub_select = '      $$pub_select = '
 <form name="resselect_'.$$numres.'" action="">  <form name="resselect_'.$$numres.'" action="">
 <select name="reschoice"  onChange="SetResChoice(this.form)">  <select name="reschoice"  onchange="SetResChoice(this.form)">
 <option>'.&mt('Select action').'</option>'.  <option>'.&mt('Select action').'</option>'.
 '<option value="copy">'.&mt('Copy').'</option>';  '<option value="copy">'.&mt('Copy').'</option>';
     if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {      if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
Line 614  sub create_pubselect { Line 659  sub create_pubselect {
     }      }
     $$pub_select .= '      $$pub_select .= '
 <option value="publish">'.$publish_button.'</option>'.  <option value="publish">'.$publish_button.'</option>'.
   '<option value="cleanup">'.&mt('Clean up').'</option>'.
 '<option value="print">'.&mt('Print').'</option>'.  '<option value="print">'.&mt('Print').'</option>'.
 '</select>  '</select>
 <input type="hidden" name="filename" value="/~'.  <input type="hidden" name="filename" value="/~'.
  $uname.$thisdisfn.'/'.$filename.'" /></form>';   &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
     $$numres ++;      $$numres ++;
 }  }
   
Removed from v.1.80  
changed lines
  Added in v.1.86

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