[Fedora-directory-commits] dsgw/orgbin myorg.in, 1.4, 1.5 org.in, 1.6, 1.7

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Tue Apr 1 20:10:13 UTC 2008


Author: rmeggins

Update of /cvs/dirsec/dsgw/orgbin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/dsgw/orgbin

Modified Files:
	myorg.in org.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the third pass, fixing the orgchart.
Nothing really major, just fixing mostly table, tr, td, and img attributes.  Tried to be a little smarter about when to actually create table rows - html tidy does not like empty table rows.
Platforms tested: RHEL5 x86_64
Flag day: no
Doc: none yet



Index: myorg.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/myorg.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- myorg.in	20 Mar 2008 02:18:43 -0000	1.4
+++ myorg.in	1 Apr 2008 20:10:11 -0000	1.5
@@ -160,7 +160,7 @@
 print "
 
 <body bgcolor=\"#FFFFFF\" style=\"leftmargin:0; topmargin:0; marginwidth:0; marginheight:0\" onLoad=\"initValues()\">
-<FORM name=\"customize\">
+<FORM name=\"customize\" action=\"javascript:void();\">
 
 
 <table width=\"500\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" align=\"center\">
@@ -176,7 +176,7 @@
 <tr>
     <td height=\"236\" valign=\"top\">
 	  <table width=\"100%\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\">
-	    <tr height=\"7\"></tr>
+	    <tr style=\"height:7\"><td></td></tr>
 ";
 
 
@@ -193,7 +193,7 @@
           <td width=\"28\" height=\"21\" valign=\"top\"> </td>
           <td valign=\"top\" colspan=\"4\" class=\"prefsPageHead\">Icon Settings</td>
         </tr>
-		<tr height =\"7\"></tr>
+		<tr style=\"height:7\"><td></td></tr>
         <tr>
 		  <td width=\"35\" height=\"21\"></td>
           <td width=\"35\" valign=\"top\" class=\"prefsPageData\">Icon:</td>
@@ -213,14 +213,14 @@
 
 	print "
 
-		<tr height=\"6\"></tr>
+		<tr style=\"height:6\"><td></td></tr>
 		  <tr>
           <td width=\"33\" height=\"21\"></td>
           <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/mail.gif\" alt=\"\" width=\"14\" height=\"16\" border=\"0\"></td>
           <td width=\"25\"></td>
           <td width=\"105\" valign=\"top\" class=\"prefsPageData\">EMail</td>
           <td width=\"21\"></td>
-          <td width=\"205\" valign=\"center\" class=\"prefsPageData\"><select NAME=\"email\">
+          <td width=\"205\" valign=\"middle\" class=\"prefsPageData\"><select NAME=\"email\">
 ";
 
 # --------------------------------------------
@@ -248,14 +248,14 @@
 if ( $config_tokens{"icons-phonebook-visible"} ne "disabled" )
 {
 	print "
-		<tr height=\"6\"></tr>
+		<tr style=\"height:6\"><td></td></tr>
 		  <tr>
           <td width=\"33\" height=\"21\"></td>
           <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/ldap-person.gif\" alt=\"\" width=\"12\" height=\"16\" border=\"0\"></td>
           <td width=\"25\"></td>
           <td width=\"125\" valign=\"top\" class=\"prefsPageData\" nowrap>Phonebook Entry</td>
           <td width=\"21\"></td>
-          <td width=\"205\" valign=\"center\" class=\"prefsPageData\"><select NAME=\"phonebook\">
+          <td width=\"205\" valign=\"middle\" class=\"prefsPageData\"><select NAME=\"phonebook\">
 ";
 
 # --------------------------------------------
@@ -284,7 +284,7 @@
 
 	print "
 
-		<tr height=\"6\"></tr>
+		<tr style=\"height:6\"><td></td></tr>
 		  <tr>
           <td width=\"33\" height=\"21\"></td>
           <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/mag.gif\" alt=\"\" width=\"15\" height=\"15\" border=\"0\"></td>
@@ -320,7 +320,7 @@
 {
 
 	print "
-		  <tr height=\"6\"></tr>
+		  <tr style=\"height:6\"><td></td></tr>
 		  <tr>
           <td width=\"33\" height=\"21\"></td>
           <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/aim-online.gif\" alt=\"\" width=\"15\" height=\"15\" border=\"0\"></td>
@@ -356,7 +356,7 @@
 if ( "$all_icons_disabled" eq "no" )
 {
 	print "
-		<tr height=\"15\">
+		<tr style=\"height:15\"><td></td>
 		</tr>
 		<tr>
 		<td width=\"28\" height=\"21\" valign=\"top\"> </td>
@@ -370,7 +370,7 @@
           <td width=\"28\" height=\"21\" valign=\"top\"> </td>
           <td valign=\"top\" colspan=\"4\" class=\"prefsPageHead\">Organization Chart Depth</td>
 	    </tr>
-		<tr height=\"10\">
+		<tr style=\"height:10\"><td></td>
 		</tr>
 		<tr>
 		  <td width=\"35\" height=\"28\"></td>
@@ -394,7 +394,7 @@
 			</select></td>
 			<td width=\"350\" colspan=\"3\" class=\"prefsPageData\">  levels of organization depth</td>
 		  </tr>
-		  <td height=\"30\"></td>
+		  <tr style=\"height:30\"><td></td></tr>
       </table>
     </td>
   </tr>
@@ -406,7 +406,7 @@
 	<td height=\"20\"> </td></tr>
 	<tr>
 	<td align=\"right\"><input type=\"button\" name=\"save\" value=\"       Finished       \" onClick=\"saveSettings();\"></td>
-	<td width=\"20\"</td>
+	<td width=\"20\"></td>
 	<td><input type=\"button\" name=\"del_cookie\" value=\"Restore Defaults\" onClick=\"deleteCookie();\"></td>
 	</tr>
 	</table>


Index: org.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/org.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- org.in	6 Mar 2008 22:00:39 -0000	1.6
+++ org.in	1 Apr 2008 20:10:11 -0000	1.7
@@ -364,6 +364,7 @@
 #
 ##########################################
 
+my $need_end_td_tag = 0;
 &draw_remaining_branches();
 
 ##########################################
@@ -374,11 +375,15 @@
 #
 ##########################################
 
-print "</TD></TR></TABLE></center>";
+if ($need_end_td_tag) {
+    print "</TD></TR></TABLE></center>";
+}
+
 print "\n\n";
 print "<BR><BR><HR>\n$fontstring";
 print "Total number of reports shown above: " . $total . "\n</font><BR><BR><BR><BR><BR><BR><BR><BR>";
-print "</TD><TD NOWRAP>                                   </TD></TABLE></CENTER></BODY></HTML>\n";
+print "</TD></TR>\n";
+print "</TABLE></CENTER></BODY></HTML>\n";
 
 exit;
 
@@ -550,7 +555,7 @@
 	if ( ($visible eq "forefront") && (!($print_mode)) )
 	{
 		print " <a href=\"$config_tokens{\"url-locator-base\"}";
-		print "$locator\"><img src=\"@orguri@/mag.gif\" border=0 align=TEXTTOP></a>";
+		print "$locator\"><img src=\"@orguri@/mag.gif\" border=0 align=\"top\"></a>";
 	}
 
 	return;
@@ -574,7 +579,7 @@
 
 		print " <a href=\"$config_tokens{'url-phonebook-base'}";
 		print "$dn\">";
-		print "<img src=\"@orguri@/ldap-person.gif \" border=0 align=TEXTTOP>";
+		print "<img src=\"@orguri@/ldap-person.gif \" border=0 align=\"top\">";
 		print "</a>";
 	}
 
@@ -597,7 +602,7 @@
 	if ( ($visible eq "forefront") &&  ( $email =~ /@/ ) && (!($print_mode)) )
 	{
 		print " <a href=\"mailto:$email\">";
-		print "<img src=\"@orguri@/mail.gif \" border=0 align=TEXTTOP>";
+		print "<img src=\"@orguri@/mail.gif \" border=0 align=\"top\">";
 		print "</a>";
 	}
 
@@ -635,7 +640,7 @@
 		{
 			$screenname =~ tr/ /+/;
 			print " <a href=\"aim:goim?Screenname=$screenname\">";
-			print "<img src=\"@orguri@/aim-online.gif\" border=0 align=TEXTTOP></a>";
+			print "<img src=\"@orguri@/aim-online.gif\" border=0 align=\"top\"></a>";
 		}
 	}
 
@@ -774,7 +779,7 @@
 sub print_javascript
 {
 
-print "<SCRIPT>
+print "<SCRIPT type=\"text/javascript\">
 
 
 var left = 0;
@@ -837,8 +842,8 @@
 	hideLayer();
 
 	finalhtml  =  '<TABLE border=1 CELLPADDING=15 BGCOLOR=\"#CCCCCC\"><TR><TD><TABLE BORDER=0>';
-	finalhtml +=  '<TR><TD COLSPAN=2 NOWRAP>$fontstring<B>' + unescape(cn) + '</B></font></TD></TR>';
-	finalhtml +=  '<TR><TD COLSPAN=2 NOWRAP>$fontstring' + title + '</font></TD></TR>';
+	finalhtml +=  '<TR><TD COLSPAN=2 NOWRAP>$fontstring<B>' + unescape(cn) + '<\\/B><\\/font><\\/TD><\\/TR>';
+	finalhtml +=  '<TR><TD COLSPAN=2 NOWRAP>$fontstring' + title + '<\\/font><\\/TD><\\/TR>';
 	finalhtml +=  '<TR><TD COLSPAN=2 NOWRAP>';
 
 	if (  (mail == '(none)') && (dn == '(none)') && (locator == '(none)') && (aimid == '(none)')  )
@@ -850,47 +855,47 @@
 		finalhtml +=  '<HR>';
 	}
 
-	finalhtml +=  '</TD></TR>';
+	finalhtml +=  '<\\/TD><\\/TR>';
 
 	if ( mail != '(none)' )
 	{
 		finalhtml +=  '<TR><TD align=center><a href=\"mailto:' + mail + '\">';
-		finalhtml +=  '<img src=\"@orguri@/mail.gif\" border=0 align=TEXTTOP></a></TD>';
+		finalhtml +=  '<img src=\"@orguri@/mail.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
 		finalhtml +=  '<TD NOWRAP>$fontstring    ';
-		finalhtml +=  '<a href=\"mailto:' + mail + '\">Email</a></font></TD></TR>';
+		finalhtml +=  '<a href=\"mailto:' + mail + '\">Email<\\/a><\\/font><\\/TD><\\/TR>';
 	}
 
 	if ( dn != '(none)' )
 	{
 		finalhtml +=  '<TR><TD align=center>';
 		finalhtml +=  '<a href=\"$config_tokens{\"url-phonebook-base\"}';
-		finalhtml +=  dn + '\"><img src=\"@orguri@/ldap-person.gif\" border=0 align=TEXTTOP></a></TD>';
+		finalhtml +=  dn + '\"><img src=\"@orguri@/ldap-person.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
 		finalhtml +=  '<TD NOWRAP>$fontstring    ';
 		finalhtml +=  '<a href=\"$config_tokens{\"url-phonebook-base\"}' + dn + '\">';
-		finalhtml +=  'Phonebook</a></font></TD></TR>';
+		finalhtml +=  'Phonebook<\\/a><\\/font><\\/TD><\\/TR>';
 	}
 
 	if ( locator != '(none)' )
 	{
 		finalhtml +=  '<TR><TD align=center>';
 		finalhtml +=  '<a href=\"$config_tokens{\"url-locator-base\"}';
-		finalhtml +=  locator + '\"><img src=\"@orguri@/mag.gif\" border=0 align=TEXTTOP></a></TD>';
+		finalhtml +=  locator + '\"><img src=\"@orguri@/mag.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
 		finalhtml +=  '<TD NOWRAP>$fontstring    ';
 		finalhtml +=  '<a href=\"$config_tokens{\"url-locator-base\"}' + locator + '\">';
-		finalhtml +=  'Locator</a></font></TD></TR>';
+		finalhtml +=  'Locator<\\/a><\\/font><\\/TD><\\/TR>';
 	}
 
 	if ( aimid != '(none)' )
 	{
 		finalhtml +=  '<TR><TD align=center>';
 		finalhtml +=  '<a href=\"aim:goim?Screenname=' + aimid + '\">';
-		finalhtml +=  '<img src=\"@orguri@/aim-online.gif\" border=0 align=TEXTTOP></a></TD>';
+		finalhtml +=  '<img src=\"@orguri@/aim-online.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
 		finalhtml +=  '<TD NOWRAP>$fontstring    ';
 		finalhtml +=  '<a href=\"aim:goim?Screenname=' + aimid + '\">';
-		finalhtml +=  'Currently online</a></font></TD></TR>';
+		finalhtml +=  'Currently online<\\/a><\\/font><\\/TD><\\/TR>';
 	}
 
-	finalhtml +=   '</TABLE></TD></TR></TABLE>';
+	finalhtml +=   '<\\/TABLE><\\/TD><\\/TR><\\/TABLE>';
 
 
 	if ( W3C )
@@ -1341,7 +1346,7 @@
 			}
 			else
 			{
-				$results[$anothertempnum][2] = "&nbsp";
+				$results[$anothertempnum][2] = " ";
 			}
 	
 			if ( $entry->{mail}[0] ne "" )
@@ -1353,7 +1358,7 @@
 			}
 			else
 			{
-				$results[$anothertempnum][3] = "&nbsp";
+				$results[$anothertempnum][3] = " ";
 			}
 
 			if ( $entry->{businesscategory}[0] ne "" )
@@ -1362,7 +1367,7 @@
 			}
 			else
 			{
-				$results[$anothertempnum][4] = "&nbsp";
+				$results[$anothertempnum][4] = " ";
 			}
 
 
@@ -1372,7 +1377,7 @@
 			}
 			else
 			{
-				$results[$anothertempnum][5] = "&nbsp";
+				$results[$anothertempnum][5] = " ";
 			}
 
 			$lastentry = $entry;
@@ -1407,14 +1412,14 @@
 print "
 
 <br>
-<table cellspacing=\"-1\" cellpadding=\"2\" border=\"0\" width=\"100%\">
+<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" width=\"100%\">
 <tr>
 <td align=\"left\" class=\"pageHeader\">Search Results: $anothertempnum users</td>
 <td align=\"right\" class=\"searchHelp\"><img src=\"@orguri@/orgicon.gif\" width=\"16\" height=\"14\" border=\"0\"> = view organization chart</td>
 </tr>
 <tr><td> </td></tr>
 </table>
-<table bgcolor=\"#FFFFFF\" cellspacing=\"-1\" cellpadding=\"3\" border=\"1\" width=\"100%\">
+<table bgcolor=\"#FFFFFF\" cellspacing=\"0\" cellpadding=\"3\" border=\"1\" width=\"100%\">
 <tr>
     <th align=\"left\" class=\"resultsHeader\">Name</th>
     <th align=\"left\" class=\"resultsHeader\">Phone</th>
@@ -1473,13 +1478,11 @@
 		#
 		print "<font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\">";
 
-		print "<a href=\"org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'}  . "=" . url_encode($uid) .  "&print=yes\" target=\"org_print_window\">Prepare this page for printing</A><BR>";
+		print "<a href=\"org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'}  . "=" . url_encode($uid) .  "&print=yes\" target=\"org_print_window\">Prepare this page for printing</A><BR>";
 		print "</font>";
 	}
 
-	print "<CENTER><table border=0><tr><td NOWRAP>";
-
-	print "<center>";
+	print "<CENTER><table border=0><tr><td NOWRAP align=center>";
 
 	#
 	# special exception:  seems like when hardcopy printing org chart from IE browser,
@@ -1492,16 +1495,16 @@
 	}
 	else
 	{
-		print "<table border=0  CELLSPACING=1 > \n";
+		print "<table border=0 CELLSPACING=1 > \n";
 	}
 
 	print "<tr>\n";
 	print "<td ALIGN=CENTER BGCOLOR=\"#000000\" NOWRAP>\n"; 
 	print "<table border=0 CELLSPACING=0 CELLPADDING=6 >\n"; 
 	print "<tr>\n";
-	print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=CENTER NOWRAP>\n"; 
+	print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=MIDDLE NOWRAP>\n"; 
 	print "<table cellspacing=0 border=0><tr><td NOWRAP>";
-	print "$fontstring<center>";
+	print "<center>$fontstring";
 
 	$tempstr = url_encode($entry->{dn});
 	$tempstr2  = url_encode($entry->{cn}[0]);
@@ -1514,8 +1517,8 @@
 
 	if ( !($print_mode) )
 	{
-		print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$tempstr2','$title','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
-		print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>";
+		print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$tempstr2','$title','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+		print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">";
 		print "</A> \n";
 	}
 
@@ -1559,8 +1562,8 @@
 
 		if ( !($print_mode) )
 		{
-			print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$tempstr2','$managertitle','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
-			print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>";
+			print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$tempstr2','$managertitle','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+			print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">";
 			print "</A> \n";
 		}
 
@@ -1568,22 +1571,21 @@
 
 		if ( !($print_mode) )
 		{
-			print " <A HREF=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($manager) . "><img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>";
+			print " <A HREF=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($manager) . "><img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>";
 		}
 
 		print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, $managerEntry->{nsAIMStatusText}[0], $managerEntry->{nsaimid}[0] );
 		print_email_icon_if_outside_layer( $config_tokens{"icons-email-visible"}, $managerEntry->{mail}[0] );
 		print_pb_icon_if_outside_layer( $config_tokens{"icons-phonebook-visible"}, $tempstr );
 		print_locator_icon_if_outside_layer( $config_tokens{"icons-locator-visible"}, $tempstr2 );
-
-		print "</font>";
 	}
 
 	if (!$managerEntry)
 	{
 		print "<B>(no manager listed)</B>";
 	}
-
+    print "</font>";
+		
 	print"</center></td> </tr> </table> </td> </tr> </table> </td> </tr> </table> <BR>";
 }
 
@@ -1634,7 +1636,7 @@
 			if ( "$entry" ne "$nextentry" )
 			{
 				print "$fontstring";
-				print "\n<img SRC=\"@orguri@/new-branch-first.gif\" align=TEXTTOP>";
+				print "\n<img SRC=\"@orguri@/new-branch-first.gif\" align=\"top\">";
 
 				$aimid = is_aimid_in_layer ( $config_tokens{"icons-aim-visible"} , "discover" , $sortedPeople[$tempnum][5] );
 				$emailstr = is_email_in_layer ( $config_tokens{"icons-email-visible"}, $sortedPeople[$tempnum][3] );
@@ -1643,8 +1645,8 @@
 
 				if ( !($print_mode) )
 				{
-					print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
-					print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>";
+					print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+					print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">";
 					print "</A> \n";
 				}
 
@@ -1658,7 +1660,7 @@
 					#  to the person's name, to indicate they have people below them.
 					#
 					print "<a href=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($sortedPeople[$tempnum][1]) . ">";
-					print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>";
+					print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>";
 				}
 
 				print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, "discover", $sortedPeople[$tempnum][5] );
@@ -1798,9 +1800,7 @@
 
 sub draw_remaining_branches()
 {
-
-	print "\n"; 
-	print "<center><table border=0 cellpadding=10><tr VALIGN=top>";
+	my $start_center_table_tr = "\n<center><table border=0 cellpadding=10><tr VALIGN=top>";
 
 	$current_indent = 1;
 	$one_time_td = 0;
@@ -1829,6 +1829,7 @@
 			{
 				if ( $one_time_td == 0 )
 				{
+					print $start_center_table_tr;
 					print "<TD NOWRAP>\n"; 
 					$one_time_td = 1;
 				}
@@ -1836,6 +1837,7 @@
 				{
 					print "</TD><TD NOWRAP>\n";
 				}
+				$need_end_td_tag = 1; # have a begin TD tag, need to close it
 			}
 
 
@@ -1858,9 +1860,11 @@
 				print "<td ALIGN=CENTER BGCOLOR=\"#000000\">\n"; 
 				print "<table border=0 CELLSPACING=0 CELLPADDING=6 >\n"; 
 				print "<tr>\n";
-				print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=CENTER>\n"; 
+				print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=MIDDLE>\n"; 
 				print "<table cellspacing=0 border=0><tr><td NOWRAP><CENTER>";
 
+				$need_end_td_tag = 1; # have a begin TD tag, need to close it
+
 				#
 				#  See comment just a few lines below about being careful on 
 				#  not moving this font tag past the IMG SRC tags
@@ -1881,25 +1885,25 @@
 				{
 					for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ )
 					{
-						print "<img SRC=\"@orguri@/new-branch-blank.gif\" align=TEXTTOP>";
+						print "<img SRC=\"@orguri@/new-branch-blank.gif\" align=\"top\">";
 					}
 				}
 				else
 				{
 					for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ )
 					{
-						print "<img SRC=\"@orguri@/new-branch-straight.gif\" align=TEXTTOP>";
+						print "<img SRC=\"@orguri@/new-branch-straight.gif\" align=\"top\">";
 					}
 				}
 
 
 				if ( ("$sortedPeople[$tempnum][8]" eq "cc1")  ||  ( $sortedPeople[$tempnum][8] =~ /rounded/  )  )
 				{
-					print "<img SRC=\"@orguri@/branch-cc1.gif\" align=TEXTTOP>";
+					print "<img SRC=\"@orguri@/branch-cc1.gif\" align=\"top\">";
 				}
 				else
 				{
-					print "<img SRC=\"@orguri@/new-branch-first.gif\" align=TEXTTOP>";
+					print "<img SRC=\"@orguri@/new-branch-first.gif\" align=\"top\">";
 				}
 			}
 
@@ -1911,8 +1915,8 @@
 
 			if ( !($print_mode) )
 			{
-				print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
-				print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>";
+				print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+				print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">";
 				print "</A> \n";
 			}
 
@@ -1954,7 +1958,7 @@
 						if  (  !(     $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]\/$/    )    )
 						{
 							print "<a href=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($sortedPeople[$tempnum][1]) . ">";
-							print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>";
+							print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>";
 						}
 					}
 				}




More information about the Fedora-directory-commits mailing list