--- loncom/publisher/lonpubdir.pm	2004/12/02 19:45:39	1.68
+++ loncom/publisher/lonpubdir.pm	2008/12/19 03:54:19	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.68 2004/12/02 19:45:39 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.118 2008/12/19 03:54:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,10 +36,12 @@ use Apache::Constants qw(:common :http :
 use Apache::loncacc;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::londiff();
 use Apache::lonlocal;
 use Apache::lonmsg;
 use Apache::lonmenu;
 use Apache::lonnet;
+use LONCAPA;
 
 sub handler {
 
@@ -61,7 +63,7 @@ sub handler {
              $fn,$r->dir_config('lonDefDomain')); 
   unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
-         ' trying to list directory '.$ENV{'form.filename'}.
+         ' trying to list directory '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
@@ -72,7 +74,7 @@ sub handler {
   $fn=~s/\/$//;
 
   unless ($fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' trying to list empty directory', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
@@ -91,9 +93,11 @@ sub handler {
   my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
-  if ($ENV{'environment.remote'} eq 'off') {
+  if ($env{'environment.remote'} eq 'off') {
       &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
                                                # browse/upload + new file page.
+  } else {
+      &pubbuttons($r,$uname,$thisdisfn);
   }
   &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
 
@@ -101,15 +105,16 @@ sub handler {
   my $numres = 0;
   
   # Start off the directory table.
-  $r->print('<h3>Directory Contents:</h3>');
-  $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.
-            '<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.
-            '<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.
-            '<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>');
+  $r->print(&Apache::loncommon::start_data_table()
+           .&Apache::loncommon::start_data_table_header_row()
+           .'<th>'.&mt('Type').'</th>'
+           .'<th>'.&mt('Actions').'</th>'
+           .'<th>'.&mt('Name').'</th>'
+           .'<th>'.&mt('Title').'</th>'
+           .'<th colspan="2">'.&mt('Status').'</th>'
+           .'<th>'.&mt('Last Modified').'</th>'
+           .&Apache::loncommon::end_data_table_header_row()
+  );
 
   my $filename;
   my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
@@ -135,7 +140,9 @@ sub handler {
   }
   closedir(DIR);
 
-  $r->print('</table></body></html>');
+  $r->print(&Apache::loncommon::end_data_table()
+           .&Apache::loncommon::end_page()
+  );
   return OK;  
 }
 #
@@ -146,15 +153,15 @@ sub getEffectiveUrl {
     my $r = shift;
     my $fn;
     
-    if ($ENV{'form.filename'}) {	# If a form filename is defined.
-	$fn=$ENV{'form.filename'};
+    if ($env{'form.filename'}) {	# If a form filename is defined.
+	$fn=$env{'form.filename'};
 	#
 	#   Replace the ~username of the URL with /home/username/public_html
 	#   so that we don't have to worry about ~ expansion internally.
 	#
-	$fn=~s/^http\:\/\/[^\/]+\///;
+	$fn=~s/^https?\:\/\/[^\/]+\///;
         $fn=~s/^\///;
-        $fn=~s/\~(\w+)/\/home\/$1\/public_html/;
+        $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
 	
 	#  Remove trailing / strings (?) 
 	
@@ -167,7 +174,7 @@ sub getEffectiveUrl {
 	    #internal authentication, needs fixup.
 	    $fn = $r->uri(); # non users do not get the full path request
                              # through SCRIPT_FILENAME
-	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
+	    $fn=~s{^/~($LONCAPA::username_re)}{/home/$1/public_html};
 	}
     }
     $fn=~s/\/+/\//g;
@@ -190,13 +197,10 @@ sub startpage {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
-    my $pagetitle;
     my $formaction='/priv/'.$uname.$thisdisfn.'/';
-    $formaction=~s/\/+/\//g;
-    $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
-        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
+    $formaction=~s|/+|/|g;
+    my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
+        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>'.&mt('Construction Space').'</b>:</font>&nbsp;'.
         '<form name="dirs" method="post" action="'.$formaction.
         '" target="_parent"><tt><b>'.
         &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
@@ -204,58 +208,48 @@ sub startpage {
                  '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));
+    if ($env{'environment.remote'} eq 'off') {
+	$env{'request.noversionuri'}=$currdir.'/';
+	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
+						 {'body_title' =>
+						      $pagetitle,}));
     } else {
+	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
+						 { 'only_body' => 1,}));
 	$r->print($pagetitle);
     }
+
+    my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
+    my $doctitle = 'LON-CAPA '.&mt('Construction Space');
+    my $newname = &mt('New Name');
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
-<script>
+<script type="text/javascript">
+top.document.title = '$esc_thisdisfn/ - $doctitle';
 // Store directory location for menu bar to find
 
-parent.lastknownpriv='/~$uname$thisdisfn/';
+parent.lastknownpriv='/~$uname$esc_thisdisfn/';
 
 // 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)
+            document.publishdir.filename.value = theform.filename.value;
+	    document.publishdir.submit();
         }
-        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editmeta') {
             top.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) {
-	if (confirm('Publish complete directory?')) {
-            forcepub(theform)
-	    theform.submit();
-        }
-    }
-    function pubrecdir(theform) {
-	if (confirm('Publish directory and all subdirectories?')) {
-            forcepub(theform);
-            theform.pubrec.value='1';
-	    theform.submit();
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.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")
@@ -266,16 +260,13 @@ parent.lastknownpriv='/~$uname$thisdisfn
 
     function SetPubDir(theform,printForm) {
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
-            top.location = theform.filename.value
+            top.location = theform.openname.value
             return
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
-            pubdir(theform)
+            theform.submit();
         }
-        if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") {
-            pubrecdir(theform)
-        }
-        if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "editmeta") {
             top.location=theform.filename.value+'default.meta'
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
@@ -283,6 +274,11 @@ parent.lastknownpriv='/~$uname$thisdisfn
             theform.postdata.value = theform.filename.value
             theform.submit()
         }
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.submit()
+        }
         return
     }
     function SetResChoice(theform) {
@@ -298,14 +294,12 @@ parent.lastknownpriv='/~$uname$thisdisfn
       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()
-          }
+          delform.submit()
       }
       if (activity == 'obsolete') {
           var pubform = document.pubresource
           pubform.filename.value = theform.filename.value
-          alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.")
+          pubform.makeobsolete.value=1;
           pubform.submit()
       }
       if (activity == 'print') {
@@ -316,11 +310,16 @@ parent.lastknownpriv='/~$uname$thisdisfn
           document.retrieveres.filename.value = theform.filename.value
           document.retrieveres.submit()
       }
+      if (activity == 'cleanup') {
+          document.cleanup.filename.value = theform.filename.value
+          document.cleanup.submit()
+      }
       return
     }
     function changename(theform,activity) {
-        var newname=prompt('New Name');
-        if (newname == "" || !newname)  {
+        var oldname=theform.dispfilename.value;
+        var newname=prompt('$newname',oldname);
+        if (newname == "" || !newname || newname == oldname)  {
             return
         }
         document.moveresource.newfilename.value = newname
@@ -332,7 +331,8 @@ parent.lastknownpriv='/~$uname$thisdisfn
 ENDPUBDIRSCRIPT
     $r->print($pubdirscript);
 
-    if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+    if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
+	$env{'environment.remote'} ne 'off') {
 	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
 		  '</h3>');
     }
@@ -340,64 +340,125 @@ ENDPUBDIRSCRIPT
 
 sub dircontrols {
     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',
+                                       dedr => 'Delete Directory',
+                                       rtrv => 'Retrieve Old Version',
+                                       list => 'List Directory',
+                                       uplo => 'Upload file',  
+                                       dele => 'Delete',
+                                       edit => 'Edit Metadata', 
+                                       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',
+                                       nbt  => 'New bridgetask 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',
+				       pick => 'Please select an action to perform using the new filename',
+                                      );
+    my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
     $r->print(<<END);
-        <table cellspacing="4" cellpadding="4" width="100%">
-         <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="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</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>
-        </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="" />
-          </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>
+<div class="LC_columnSection">
+  <div>
+    <form name="curractions" method="post" action="">
+      <fieldset>
+        <legend>$lt{'acti'}</legend>
+        <select name="dirtask" onchange="currdiract(this.form)">
+            <option>$lt{'sela'}</option>
+            <option value="publish">$lt{'pubd'}</option>
+            <option value="editmeta">$lt{'edit'}</option>
+            <option value="printdir">$lt{'prnt'}</option>
+            <option value="delete">$lt{'dedr'}</option>
+        </select>
+        <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+      </fieldset>
+    </form>
+    <form name="publishdir" method="post" action="/adm/publish" target="_parent">
+      <input type="hidden" name="pubrec" value="" />
+      <input type="hidden" name="filename" value="" />
+    </form>
+    <form name="printdir" method="post" action="/adm/printout" target="_parent">
+      <input type="hidden" name="postdata" value="" />
+    </form>
+  </div>
+
+  <div>
+    <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+      <fieldset>
+        <legend>$lt{'updc'}</legend>
+        <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+        <input type="file" name="upfile" size="20" />
+        <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
+      </fieldset>
+    </form>
+  </div>
+
+  <div>
+    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
+      <fieldset>
+              <legend>$lt{'crea'}</legend>
+	      <span class="LC_nobreak">
 		<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+                  <script type="text/javascript">
+                    function validate_go() {
+                        var selected = document.fileaction.action.selectedIndex;
+                        if (selected == 0) {
+                            alert('$lt{'pick'}');
+                        } else {
+                            document.fileaction.submit();
+                        }
+                    }
+                  </script>
 		  <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>
+		    <option value="none">$lt{'sela'}</option>
+		    <option value="newfile">$lt{'nfil'}:</option>
+		    <option value="newhtmlfile">$lt{'nhtm'}:</option>
+		    <option value="newproblemfile">$lt{'nprb'}:</option>
+                    <option value="newpagefile">$lt{'npag'}:</option>
+                    <option value="newsequencefile">$lt{'nseq'}:</option>
+                    <option value="newrightsfile">$lt{'ncrf'}:</option>
+                    <option value="newstyfile">$lt{'nsty'}:</option>
+                    <option value="newtaskfile">$lt{'nbt'}:</option>
+                    <option value="newlibraryfile">$lt{'nlib'}:</option>
+	            <option value="newdir">$lt{'nsub'}:</option>
+		  </select>&nbsp;<input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
+		 </span>
+      </fieldset>
+    </form>
+  </div>
+</div>
 END
 }
 
+sub pubbuttons {
+    my ($r,$uname,$thisdisfn) = @_;
+    $r->print('<form method="post" action="/adm/publish" target="_parent">'.
+              '<table><tr><td><input type="hidden" name="filename" value="/~'.
+               $uname.$thisdisfn.'/" />'.
+              '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
+'<input type="button" onclick="window.location='."'/~".
+               $uname.$thisdisfn."/default.meta'".'" value="'.
+&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+}
+
 sub resourceactions {
     my ($r,$uname,$udom,$thisdisfn) = @_;
     $r->print(<<END);
@@ -411,9 +472,8 @@ sub resourceactions {
          <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" />
+         <input type="hidden" name="makeobsolete" value="0" />
        </form>
        <form name="printresource" action="/adm/printout" target="_parent" method="post">
            <input type="hidden" name="postdata" value="" />
@@ -421,6 +481,9 @@ sub resourceactions {
        <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
            <input type="hidden" name="filename" value="" />
        </form>
+       <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
+           <input type="hidden" name="filename" value="" />
+       </form>
 END
 }
 
@@ -477,43 +540,46 @@ sub putdirectory {
 	%Apache::lonpublisher::metadatafields=();
 	%Apache::lonpublisher::metadatakeys=();
 	my $construct=$here;
-	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+	$construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html};
         my $dirpath = $here;
-        $dirpath=~s:^/priv/:/~:;
+        $dirpath=~s{^/priv/}{/~};
 	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
        				 $construct.'/'.$dirname.'/default.meta'
 								 ));
         my $actionitem = '';
         if ($dirname eq '..') {
-            $actionitem = 'Go to ...';
+            $actionitem = &mt('Go to ...');
         } else {
             $actionitem = 
                     '<form name="dirselect_'.$$numdir.
                     '" 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 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').
+                      '<option value="editmeta">'.&mt('Edit Metadata').'</option>'.
+                      '<option value="printdir">'.&mt('Print directory').'</option>'.
+                      '<option value="delete">'.&mt('Delete directory').'</option>'.
                     '</select>'.
-                     '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
-                     '<input type="hidden" name="pubrec" value="" />'.
-                     '<input type="hidden" name="forcerepub" value="" />'.
+                     '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
+                     '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="postdata" value="" />'.
                    '</form>';
             $$numdir ++;
         }
-	$r->print('<tr bgcolor="#CCCCFF">'.
+	$r->print('<tr class="LC_browser_folder">'.
 		  '<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><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.
-		  $disfilename.'</a></font></td>'.
-		        '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
-		  $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
-		  $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
+		  '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
+		  $disfilename.'</a></span></td>'.
+		        '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
+	if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
+	    $r->print(' <i>'.
+		      $Apache::lonpublisher::metadatafields{'subject'}.
+		      '</i> ');
+	}
+	$r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
 		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
     }
@@ -526,56 +592,88 @@ sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn, 
 	$resdir, $targetdir, $linkdir,
 	$cmtime,$bombs,$numres) = @_;
+    &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
     my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');
-    my $bgcolor='#FFAA99';
+    my $css_class='LC_browser_file';
     my $title='&nbsp;';
     my $publish_button=&mt('Publish');
+    my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
 #    my $action_buttons=
 #        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
 #	$uname.'/'.$thisdisfn.'/'.$filename.'">'.
 #	&mt('Delete').'</a>';
     if (-e $resdir.'/'.$filename) {
+        my $same=0;
 	my ($rdev,$rino,$rmode,$rnlink,
 	    $ruid,$rgid,$rrdev,$rsize,
 	    $ratime,$rmtime,$rctime,
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+        if ($rmtime>=$cmtime) {
+           $same=1;
+        } else {
+           if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
+						     $cstr_dir.'/'.$filename)) {
+              $same=0;
+           } else {
+              $same=1;
+           }
+        }
+	my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
+	my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+	my $meta_same = 1;
+	if ($meta_rmtime < $meta_cmtime
+	    && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
+						     $cstr_dir.'/'.$filename.'.meta')) {
+	    $meta_same = 0;
+	}
 	$publish_button=&mt('Re-publish');
-	if ($rmtime>=$cmtime) {
-            $pubstatus = 'published';
-	    $status=&mt('Published').'<br />'.
-		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
-		&mt(&getSourceRightString($targetdir.'/'.$filename));
-	    $bgcolor='#CCFF88';
+	my $rights_status =
+	    &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+	    &mt(&getSourceRightString($targetdir.'/'.$filename));
+	$title = '<a href="/res/'.$targetdir.'/'.$filename.
+	    '.meta" target="cat">'.
+	    &getTitleString($targetdir.'/'.$filename).'</a>';
+	if ($same) {
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';
 		$status=&mt('Obsolete');
-                $bgcolor='#AAAAAA';
-            }
+            } else {
+		if (!$meta_same) {
+		    $pubstatus = 'metamodified';
+		} else {
+		    $pubstatus = 'published';
+		}
+		$status=&mt('Published').
+		    '<br />'. $rights_status;
+	    }
 #	    } else {
 #		$action_buttons='';
 #	    }
-	    $title='<a href="/res/'.$targetdir.'/'.$filename.
-		'.meta" target=cat>'.
-		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
             $pubstatus = 'modified';
-	    $status=&mt('Modified').'<br />'.
-		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
-		&mt(&getSourceRightString($targetdir.'/'.$filename));
-            $bgcolor='#FFFF77';
+	    $status=&mt('Modified').
+		'<br />'. $rights_status;
 #	    $action_buttons='';
-	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
-		&getTitleString($targetdir.'/'.$filename).'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
 		$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
-		    '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
+		    '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
 	    }
+	} 
+
+	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
+	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>';
+
+	if (!$meta_same) {
+	    $title = &mt('Metadata Modified').'<br />'.$title.
+		'<br /><a href="/adm/diff?filename=/~'.$uname.
+		$thisdisfn.'/'.$filename.'.meta'.
+		'&amp;versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
+	    $title.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
+		$thisdisfn.'/'.$filename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
 	}
-	$title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
-	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
-	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
+	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }
     my $editlink='';
@@ -587,24 +685,30 @@ sub putresource {
 	$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>)';
     }
+    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)$/) {
 	$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
 	      $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(&Apache::loncommon::start_data_table_row().
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
-		      '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
+		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.
-	      '<td><font face="arial">'.
+	      '<td><span class="LC_filename">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
-               $filename.'</a></font>'.$editlink2.$editlink.
+               $filename.'</a></span>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
-	      '<td>'.$status.'</td>'.
+              '<td class="LC_browser_file_'.$pubstatus.'">&nbsp;&nbsp;</td>'. # Display publication status
+              '<td>'.$status.'</td>'.
 	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
-	      "</tr>\n");
+	      &Apache::loncommon::end_data_table_row()
+    );
     return OK;
 }
 
@@ -612,30 +716,33 @@ 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="copy"/>'.&mt('Copy');
+<select name="reschoice"  onchange="SetResChoice(this.form)">
+<option>'.&mt('Select action').'</option>'.
+'<option value="copy">'.&mt('Copy').'</option>';
     if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
         $$pub_select .= 
-'<option value="rename"/>'.&mt('Rename').
-'<option value="move"/>'.&mt('Move').
-'<option value="delete"/>'.&mt('Delete');
+'<option value="rename">'.&mt('Rename').'</option>'.
+'<option value="move">'.&mt('Move').'</option>'.
+'<option value="delete">'.&mt('Delete').'</option>';
     } else {
         $$pub_select .= '
-<option value="obsolete"/>'.&mt('Mark obsolete');
+<option value="obsolete">'.&mt('Mark obsolete').'</option>';
     }
 # check for versions
     my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);
     if ($versions > 0) {
         $$pub_select .='
-<option value="retrieve"/>'.&mt('Retrieve old version');
+<option value="retrieve">'.&mt('Retrieve old version').'</option>';
     }
     $$pub_select .= '
-<option value="publish"/>'.$publish_button.
-'<option value="print"/>'.&mt('Print').
+<option value="publish">'.$publish_button.'</option>'.
+'<option value="cleanup">'.&mt('Clean up').'</option>'.
+'<option value="print">'.&mt('Print').'</option>'.
 '</select>
 <input type="hidden" name="filename" value="/~'.
- $uname.$thisdisfn.'/'.$filename.'"></form>';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
+ <input type="hidden" name="dispfilename" value="'.
+ &HTML::Entities::encode($filename).'" /></form>';
     $$numres ++;
 }
 
@@ -687,6 +794,7 @@ sub CategorizeFiles {
 1;
 __END__
 
+
 =head1 NAME
 
 Apache::lonpubdir - Construction space directory lister
@@ -742,4 +850,64 @@ run through list of files and attempt to
 
 =back
 
+=head1 SUBROUTINES:
+
+=over
+
+=item startpage($r, $uame, $udom, $thisdisfn)
+
+Output the header of the page.  This includes:
+ - The HTML header 
+ - The H1/H3  stuff which includes the directory.
+ 
+    startpage($r, $uame, $udom, $thisdisfn);
+        $r     - The apache request object.
+        $uname - User name.
+        $udom  - Domain name the user is logged in under.
+        $thisdisfn - Displayable version of the filename.
+
+=item getTitleString($fullname)
+
+    Get the title string or "[untitled]" if the file has no title metadata:
+    Without the latter substitution, it's impossible to examine metadata for
+    untitled resources.  Resources may be legitimately untitled, to prevent
+    searches from locating them.
+    
+    $str = getTitleString($fullname);
+        $fullname - Fully qualified filename to check.
+
+=item putdirectory(r, base, here, dirname, modtime)
+
+    Put out a directory table row:
+    
+    putdirectory($r, $base, $here, $dirname, $modtime)
+        $r       - Apache request object.
+        $reqfile - File in request.
+        $here    - Where we are in directory tree.
+        $dirname - Name of directory special file.
+        $modtime - Encoded modification time.
+
+=item CategorizeFiles($location, $files)
+    
+    Categorize files in the directory.
+    For each file in a list of files in a file directory, 
+    the  file categorized as one of:
+        - directory  
+        - sequence
+        - problem 
+        - Other resource.
+
+    For each file the modification date is determined as well.
+    Returned is a list of sublists:
+        (directories, sequences, problems, other)
+    each of the sublists contains entries of the following form (sorted by filename):
+    (filename, typecode, lastmodtime)
+    
+        $list = CategorizeFiles($location, $files)
+        $location   - Directory in which the files live (relative to our execution)
+        $files      - list of files.
+
+=back
+
 =cut
+