--- loncom/publisher/lonpubdir.pm	2006/04/06 20:52:50	1.89
+++ loncom/publisher/lonpubdir.pm	2006/06/26 22:47:27	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.89 2006/04/06 20:52:50 albertel Exp $
+# $Id: lonpubdir.pm,v 1.94 2006/06/26 22:47:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ 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;
@@ -104,13 +105,13 @@ sub handler {
   
   # 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').
+  $r->print('<table id="LC_browser"><tr>'.
+            '<th>'.&mt('Type').'</th>'.
+            '<th>'.&mt('Actions').'</th>'.
+            '<th>'.&mt('Name').'</th>'.
+            '<th>'.&mt('Title').'</th>'.
+	    '<th>'.&mt('Status').'</th>'.
+            '<th>'.&mt('Last Modified').
 	    '</th></tr>'."\n");
 
   my $filename;
@@ -194,7 +195,7 @@ sub startpage {
 
     my $formaction='/priv/'.$uname.$thisdisfn.'/';
     $formaction=~s|/+|/|g;
-    my $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+    my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
         '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
         '<form name="dirs" method="post" action="'.$formaction.
         '" target="_parent"><tt><b>'.
@@ -209,10 +210,10 @@ sub startpage {
 						 {'body_title' =>
 						      $pagetitle,}));
     } else {
-	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
-						 {'only_body' => 1,}));
+	$r->print(&Apache::loncommon::start_page('Construction Space',undef));
 	$r->print($pagetitle);
     }
+
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script type="text/javascript">
 top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
@@ -363,14 +364,14 @@ sub dircontrols {
 				       updc => 'Upload a new document'
                                       );
     $r->print(<<END);
-        <table cellspacing="4" cellpadding="4" width="100%">
+        <table id="LC_cstr_controls">
          <tr>
-          <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'acti'}</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="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'crea'}</b></font></td>
+          <th>$lt{'acti'}</th>
+          <th>$lt{'updc'}</th>
+          <th>$lt{'crea'}</th>
         </tr>
         <tr>
-         <td bgcolor="#ccddaa" valign="top" align="center">
+         <td>
           <form name="curractions" method="post" action="">
            <select name="dirtask" onchange="currdiract(this.form)">
             <option>$lt{'sela'}</option>
@@ -389,16 +390,16 @@ sub dircontrols {
            <input type="hidden" name="postdata" value="" />
           </form>
          </td>
-         <td bgcolor="#ccddaa" valign="top" align="center">
+         <td>
 	    <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="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
 	    </form>
 	 </td>
-	 <td bgcolor="#ccddaa" align="center">
+	 <td>
 	    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
-	      <nobr>
+	      <span style="white-space: nowrap">
 		<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
 			  <select name="action">
 			    <option value="Select Action">$lt{'sela'}</option>
@@ -412,7 +413,7 @@ sub dircontrols {
                             <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()" />
-		 </nobr>
+		 </span>
 		</form>
 	  </td>
          </tr>
@@ -539,15 +540,19 @@ sub putdirectory {
                    '</form>';
             $$numdir ++;
         }
-	$r->print('<tr bgcolor="#CCCCFF">'.
+	$r->print('<tr class="LC_browser_folder">'.
 		  '<td><img src="'.
 		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
 		  '<td>'.$actionitem.'</td>'.
-		  '<td><font face="arial"><a href="'.&HTML::Entities::encode($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="2">'.($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");
     }
@@ -563,7 +568,7 @@ sub putresource {
     &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 $action_buttons=
@@ -571,21 +576,30 @@ sub putresource {
 #	$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,
+	                                      '/home/'.$uname.'/public_html/'.$thisdisfn.'/'.$filename)) {
+              $same=0;
+           } else {
+              $same=1;
+           }
+        }
 	$publish_button=&mt('Re-publish');
-	if ($rmtime>=$cmtime) {
+	if ($same) {
             $pubstatus = 'published';
 	    $status=&mt('Published').'<br />'.
 		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
 		&mt(&getSourceRightString($targetdir.'/'.$filename));
-	    $bgcolor='#CCFF88';
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';
 		$status=&mt('Obsolete');
-                $bgcolor='#AAAAAA';
             }
 #	    } else {
 #		$action_buttons='';
@@ -598,7 +612,6 @@ sub putresource {
 	    $status=&mt('Modified').'<br />'.
 		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
 		&mt(&getSourceRightString($targetdir.'/'.$filename));
-            $bgcolor='#FFFF77';
 #	    $action_buttons='';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
 		&getTitleString($targetdir.'/'.$filename).'</a>';
@@ -632,13 +645,13 @@ sub putresource {
     }
     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 class="LC_browser_file_'.$pubstatus.'">'.
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
 		      '<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>'.