From 38e34cb5eee62307a2edeeda1c546f6f0db4ede5 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Apr 01 2008 20:10:11 +0000 Subject: 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 --- diff --git a/orgbin/myorg.in b/orgbin/myorg.in index 08ee7ff..d9c98fc 100755 --- a/orgbin/myorg.in +++ b/orgbin/myorg.in @@ -160,7 +160,7 @@ sub print_body() print " -
+ @@ -176,7 +176,7 @@ print " @@ -406,7 +406,7 @@ print " -
- + "; @@ -193,7 +193,7 @@ if ( "$all_icons_disabled" eq "no" ) - + @@ -213,14 +213,14 @@ if ( $config_tokens{"icons-email-visible"} ne "disabled" ) print " - + - + - + @@ -320,7 +320,7 @@ if ( $config_tokens{"icons-aim-visible"} ne "disabled" ) { print " - + @@ -356,7 +356,7 @@ print " if ( "$all_icons_disabled" eq "no" ) { print " - + @@ -370,7 +370,7 @@ print " - + @@ -394,7 +394,7 @@ print " - +
  Icon Settings
Icon:
 \"\" EMail
 \"\" Phonebook Entry
 \"\"
 \"\"
   Organization Chart Depth
  levels of organization depth
 
+
diff --git a/orgbin/org.in b/orgbin/org.in index 3df96f4..c6ac390 100755 --- a/orgbin/org.in +++ b/orgbin/org.in @@ -364,6 +364,7 @@ else # ########################################## +my $need_end_td_tag = 0; &draw_remaining_branches(); ########################################## @@ -374,11 +375,15 @@ else # ########################################## -print ""; +if ($need_end_td_tag) { + print ""; +} + print "\n\n"; print "

\n$fontstring"; print "Total number of reports shown above: " . $total . "\n







"; -print "                                   \n"; +print "\n"; +print "\n"; exit; @@ -550,7 +555,7 @@ sub print_locator_icon_if_outside_layer if ( ($visible eq "forefront") && (!($print_mode)) ) { print " "; + print "$locator\">"; } return; @@ -574,7 +579,7 @@ sub print_pb_icon_if_outside_layer print " "; - print ""; + print ""; print ""; } @@ -597,7 +602,7 @@ sub print_email_icon_if_outside_layer if ( ($visible eq "forefront") && ( $email =~ /@/ ) && (!($print_mode)) ) { print " "; - print ""; + print ""; print ""; } @@ -635,7 +640,7 @@ sub print_aim_icon_if_outside_layer { $screenname =~ tr/ /+/; print " "; - print ""; + print ""; } } @@ -774,7 +779,7 @@ sub url_encode sub print_javascript { -print "