Author: rmeggins
Update of /cvs/dirsec/dsgw/pbhtml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16950/dsgw/pbhtml
Modified Files:
alert.html.in carded.html.in confirm.html.in emptyFrame.html
index.html.in intro.html.in modify.html.in nonemp.html
nullStringError.html.in phone.html.in report.html.in
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is just the first pass. I focused mainly on the
phonebook pages, but the C code fixes will apply to dsgw too.
The goal is to make the pages clean with HTML Tidy running in Firefox 2.
Most of the template pages had to change because they had comments like
this:
<!-- ----- comment -----
HTML 4.01 does not like this - no sequence of -- or more dashes in a comment.
The other major change was the use of & instead of just a single & in
URLs for href and img src links. However, javascript does not like the
encoded entities, so I had to add some code to make sure we use the
unencoded form in javascript, so I added another option called "entities"
to the html template code, and added a function that will convert
encoded entities to their raw form in place.
I'm also adding some debugging shell scripts that can be used to debug
CGI programs.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet
Index: alert.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/alert.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alert.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ alert.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,18 +34,20 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<HTML>
<HEAD>
<TITLE>
<!-- DS_POSTEDVALUE "NAME=TITLE" -->
</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
</HEAD>
<BODY onLoad="document.OK.btn.focus();" bgcolor="#CCCCCC">
<TABLE cols=2 width="100%"><TR VALIGN=CENTER>
-<TD ALIGN=CENTER WIDTH=32><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT
-->&file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0"
ALT="Alert"></TD>
+<TD ALIGN=CENTER WIDTH=32><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT
-->&file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0"
ALT="Alert"></TD>
<TD>
<!-- DS_POSTEDVALUE "NAME=MSG" -->
</TD></TR></TABLE>
Index: carded.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/carded.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- carded.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ carded.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,14 +34,16 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+ "http://www.w3.org/TR/html4/frameset.dtd">
<html>
<head>
<title>vCard</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
</head>
-<script language=javascript>
+<script type="text/javascript">
function autoCloser(){
Index: confirm.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/confirm.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ confirm.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,19 +34,21 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<HTML>
<HEAD>
<TITLE>
<!-- DS_POSTEDVALUE "NAME=TITLE" -->
</TITLE>
<!-- DS_CONFIRM_SCRIPT -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
</HEAD>
<BODY>
<TABLE COLS=2 WIDTH="100%"><TR VALIGN=CENTER>
-<TD ALIGN=CENTER WIDTH=36><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT
-->&file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0"
ALT="Confirm"></TD><TD>
+<TD ALIGN=CENTER WIDTH=36><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT
-->&file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0"
ALT="Confirm"></TD><TD>
<!-- DS_POSTEDVALUE "NAME=MSG" -->
</TD></TR></TABLE>
<FORM><TABLE COLS=4 WIDTH="100%"><TR ALIGN=CENTER>
Index: emptyFrame.html
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/emptyFrame.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- emptyFrame.html 1 Jun 2006 19:43:47 -0000 1.1.1.1
+++ emptyFrame.html 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,5 +34,7 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<HTML><BODY BGCOLOR="white"></BODY></HTML>
Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/index.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ index.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+ "http://www.w3.org/TR/html4/frameset.dtd">
<html>
<head>
<meta name="description" content="Directory Express:
@@ -46,23 +48,23 @@
<frameset rows="64,*" frameborder="no" border="0"
framespacing="0">
<frame
- src="@cgiuri@/lang?<!-- GCONTEXT -->&file=phone.html"
+ src="@cgiuri@/lang?<!-- GCONTEXT -->&file=phone.html"
name="buttonBarFrame"
marginwidth="0"
marginheight="0"
scrolling="no"
<frame
- src="@cgiuri@/lang?<!-- GCONTEXT -->&file=intro.html"
+ src="@cgiuri@/lang?<!-- GCONTEXT -->&file=intro.html"
name="resultframe"
marginwidth="10"
marginheight="10"
scrolling="auto"
</frameset>
-<noframe>
+<noframes>
<body>
</body>
-</noframe>
+</noframes>
</html>
Index: intro.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/intro.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intro.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ intro.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,17 +34,19 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<title>Directory Express</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
</head>
<body bgcolor="#FFFFFF">
<!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif"
height="0" width="0" hspace="20" align="left"
border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif"
height="0" width="0" hspace="20" align="left"
border="0">
<table border="0" cellpadding="0" cellspacing="0"
width="90%" align="left">
<tr>
@@ -72,7 +74,7 @@
<br clear="ALL">
<!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif"
height="0" width="0" hspace="20" align="left"
border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif"
height="0" width="0" hspace="20" align="left"
border="0">
<table width="90%" border="0" cellpadding="0"
cellspacing="0" bgcolor="#CCCCCC" align="left">
@@ -84,7 +86,7 @@
</tr>
<tr>
<td>
-<!-- ------------------------------------------------------------- -->
+<!-- ############################################################# -->
<table border="0" cellpadding="1" cellspacing="0"
width="100%" bgcolor="white">
<tr align="left" class="bgColor4">
<td class="bgColor4">
@@ -108,7 +110,7 @@
</tr>
<tr align="left">
<td width="10">
- <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a person.'; return true" name="Person"><img
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif"
height="16" width="16" vspace="3"
border="0"></a>
+ <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a person.'; return true" name="Person"><img
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif"
height="16" width="16" vspace="3"
border="0"></a>
</td>
<td nowrap>
Jane Castle
@@ -131,7 +133,7 @@
</tr>
<tr align="left" bgcolor="#FFFFFF">
<td width="10">
- <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a person.'; return true" name="Person"><img
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif"
height="16" width="16" vspace="3"
border="0"></a>
+ <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a person.'; return true" name="Person2"><img
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif"
height="16" width="16" vspace="3"
border="0"></a>
</td>
<td nowrap>
John Castle
@@ -154,7 +156,7 @@
</tr>
<tr align="left" bgcolor="#FFFFFF">
<td width="10">
- <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a conference room.'; return true" name="Conference
Room"><img src="@cgiuri@/lang?<!-- GCONTEXT
-->&file=16-conference.gif" height="16" width="16"
vspace="3" border="0"></a>
+ <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a conference room.'; return true"
name="Conference_Room"><img src="@cgiuri@/lang?<!-- GCONTEXT
-->&file=16-conference.gif" height="16" width="16"
vspace="3" border="0"></a>
</td>
<td nowrap>
King's Castle
@@ -176,7 +178,7 @@
<td colspan="6"></td>
</tr> <tr align="left" bgcolor="#FFFFFF">
<td width="10">
- <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a person.'; return true" name="Person"><img
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif"
height="16" width="16" vspace="3"
border="0"></a>
+ <a href="javascript:void(0)" onMouseOver="top.status='This
entry is a person.'; return true" name="Person3"><img
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif"
height="16" width="16" vspace="3"
border="0"></a>
</td>
<td nowrap>
Quincy Castlegate
@@ -198,7 +200,7 @@
<td colspan="6"></td>
</tr>
</table>
-<!-- ------------------------------------------------------------- -->
+<!-- ############################################################# -->
</td>
</tr>
<tr align="left" bgcolor="#FFFFFF">
@@ -212,7 +214,7 @@
<br clear="ALL">
<!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif"
height="0" width="0" hspace="20" align="left"
border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif"
height="0" width="0" hspace="20" align="left"
border="0">
<table border="0" cellpadding="0" cellspacing="0"
width="90%" align="left">
<tr>
Index: modify.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/modify.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modify.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ modify.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,7 +34,7 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
<!--
| $Id$
|
@@ -48,6 +48,8 @@
|
+-------------------------------------------------------------------------- -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<HTML>
<HEAD>
<TITLE>
@@ -100,7 +102,7 @@
<HR>
<TABLE><TR><TD>
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif"
ALT="Person" HSPACE=5>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif"
ALT="Person" HSPACE=5>
</TD><TD><FONT SIZE="+2">
Your Name Here</FONT></TD>
<TD VALIGN=BOTTOM></TD>
@@ -163,7 +165,7 @@
<TD VALIGN="TOP" NOWRAP>Legal Name:</TD>
<TD VALIGN="top"><B>Employees:
<A HREF=/clients/dsgw/pbhtml/emptyFrame.html onClick="alert('Note: Please use
the HR form to update your Legal Name ONLY.')"> PeopleSoft
-Form</A><BR>Vendors, Services, and Other Contractors: <A
href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special
Email
+Form</A><BR>Vendors, Services, and Other Contractors: <A
href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special
Email
</A>
</B></TD>
</TR>
@@ -223,15 +225,15 @@
<TR>
<TD VALIGN="TOP">Business Category:</TD>
-<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special Email</A></B></TD>
+<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special Email</A></B></TD>
<TD VALIGN="TOP">Title:</TD>
-<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special
Email</A></B></TD></TR>
+<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special
Email</A></B></TD></TR>
<TR>
<TD VALIGN="TOP">Organizational Unit:</TD>
-<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special Email</A></B></TD>
+<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special Email</A></B></TD>
<TD VALIGN="TOP">Manager:</TD>
-<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft
Form</A><BR><B>Vendors, Services, and Other Contractors: <A
href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special
Email</A></B></TD></TR>
+<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft
Form</A><BR><B>Vendors, Services, and Other Contractors: <A
href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special
Email</A></B></TD></TR>
<TR>
<TD VALIGN="TOP">Cube #:</TD>
@@ -242,9 +244,9 @@
<TR>
<TD VALIGN="TOP">Dept#:</TD>
-<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special Email</A></B></TD>
+<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special Email</A></B></TD>
<TD VALIGN="TOP" BGCOLOR=teal><FONT
COLOR=lightyellow><B>Employee Status:</B></FONT></TD>
-<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&nonemp.html">Special Email</A></B></TD></TR>
+<TD VALIGN="TOP"><B>Employees:<A
HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors,
Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT
-->&file=nonemp.html">Special
Email</A></B></TD></TR>
<TR>
<TD VALIGN="TOP">Vehicle License#:</TD>
Index: nonemp.html
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/nonemp.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nonemp.html 1 Jun 2006 19:43:48 -0000 1.1.1.1
+++ nonemp.html 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,7 +34,7 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
<!--
| $Id$
|
Index: nullStringError.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/nullStringError.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nullStringError.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ nullStringError.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<title>Error!</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
</head>
<body bgcolor="white">
@@ -57,7 +59,7 @@
<table border="0">
<tr>
<td>
- <img src="@cgiuri@/lang?<!-- GCONTEXT
-->&file=32-alert.gif" height="32" width="32"
border="0">
+ <img src="@cgiuri@/lang?<!-- GCONTEXT
-->&file=32-alert.gif" height="32" width="32"
border="0">
</td>
<td>
Index: phone.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/phone.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phone.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ phone.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,13 +34,15 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type"
content="text/html;charset=utf-8">
<title>Directory Express</title>
-<script language="javascript">
+<script type="text/javascript">
//<!--
function gotourl(i){
@@ -49,12 +51,13 @@
//-->
</script>
-<script language="javascript"
src="/clients/dsgw/pbhtml/phone.js">
+<script type="text/javascript"
src="/clients/dsgw/pbhtml/phone.js">
</script>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!--
GCONTEXT -->&file=style.css">
</head>
-<body class="Search" onLoad="fieldFocus();"
marginwidth="0" marginheight="0" leftmargin="0"
topmargin="0">
+<body class="Search" onLoad="fieldFocus();"
style="marginwidth: 0; marginheight: 0; leftmargin: 0; topmargin: 0">
+<!-- <body class="Search" onLoad="fieldFocus();"
marginwidth="0" marginheight="0" leftmargin="0"
topmargin="0"> -->
<form method="post" name="searchform"
target="resultframe" action="@cgiuri@/dosearch" onSubmit="return
checkForNullString()">
@@ -67,26 +70,26 @@
<table BORDER="0" width="100%" cellpadding=0 cellspacing=0>
<TR>
-<TD valign="top" colspan="5" width="100%"><IMG
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"
width="1" height="5" border="0"></TD>
+<TD valign="top" colspan="5" width="100%"><IMG
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"
width="1" height="5" border="0"></TD>
</TR>
<tr>
<td>
-<IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"
width="10" height="40" border="0">
+<IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"
width="10" height="40" border="0">
</td>
-<TD ALIGN=LEFT VALIGN=CENTER nowrap>
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"
width="51" height="54" border="0"
align="left"></td>
-<TD valign="center" class="appName" nowrap>Directory
Express</td>
-<TD ALIGN=LEFT width="75%">
+<TD align="left" valign="middle" nowrap>
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"
width="51" height="54" border="0"
align="left"></td>
+<TD valign="middle" class="appName" nowrap>Directory
Express</td>
+<TD align="left" width="75%">
<TABLE BORDER=0>
<TR>
- <TD valign="top"><IMG src="@cgiuri@/lang?<!--
GCONTEXT -->&file=clear.gif" width="15" height="1"
border="0"></TD>
- <TD nowrap VALIGN=CENTER ALIGN=CENTER>
+ <TD valign="top"><IMG src="@cgiuri@/lang?<!--
GCONTEXT -->&file=clear.gif" width="15" height="1"
border="0"></TD>
+ <TD nowrap valign="middle" align="center">
<span class="apptext">Search for:</span>
</TD>
- <TD nowrap VALIGN=CENTER>
+ <TD nowrap valign="middle">
<span class="apptext">
- <font face=\"verdana, Arial, Helvetica, sans-serif\"
style=\"font-size: 12px\">
+ <font face="verdana, Arial, Helvetica, sans-serif" style="font-size:
12px">
<input type="text" name="searchstring"
size=30>
<input type="submit" value="Search"
name="submitbutton">
</font>
@@ -99,11 +102,11 @@
<!-- TR>
<td></td>
<td></td>
-<td align=left class="text30">(Enter any part of a name, user ID, or
phone number)
+<td align="left" class="text30">(Enter any part of a name, user
ID, or phone number)
</td></tr -->
<TR>
-<TD valign="top" colspan="5" width="100%"><IMG
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"
width="1" height="5" border="0"></TD>
+<TD valign="top" colspan="5" width="100%"><IMG
src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"
width="1" height="5" border="0"></TD>
</TR>
</table>
Index: report.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/report.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- report.html.in 14 Jan 2008 22:31:24 -0000 1.1
+++ report.html.in 6 Mar 2008 22:00:40 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
@@ -34,7 +34,7 @@
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
- --- END COPYRIGHT BLOCK --- -->
+ END COPYRIGHT BLOCK -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
@@ -45,7 +45,7 @@
<CENTER><P><FORM method="GET"
action="@cgiuri(a)/report.pl"
TARGET="response"></P></CENTER>
-<CENTER><P><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT
-->&pbrd.jpg" HEIGHT=46 WIDTH=491
ALIGN=ABSCENTER></P></CENTER>
+<CENTER><P><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT
-->&file=pbrd.jpg" HEIGHT=46 WIDTH=491
ALIGN=ABSCENTER></P></CENTER>
<CENTER><P><B><FONT SIZE=+1>Make a report that looks like this
table:</FONT></B>
</P></CENTER>