--- loncom/interface/lonhelper.pm	2003/05/05 15:17:25	1.18
+++ loncom/interface/lonhelper.pm	2003/05/07 18:22:43	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.18 2003/05/05 15:17:25 bowersj2 Exp $
+# $Id: lonhelper.pm,v 1.21 2003/05/07 18:22:43 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1689,7 +1689,7 @@ BUTTONS
             $checked = 1;
         }
         $result .=
-            " value='" . HTML::Entities::encode($_)
+            " value='" . HTML::Entities::encode($_ . ':' . $choices->{$_}->[$section])
             . "' /></td><td>"
             . HTML::Entities::encode($choices->{$_}->[$fullname])
             . "</td><td align='center'>" 
@@ -1847,12 +1847,23 @@ sub render {
             }
         }
     }
+
+    function checkallid(value, idName) {
+        for (i=0; i<document.forms.helpform.elements.length; i++) {
+            ele = document.forms.helpform.elements[i];
+            if (ele.id == idName) {
+                document.forms.helpform.elements[i].checked=value;
+            }
+        }
+    }
 </script>
 SCRIPT
         $buttons = <<BUTTONS;
 <br /> &nbsp;
 <input type="button" onclick="checkall(true, '$var')" value="Select All Files" />
 <input type="button" onclick="checkall(false, '$var')" value="Unselect All Files" />
+<input type="button" onclick="checkallid(true, 'Published')" value="Select All Published" />
+<input type="button" onclick="checkallid(false, 'Published')" value="Unselect All Published" />
 <br /> &nbsp;
 BUTTONS
     }
@@ -1876,7 +1887,7 @@ BUTTONS
         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
     }
 
-    $result .= '<table border="0" cellpadding="1" cellspacing="1">';
+    $result .= '<table border="0" cellpadding="2" cellspacing="0">';
 
     # Keeps track if there are no choices, prints appropriate error
     # if there are none. 
@@ -1893,14 +1904,16 @@ BUTTONS
         }
         my $fileName = $subdir .'/'. $file;
         if (&$filterFunc($file)) {
-            $result .= '<tr><td align="right">' .
-                "<input type='$type' name='" . $var
+            (my $status, my $color) = @{fileState($subdir, $file)};
+            $result .= '<tr><td align="right"' . " bgcolor='$color'>" .
+                "<input id='$status' type='$type' name='" . $var
             . ".forminput' value='" . HTML::Entities::encode($fileName) .
                 "'";
             if (!$self->{'multichoice'} && $choices == 0) {
                 $result .= ' checked';
             }
-            $result .= "/></td><td>" . $file . "</td></tr>\n";
+            $result .= "/></td><td bgcolor='$color'>" . $file .
+                 "</td><td bgcolor='$color'>$status</td></tr>\n";
             $choices++;
         }
     }
@@ -1916,6 +1929,37 @@ BUTTONS
     return $result;
 }
 
+# Determine the state of the file: Published, unpublished, modified.
+# Return the color it should be in and a label as a two-element array
+# reference.
+# Logic lifted from lonpubdir.pm, even though I don't know that it's still
+# the most right thing to do.
+
+sub fileState {
+    my $constructionSpaceDir = shift;
+    my $file = shift;
+    
+    my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    my $subdirpart = $constructionSpaceDir;
+    $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
+    my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+        $subdirpart;
+
+    my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
+    my @resourceSpaceFileStat = stat($resdir . '/' . $file);
+    if (!@resourceSpaceFileStat) {
+        return ['Unpublished', '#FFCCCC'];
+    }
+
+    my $constructionSpaceFileModified = $constructionSpaceFileStat[9];
+    my $resourceSpaceFileModified = $resourceSpaceFileStat[9];
+    
+    if ($constructionSpaceFileModified > $resourceSpaceFileModified) {
+        return ['Modified', '#FFFFCC'];
+    }
+    return ['Published', '#CCFFCC'];
+}
+
 sub postprocess {
     my $self = shift;
     my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};