--- loncom/interface/lonhelper.pm	2004/04/27 15:32:45	1.77
+++ loncom/interface/lonhelper.pm	2004/06/02 14:55:50	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.77 2004/04/27 15:32:45 sakharuk Exp $
+# $Id: lonhelper.pm,v 1.82 2004/06/02 14:55:50 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2090,7 +2090,9 @@ sub render {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
 	    comp = document.forms.helpform.elements.chksec.value;
             if (document.forms.helpform.elements[i].value.indexOf(':'+comp+':') != -1) {
-                document.forms.helpform.elements[i].checked=value;
+		if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
+		    document.forms.helpform.elements[i].checked=value;
+		}
             }
         }
     }
@@ -2098,7 +2100,14 @@ sub render {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
                 document.forms.helpform.elements[i].checked=true;
-            }
+            } 
+        }
+    }
+    function uncheckexpired() {
+	for (i=0; i<document.forms.helpform.elements.length; i++) {
+            if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
+                document.forms.helpform.elements[i].checked=false;
+            } 
         }
     }
 </script>
@@ -2106,16 +2115,18 @@ SCRIPT
 
         my %lt=&Apache::lonlocal::texthash(
                     'ocs'  => "Select Only Current Students",
+                    'ues'  => "Unselect Expired Students",
                     'sas'  => "Select All Students",
                     'uas'  => "Unselect All Students",
-                    'sfsg' => "Select for Section/Group",
+                    'sfsg' => "Select Current Students for Section/Group",
 		    'ufsg' => "Unselect for Section/Group");
  
         $buttons = <<BUTTONS;
 <br />
 <input type="button" onclick="checkactive()" value="$lt{'ocs'}" />
+<input type="button" onclick="uncheckexpired()" value="$lt{'ues'}" /><br />
 <input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" />
-<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" /><br />
 <input type="button" onclick="checksec(true)" value="$lt{'sfsg'}">
 <input type="text" size="5" name="chksec">&nbsp;
 <input type="button" onclick="checksec(false)" value="$lt{'ufsg'}">
@@ -3114,7 +3125,7 @@ sub render {
         my $title = $res->compTitle();
         $symb = $res->symb();
         $navmap->untieHashes();
-        $resourceString .= &mt('<li>for the map named <b>[_1]</b></li>',$title);
+        $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
         $level = 8;
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'map';
@@ -3124,7 +3135,7 @@ sub render {
         $symb = $res->symb();
         my $title = $res->compTitle();
         $navmap->untieHashes();
-        $resourceString .= &mt('<li>for the resource named <b>[_1]</b></li>',$title);
+        $resourceString .= '<li>'.&mt('for the resource named [_1]',"<b>$title</b>").'</li>';
         $level = 7;
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'full';
@@ -3180,7 +3191,7 @@ sub render {
         $result .= '<li>'.&mt('for <b>all students in course</b>').'</li>';
     } elsif ($vars->{TARGETS} eq 'section') {
         my $section = $vars->{SECTION_NAME};
-        $result .= &mt('<li>for section <b>[_1]</b></li>',$section);
+        $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
         $level -= 3;
         $result .= "<input type='hidden' name='csec' value='" .
             HTML::Entities::encode($section,'<>&"') . "' />\n";
@@ -3191,8 +3202,7 @@ sub render {
         # Chop off everything after the last colon (section)
         $username = substr($username, 0, rindex($username, ':'));
         my $name = $classlist->{$username}->[6];
-        $result .= &mt('<li>for <b>[_1]</b></li>',$name);
-##        $result .= "<li>".&mt('for [_1]',"<b>$name</b>")."</li>";
+        $result .= '<li>'.&mt('for [_1]',"<b>$name</b>").'</li>';
         $level -= 6;
         my ($uname, $udom) = split /:/, $vars->{USER_NAME};
         $result .= "<input type='hidden' name='uname' value='".
@@ -3203,9 +3213,7 @@ sub render {
 
     # Print value
     if ($vars->{ACTION_TYPE} ne 'tries' && $vars->{ACTION_TYPE} ne 'weight') {
-	$result .= "<li>".&mt('to')." <b>" . ctime($vars->{PARM_DATE}) . "</b> (" .
-	    Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}) 
-	    . ")</li>\n";
+	$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".ctime($vars->{PARM_DATE})."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
     }
  
     # print pres_marker