--- rat/client/parameter.html	2003/04/18 20:21:38	1.21
+++ rat/client/parameter.html	2003/05/22 23:13:58	1.24
@@ -3,7 +3,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.21 2003/04/18 20:21:38 www Exp $
+// $Id: parameter.html,v 1.24 2003/05/22 23:13:58 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -323,10 +323,10 @@ function pickcolor(picked) {
 
 function colorfield(ir,ig,ib) {
    var col=new Array;
-   col=["00","11","22","33","44","55","66","77","88","99","AA","BB","CC","DD","EE","FF"];
+   col=["00","11","22","44","66","88","AA","CC","DD","EE","FF"];
    var color='#'+col[ir]+col[ig]+col[ib];
-   var selection="   ";
-   if (color==svalue) { selection="X"; }
+   var selection="<font color='"+color+"'>X</font>";
+   if (color==svalue) { selection="<font color='#"+col[10-ir]+col[10-ig]+col[10-ib]+"'>X</font>"; }
    choicewrite('<td bgcolor="'+color+'"><a href="javascript:parent.pickcolor('+"'"+
                color+"'"+')">'+selection+'</a></td>');
                
@@ -420,10 +420,10 @@ function draw() {
          choicewrite('</table>');
      } else {
       if (pscat=='start') {
-         tablestart('Starting or opening date and time');
+         tablestart('Date and time');
       }
       if (pscat=='end') {
-         tablestart('Ending or closing date and time');
+         tablestart('Date and time');
       }
       if (pscat=='interval') {
          tablestart('Time interval');
@@ -534,13 +534,13 @@ function draw() {
       tablestart('Choose a Color');
       choicewrite('<table>');
       if (svalue) {
-         choicewrite('<tr><td colspan="10">Current choice:</td><td bgcolor="'+
-                     svalue+'" colspan="6">&nbsp;</td></tr>');
+         choicewrite('<tr><td colspan="9">Current choice:</td><td bgcolor="'+
+                     svalue+'" colspan="2">&nbsp;</td></tr>');
       }
-      for (var ir=1; ir<=15; ir++) {
-          for (var ig=1; ig<=15; ig++) {
+      for (var ir=0; ir<=10; ir++) {
+          for (var ig=0; ig<=10; ig++) {
               choicewrite('<tr>');
-              for (var ib=1; ib<=15; ib++) {
+              for (var ib=0; ib<=10; ib++) {
                   colorfield(ir,ig,ib);
 	      }
               choicewrite('</tr>');
@@ -720,6 +720,11 @@ function init() {
      sopt('string','String Value');
   }
 
+  if (ptype=='color') {
+     sopt('default','Use Default Color');
+     sopt('custom','Use Custom Color');
+  }
+
   selwrite('</select></form>');
 
   selwrite('<a href="javascript:parent.assemble();');