--- loncom/interface/lonparmset.pm	2004/07/04 05:50:09	1.166
+++ loncom/interface/lonparmset.pm	2004/10/15 22:31:14	1.168.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.166 2004/07/04 05:50:09 albertel Exp $
+# $Id: lonparmset.pm,v 1.168.2.3 2004/10/15 22:31:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -585,8 +585,8 @@ sub extractResourceInformation {
 	    my $resid=$2;
 	    my $id=$mapid.'.'.$resid;
 	    my $srcf=$$bighash{$_};
-#	    if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (1) {
+		$srcf=~/\.(\w+)$/;
 		$$ids[$#$ids+1]=$id;
 		$$typep{$id}=$1;
 		$$keyp{$id}='';
@@ -595,6 +595,10 @@ sub extractResourceInformation {
                     my $key=$_;
                     my $allkey=$1;
                     $allkey=~s/\_/\./g;
+		    if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 
+			'parm') {
+			next; #hide hidden things
+		    }
                     my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
                     my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
                     my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
@@ -988,23 +992,36 @@ sub assessparms {
 
         $r->print('<tr><td colspan="3" align="center">'.&mt('Select Parameters to View').'</td></tr>');
 
-        $r->print('<tr><td colspan="2"><table>');
-        $r->print('<tr><td><input type="checkbox" name="pscat" value="all"');
-        $r->print(' checked') unless (@pscat);
-        $r->print('>'.&mt('All Parameters').'</td>');
-
+        $r->print('<tr><td colspan="2"><table><tr>');
         my $cnt=0;
         foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
                       keys %allparms ) {
             ++$cnt;
-            $r->print('</tr><tr>') unless ($cnt%2);
+            $r->print('</tr><tr>') if ($cnt%2);
             $r->print('<td><input type="checkbox" name="pscat" ');
             $r->print('value="'.$tempkey.'"');
             if ($pscat[0] eq "all" || grep $_ eq $tempkey, @pscat) {
                 $r->print(' checked');
             }
-            $r->print('>'.$allparms{$tempkey}.'</td>');
+	    $r->print('>'.$allparms{$tempkey}.'</td>');
+	}
+	$r->print('
+</tr><tr><td>
+<script type="text/javascript">
+    function checkall(value, checkName) {
+	for (i=0; i<document.forms.parmform.elements.length; i++) {
+            ele = document.forms.parmform.elements[i];
+            if (ele.name == checkName) {
+                document.forms.parmform.elements[i].checked=value;
+            }
         }
+    }
+</script>
+<input type="button" onclick="checkall(true, \'pscat\')" value="Select All" />
+</td><td>
+<input type="button" onclick="checkall(false, \'pscat\')" value="Unselect All" />
+</td>
+');
         $r->print('</tr></table>');
 
 #        $r->print('<tr><td>Select Parts</td><td>');
@@ -1335,6 +1352,7 @@ ENDMAPONE
                 $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
 
 	        foreach (sort keys %name) {
+                    $r->print('<tr>');
                     &print_row($r,$_,\%part,\%name,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,
                            $parmlev);
@@ -1412,6 +1430,7 @@ ENDMAPONE
             $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
 
 	    foreach (sort keys %name) {
+                $r->print('<tr>');
                 &print_row($r,$_,\%part,\%name,$mapid,\%default,
                        \%type,\%display,$defbgone,$defbgtwo,$parmlev);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
@@ -1700,7 +1719,7 @@ sub crsenv {
     my $Parameter=&mt('Parameter');
     my $Value=&mt('Value');
     my $Set=&mt('Set');
-    my $browse_js=&Apache::loncommon::browser_and_searcher_javascript();
+    my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
     $r->print(<<ENDENV);
 <html>
 <script type="text/javascript" language="Javascript" >
@@ -1822,9 +1841,10 @@ ENDOVER
 	    $middle=~s/\.$//;
 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).'</font>';
+		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
 	    } elsif ($middle) {
-		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'</font>';
+		my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
 	    }
 	    if ($section ne $oldsection) {
 		$r->print(&tableend()."\n<hr /><h1>$section</h1>");
