From 5c38d78508f623a313b95f80f7b8dba85b9a7472 Mon Sep 17 00:00:00 2001 From: swhite Date: Wed, 7 Apr 2004 16:16:06 +0000 Subject: Various HTML tweeks. Made to load with Amaya. git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPDExtra/trunk@51 61ea717e-8e0c-4c3c-b38e-e9c67f54f1f1 --- src/Groups.c | 18 +++++++++++++----- src/IO.c | 40 +++++++++++++++++++++++----------------- src/Processors.c | 17 ++++++++++++----- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/Groups.c b/src/Groups.c index eb3f248..53c9f06 100644 --- a/src/Groups.c +++ b/src/Groups.c @@ -153,6 +153,11 @@ static int MessagesPage (const cGH *GH, httpRequest *request, void *data) SetHTML_HeadHeader( message); Send_HTTP_String(request, message ); + Send_HTTP(request, "\n"); + Send_HTTP(request, "\n\n"); + /* Write out the header part */ SetHTML_ContentHeader(GH, 0, message, NULL); Send_HTTP_String(request, message); @@ -163,24 +168,27 @@ static int MessagesPage (const cGH *GH, httpRequest *request, void *data) "simulation. At the moment the messages will disappear \n" "when the simulation finishes, but soon there will be an \n" "option to save them to a file.

\n" - "
\n" + "
" + "\n" + "
\n" "" "\n" + "value=\"\" />\n" "
Name:
Message:" "\n" "
\n" - "\n" + "\n" "\n" "
\n" "

Messages:

" - "
" ); + "
" ); temp = message_board ? message_board : "No messages yet ... use the form above to add one"; Send_HTTP (request, temp ); - Send_HTTP (request, "
" ); + Send_HTTP (request, "\n" ); + Send_HTTP (request, "\n\n\n" ); /* Write out the footer part. */ SetHTML_ContentFooter(GH, 0, message); diff --git a/src/IO.c b/src/IO.c index cfaf886..e8c24af 100644 --- a/src/IO.c +++ b/src/IO.c @@ -224,7 +224,9 @@ static int AdvertisedFilePage(const cGH *GH, httpRequest *request, void *data) SetHTML_HeadHeader( message); Send_HTTP_String(request, message ); - + + Send_HTTP(request, "\n\n"); + /* HTTP_Write out the header part. */ SetHTML_ContentHeader(GH, 0, message, NULL); Send_HTTP_String(request, message); @@ -243,9 +245,11 @@ static int AdvertisedFilePage(const cGH *GH, httpRequest *request, void *data) "allow you to e.g. add fields and customise behaviour.\n" "Depending on your authorisation, you can access the \n" "parameter steering page

\n" - "
\n" - "" - "\n"); + "
\n" + "
File NameVariableDescription
\n" + "\n" + "\n" + "\n\n"); for (list = filelist; list; list = list->next) { @@ -263,7 +267,7 @@ static int AdvertisedFilePage(const cGH *GH, httpRequest *request, void *data) Send_HTTP_String(request, message); } - Send_HTTP(request,"
File NameVariableDescription
"); + Send_HTTP(request,"\n"); /* Write out the footer part. */ SetHTML_ContentFooter(GH, 0, message); @@ -315,9 +319,9 @@ static int SendFilePage(const cGH *GH, httpRequest *request, void *data) Send_HTTP(request, "\n\n"); Send_HTTP(request, "Error 500: Internal Error\n"); Send_HTTP(request, "\n\n"); - Send_HTTP(request, "

Unable to open " ); + Send_HTTP(request, "

Unable to open " ); Send_HTTP(request, list->filename ); - Send_HTTP(request, "

\n"); + Send_HTTP(request, "

\n"); Send_HTTP(request, "\n\n" ); } break; @@ -333,9 +337,9 @@ static int SendFilePage(const cGH *GH, httpRequest *request, void *data) Send_HTTP(request, "\n\n" ); Send_HTTP(request, "Error 404: Not Found\n" ); Send_HTTP(request, "\n\n" ); - Send_HTTP(request, "

" ); + Send_HTTP(request, "

" ); Send_HTTP(request, request->uri ); - Send_HTTP(request, " does not exist

\n" ); + Send_HTTP(request, " does not exist

\n" ); Send_HTTP(request, "\n\n" ); } return 0; @@ -373,21 +377,24 @@ static int ViewportFilePage(const cGH *GH, httpRequest *request, void *data) SetHTML_HeadHeader( message); Send_HTTP_String(request, message ); + Send_HTTP(request, "\n\n"); + /* HTTP_Write out the header part. */ SetHTML_ContentHeader(GH, 0, message, NULL); Send_HTTP_String(request, message); - Send_HTTP(request, "

Viewport

"); + Send_HTTP(request, "

Viewport

\n"); Send_HTTP(request, "

This page displays certain types of the output files \n" "from the download page \n" - "as images (currently only jpegs [mime type image/jpeg]).

\n" + "as images (currently only JPEGs [mime type image/jpeg]).

\n" "

Many IO methods have steerable parameters which \n" "allow you to e.g. add fields and customise behaviour.\n" "Depending on your authorisation, you can access the \n" - "parameter steering page

\n"); + "parameter steering page

\n" + "
\n"); for (list = filelist; list; list = list->next) { @@ -396,8 +403,7 @@ static int ViewportFilePage(const cGH *GH, httpRequest *request, void *data) if (!foundone) { Send_HTTP(request, - "
" - "" + "
\n" "\n" "\n"); foundone = 1; @@ -428,12 +434,12 @@ static int ViewportFilePage(const cGH *GH, httpRequest *request, void *data) if (!foundone) { - Send_HTTP(request, "

No viewable images registered!

" - "
\n"); + Send_HTTP(request, "\n

No viewable images registered!

\n" + "\n"); } - Send_HTTP(request, "
Variable
File Name		DescriptionImage
\n
\n"); + Send_HTTP(request, "
\n"); /* Write out the footer part. */ diff --git a/src/Processors.c b/src/Processors.c index f0c3527..fb6330e 100644 --- a/src/Processors.c +++ b/src/Processors.c @@ -109,7 +109,14 @@ static int ProcessorsPage(const cGH *cctkGH, httpRequest *request, void *data) SetHTML_HeadHeader( message); Send_HTTP_String(request, message ); - + + Send_HTTP(request, "\n"); + Send_HTTP(request, "\n\n"); + /* HTTP_Write out the header part. */ SetHTML_ContentHeader(cctkGH, 0, message, NULL); retval = Send_HTTP_String(request, message); @@ -117,7 +124,7 @@ static int ProcessorsPage(const cGH *cctkGH, httpRequest *request, void *data) Send_HTTP(request, "

Processor Information

\n"); Send_HTTP(request, - "
\n\n" + "
\n
\n" "" "\n" "\n" @@ -126,15 +133,15 @@ static int ProcessorsPage(const cGH *cctkGH, httpRequest *request, void *data) nprocs = CCTK_nProcs(cctkGH); for (np=0;np\n"); Send_HTTP_String(request, message ); } - retval = Send_HTTP(request, "
NumberMachine Name" ); + SetToCString( message, "
" ); ConcatDecimal( message, np ); - ConcatCString( message, "" ); + ConcatCString( message, "" ); ConcatCString( message, HTTPDExtra_RemoteHostName(np) ); ConcatCString( message, "
\n
\n"); + retval = Send_HTTP(request, "\n\n"); SetHTML_ContentFooter(cctkGH, 0, message); retval = Send_HTTP_String(request, message); -- cgit v1.2.3