--- ConnorCalendar/calendar.pl	2013/05/29 02:53:46	1.5
+++ ConnorCalendar/calendar.pl	2013/05/30 14:38:50	1.7
@@ -8,7 +8,7 @@
 |
 |   Nicholas DeClario <nick@demandred.dyndns.org>
 |   March 2009
-|	$Id: calendar.pl,v 1.5 2013/05/29 02:53:46 nick Exp $
+|	$Id: calendar.pl,v 1.7 2013/05/30 14:38:50 nick Exp $
 |
 +------------------------------------------------------------------------------
 =end comment
@@ -26,7 +26,7 @@ use Calendar::Simple;
 use Date::Calendar::Year qw( :all );
 use Date::Calendar::Profiles qw( $Profiles );
 
-my $VERSION  = q/$Id: calendar.pl,v 1.5 2013/05/29 02:53:46 nick Exp $/;
+my $VERSION  = q/$Id: calendar.pl,v 1.7 2013/05/30 14:38:50 nick Exp $/;
 my $DEBUG    = "";
 my $URL	     = "http://demandred.dyndns.org/cgi-bin/ConnorCalendar/index.cgi";
 my %post_in  = ( );
@@ -35,6 +35,7 @@ my @list     = ( );
 my @months   = qw/ January February March April May June July 
 		   August September October November December /;
 my %holidays = ( 
+		 "Easter Sunday"	=> 'even',
 		 "Christmas Day"	=> 'even',
 		 "Christmas Eve"	=> 'odd',
 		 "Father's Day"		=> 'all',
@@ -42,7 +43,7 @@ my %holidays = (
 		 "Labor Day"		=> 'even',
 		 "Memorial Day"		=> 'odd',
 		 "New Year's Day"	=> 'even',
-		 "New Year's Eve"	=> 'odd',
+		 "New Year's Eve"	=> 'even',
 		 "Thanksgiving Day"	=> 'odd', 
 	       );
 
@@ -57,25 +58,18 @@ my %weekends = &calcWeekends( @weekend )
 
 my $yr =  sprintf( "%d", $post_in{'cy'} ) || ( ( localtime )[5] + 1900 );
 my $YEAR = sprintf( "%d", $yr );
+push @list, 'Easter Sunday' if ( ! $YEAR % 2 );
 
 print "Content-type: text/html\n\n";
 print &header( );
 print &css( );
-print "<h1>Calendar for $YEAR</h1>\n";
-print "</p>Holidays I have Connor are in <font color=red>Red</font>\n</br>";
-print "Today is <font color=blue>Blue</font>\n</br>";
-print "Weekends and special days I have Connor are in <font color=green>Green</font>\n</p>";
-
 my $year_us = Date::Calendar::Year->new( $YEAR, $Profiles->{'US-FL'} );
 my @hdays = $year_us->labels( );
 
-#$DEBUG = "Holidays for $YEAR:\n";
-#foreach ( sort @hdays ) { $DEBUG .= $_ ."\n"; }
-
-
-print "<center><a href=\"$URL?cy=" . ( $YEAR - 1 ) .
-      "\">&lt;--</a> <b>$YEAR</b> " .
-       "<a href=\"$URL?cy=" . ( $YEAR + 1 ) . "\">--&gt;</a></center>";
+print "<h1><center><a href=\"$URL?cy=" . ( $YEAR - 1 ) .
+      "\">&lt;--</a> " .
+      "Calendar Days Connor Visits for $YEAR" .
+       "<a href=\"$URL?cy=" . ( $YEAR + 1 ) . "\">--&gt;</a></h1>";
 my $row = 0;
 print "<table align=center border=0><tr>";
 for( my $month = 1; $month <= 12; $month++ )
@@ -117,11 +111,18 @@ for( my $month = 1; $month <= 12; $month
 	$row++;
 }
 print "</tr></table>";
-print "<center>List of Special/Holidays I have Connor:<br /><pre>";
-print map { $_ . "\n" } sort @list;
-print "</pre><br /><hr />Version: <font color=green>$VERSION</font><br />";
-print "CVS: <a href=\"http://demandred.dyndns.org/cgi-bin/cvsweb/ConnorCalendar/\">http://demandred.dyndns.org/cgi-bin/cvsweb/ConnorCalendar/</a>";
-print "</center><pre>\n\n$DEBUG</pre>";
+print "<p class=\"Legend\">Holidays I have Connor are in <font color=red>Red</font>\n</br>";
+print "Today is <font color=blue>Blue</font>\n</br>";
+print "Weekends and special days I have Connor are in <font color=green>Green</font>\n</p>";
+
+
+print "<table width=35% align=center border=0><tr><td>List of Special/Holidays " .
+      "I have Connor:<br /><p class=Legend>";
+print map { $_ . "<br />\n" } sort @list;
+print "</p></td></tr></table>\n";
+print "</pre><p class=\"footer\">Version: <font color=green>$VERSION</font><br />";
+print "CVS: <a target=\"_new\" href=\"http://demandred.dyndns.org/cgi-bin/cvsweb/ConnorCalendar/\">http://demandred.dyndns.org/cgi-bin/cvsweb/ConnorCalendar/</a>";
+print "</center></p>";
 
 
 ###############################################################################
@@ -303,7 +304,7 @@ padding-bottom: 0px;
  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
  #font-family: Geneva, Arial, Helvetica, sans-serif;
  font-size: 12pt;
- background:url(lowerright.jpg) no-repeat bottom right;
+ background: #eeeeee;
  color:#000000;
 
 
@@ -317,11 +318,33 @@ padding-bottom: 0px;
  text-align: center;
 }
 
+p.Legend {
+ color: #000000;
+ font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
+ font-size: 8pt;
+ margin: auto;
+ width: 300px;
+ background-color : transparent;
+ border-top: 1px solid #888888;
+ border-left: 1px solid #888888;
+ border-right: 1px solid #888888;
+ border-bottom: 1px solid #888888;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 3px;
+ padding-right: 3px;
+}
+
 h1 { 
  color: #191970; 
  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
  #font-family: Verdana, Arial, sans-serif;
  font-size: 12pt; font-weight: bold; line-height: 15pt;
+ background-color : transparent;
+ margin-left: 20px;
+ margin-right: 20px;
+ border-top: 1px solid black;
+ border-bottom: 1px solid black;
 }
 
 
@@ -364,11 +387,19 @@ line-height: 120%;
 }
 
 
-.footer {
-padding-top: 10px;
-padding-left: 50px;
-padding-right: 50px;
-
+p.footer {
+ color: #000000;
+ font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
+ font-size: 8pt;
+ margin: auto;
+ width: 500px;
+ background-color : transparent;
+ border-top: 1px solid #888888;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 3px;
+ padding-right: 3px;
+ text-align: center;
 }