Fixing table

git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@85 1faa4e14-9dd3-4be0-9f0e-ffe519881164

1 files changed, 73 insertions, 31 deletions

diff --git a/src/Parameters.c b/src/Parameters.c
index ae9e137..5edbe46 100644
--- a/src/Parameters.c
+++ b/src/Parameters.c
@@ -801,10 +801,9 @@ static int ParameterPage(cGH *cctkGH, httpRequest *request, void *data)
     sprintf(message,"<CENTER><H1>%s: %s</H1></CENTER>\n",pData->thorn,pData->name);
     HTTP_Write(request, message, strlen(message));
 
-    sprintf(message,"<p>Complete information about parameter <b>%s</b> "
-	    "defined in thorn <b>%s</b>, implementation <b>%s</b>.</p>"
-	    "<P>Return to all parameters for this "
-	    "<A HREF=\"Parameters/%s\">thorn</A>.</P> ",
+    sprintf(message,
+	    "<CENTER><P>Return to all parameters for this "
+	    "<A HREF=\"Parameters/%s\">thorn</A>.</P></CENTER> ",
 	    pData->name, pData->thorn, CCTK_ThornImplementation(pData->thorn));
 
     HTTP_Write(request, message, strlen(message));
@@ -818,96 +817,139 @@ static int ParameterPage(cGH *cctkGH, httpRequest *request, void *data)
 	strcmp(pData->name,"encryption_scheme")))
     {
 
-    sprintf(message,"<CENTER><TABLE CELLPADDING=5 CELLSPACING=5>\n"
+    sprintf(message,"<CENTER><TABLE CELLPADDING=5 CELLSPACING=5 "
+	    " BORDER=1 NOSHADE>\n"
+	    "<TR>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Name:</B></TD>\n"
+	    "<TD>%s</TD>\n"
+	    "</TR>\n"
 	    "<TR>\n"
-	    "<TD><B>Current value</B></TD>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Thorn:</B></TD>\n"
+	    "<TD>%s</TD>\n"
+	    "</TR>\n"
+	    "<TR>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Implementation:</B></TD>\n"
+	    "<TD>%s</TD>\n"
+	    "</TR>\n"
+	    "<TR>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Current value:</B></TD>\n"
 	    "<TD>%s</TD>\n"
 	    "</TR>"
 	    "<TR>\n"
-	    "<TD><B>Description</B></TD>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Description:</B></TD>\n"
 	    "<TD>%s</TD>\n"
 	    "</TR>"
 	    "<TR>"
-	    "<TD><B>Default</B></TD>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Default:</B></TD>\n"
 	    "<TD>%s</TD>\n"
 	    "</TR>",
+	    pData->name,pData->thorn,CCTK_ThornImplementation(pData->thorn),
 	    value,pData->description,pData->defval);
     HTTP_Write(request, message, strlen(message));
 
+    strcpy(message,"<TR>\n<TD ALIGN=RIGHT VALIGN=TOP>\n"
+	   "<B>Steerable:</B></TD>\n<TD>");
+
     switch(pData->steerable)
     {
       case CCTK_STEERABLE_ALWAYS : 
-	strcat(message,"<TR><TD><B>Steerable</B></TD><TD>Always</TD></TR>");
+	strcat(message,"Always");
 	break;
       case CCTK_STEERABLE_NEVER : 
-	strcat(message,"<TR><TD><B>Steerable</B></TD><TD>Never</TD></TR>");
+	strcat(message,"Never");
 	break;
       case CCTK_STEERABLE_RECOVER : 
-	strcat(message,"<TR><TD><B>Steerable</B></TD><TD>Recovery</TD></TR>");
+	strcat(message,"Recovery");
 	break;
       default  :
-	strcat(message,"<TR><TD><B>Steerable</B></TD><TD>Not matched</TD></TR>");
+	strcat(message,"Not matched");
     }
-
+    strcat(message,"</TD>\n</TR>\n");
     HTTP_Write(request, message, strlen(message));
 
+    strcpy(message,"<TR>\n"
+	   "<TD ALIGN=RIGHT VALIGN=TOP><B>Type:</B></TD>\n<TD>\n");
     switch(pData->type)
     {
       case PARAMETER_BOOLEAN : 
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>Boolean</TD></TR>");
+	strcat(message,"Boolean");
 	break;
       case PARAMETER_REAL : 
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>Real</TD></TR>");
+	strcat(message,"Real");
 	break;
       case PARAMETER_INTEGER : 
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>Integer</TD></TR>");
+	strcat(message,"Integer");
 	break;
       case PARAMETER_SENTENCE : 
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>Sentence</TD></TR>");
+	strcat(message,"Sentence");
 	break;
       case PARAMETER_STRING : 
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>String</TD></TR>");
+	strcat(message,"String");
 	break;
       case PARAMETER_KEYWORD : 
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>Keyword</TD></TR>");
+	strcat(message,"Keyword");
 	break;
       default :
-	strcat(message,"<TR><TD><B>Type</B></TD><TD>Not matched</TD></TR>");
+	strcat(message,"Not matched");
     }
+    strcat(message,"</TD>\n</TR>\n");
 
     HTTP_Write(request, message, strlen(message));
 
+    
+    strcpy(message,"<TR><TD ALIGN=RIGHT VALIGN=TOP><B>Scope:</B></TD><TD>");
     switch(pData->scope)
     {
       case SCOPE_GLOBAL : 
-	strcat(message,"<TR><TD><B>Scope</B></TD><TD>Global</TD></TR>");
+	strcat(message,"Global</TD></TR>");
 	break;
       case SCOPE_RESTRICTED : 
-	strcat(message,"<TR><TD><B>Scope</B></TD><TD>Restricted</TD></TR>");
+	strcat(message,"Restricted</TD></TR>");
 	break;
       case SCOPE_PRIVATE : 
-	strcat(message,"<TR><TD><B>Scope</B></TD><TD>Private</TD></TR>");
+	strcat(message,"Private</TD></TR>");
 	break;
       default :
-	strcat(message,"<TR><TD><B>Scope</B></TD><TD>Not matched</TD></TR>");
+	strcat(message,"Not matched</TD></TR>");
     }
 
     HTTP_Write(request, message, strlen(message));
 
+    strcpy(message,"");
+    first = 1;
     for(range = pData->range; range ; range = range->next)
     {
-      sprintf(message,"<TR><TD><B>Range</B></TD><TD>%s</TD></TR>",
-	      range->range);
+      if (first==1)
+      {
+	sprintf(message,
+		"%s<TR>\n"
+		"<TD ALIGN=RIGHT VALIGN=TOP>\n"
+		"<B>Range:</B>"
+		"</TD>\n<TD><DL>\n",
+		message,range->range);
+      }
+      first = 0;
+      sprintf(message,"%s<DT>%s\n<DD>%s\n",
+	      message,range->range,range->description);
+      if (!CCTK_Equals(range->origin,pData->thorn))
+      {
+	sprintf(message,"%s<BR>[Extended by thorn %s]\n",
+		message,range->origin);
+      }
     }		
+    if(first==0)
+    {
+      strcat(message,"</DL></TD>\n</TR>\n");
+    }
 
     HTTP_Write(request, message, strlen(message));
       
     sprintf(message,
-	    "<TR>"
-	    "<TD><B># Set</B></TD>\n"
-	    "<TD>%d</TD>"
-	    "</TR>"
-	    "</TABLE></CENTER>",
+	    "<TR>\n"
+	    "<TD ALIGN=RIGHT VALIGN=TOP><B>Times Set:</B></TD>\n"
+	    "<TD>%d</TD>\n"
+	    "</TR>\n"
+	    "</TABLE></CENTER>\n",
 	    pData->n_set);
     HTTP_Write(request, message, strlen(message));