--- loncom/publisher/lonpubdir.pm	2006/04/18 22:38:08	1.90
+++ loncom/publisher/lonpubdir.pm	2006/11/22 20:16:16	1.96
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.90 2006/04/18 22:38:08 albertel Exp $
+# $Id: lonpubdir.pm,v 1.96 2006/11/22 20:16:16 banghart 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>'.
@@ -308,7 +309,8 @@ parent.lastknownpriv='/~$uname$thisdisfn
       return
     }
     function changename(theform,activity) {
-        var newname=prompt('New Name');
+        var oldname=theform.dispfilename.value;
+        var newname=prompt('New Name',oldname);
         if (newname == "" || !newname)  {
             return
         }
@@ -363,14 +365,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 +391,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 +414,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 +541,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,53 +569,85 @@ 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 $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>';
+	&Apache::lonnet::logthis("same $same meta $meta_same");
+	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.
 		    '&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="bomb" />':'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>';
+	}
 	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }
@@ -632,13 +670,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>'.
@@ -675,7 +713,9 @@ sub create_pubselect {
 '<option value="print">'.&mt('Print').'</option>'.
 '</select>
 <input type="hidden" name="filename" value="/~'.
- &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
+ <input type="hidden" name="dispfilename" value="'.
+ &HTML::Entities::encode($filename).'"</form>';
     $$numres ++;
 }