appwrap-cvs

[<pla...@us...>]

Update of /cvsroot/appwrap/AppWrap/Apache/AppWrap
In directory sc8-pr-cvs1:/tmp/cvs-serv15892

Modified Files:
	Calendar.pm 
Log Message:
Changes for CSS

Index: Calendar.pm
===================================================================
RCS file: /cvsroot/appwrap/AppWrap/Apache/AppWrap/Calendar.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Calendar.pm	6 Nov 2002 02:24:24 -0000	1.5
--- Calendar.pm	7 Dec 2002 02:17:07 -0000	1.6
***************
*** 9,14 ****
  use strict;
  use CGI::Carp qw(fatalsToBrowser);
! use Date::Format;
! use Date::Parse;
  use Date::Calc qw(Add_Delta_YMD);
  use HTML::AsSubs;
--- 9,14 ----
  use strict;
  use CGI::Carp qw(fatalsToBrowser);
! use Date::Format qw(time2str);
! use Date::Parse qw(str2time);
  use Date::Calc qw(Add_Delta_YMD);
  use HTML::AsSubs;
***************
*** 22,28 ****
  
  use vars qw($VERSION);
! $Apache::AppWrap::Calendar::VERSION = '0.05';
  ############################
! # 05 Nov 02.	handle HEAD requests
  ############################
  
--- 22,29 ----
  
  use vars qw($VERSION);
! $Apache::AppWrap::Calendar::VERSION = '0.06';
  ############################
! # 06Nov02.	Migrate to CSS-based presentation
! # 05Nov02.	handle HEAD requests
  ############################
  
***************
*** 44,48 ****
    my $log = $r->log;
    # get guery string
!   # my $query_args = &Apache::AppWrap::Subs::url_args($opts);
    my $query_args = $opts->{args}{calendar} if $opts->{args}{calendar};
  
--- 45,49 ----
    my $log = $r->log;
    # get guery string
!   # my $query_args = Apache::AppWrap::Subs::url_args($opts);
    my $query_args = $opts->{args}{calendar} if $opts->{args}{calendar};
  
***************
*** 50,54 ****
    my $current_month = $opts->{args}{month} || time();
    # $m is a hash ref to many pre-defined dates
!   my $m = &month_dates($opts, $current_month);
  
    # now add the previous month link content
--- 51,55 ----
    my $current_month = $opts->{args}{month} || time();
    # $m is a hash ref to many pre-defined dates
!   my $m = month_dates($opts, $current_month);
  
    # now add the previous month link content
***************
*** 57,61 ****
    # label is full month and year
    my $label = $m->{previous_month_label} . ' ';
!   $label .= &Date::Format::time2str("%Y", $m->{previous_month_end_epoch});
    my $prev_link = '<a href="' . $url . '">' .  $label . '</a>';
  
--- 58,62 ----
    # label is full month and year
    my $label = $m->{previous_month_label} . ' ';
!   $label .= time2str("%Y", $m->{previous_month_end_epoch});
    my $prev_link = '<a href="' . $url . '">' .  $label . '</a>';
  
***************
*** 65,71 ****
    # label is full month and year
    $label = $m->{next_month_label} . ' ';
!   $label .= &Date::Format::time2str("%Y", $m->{next_month_start_epoch});
    my $next_link = '<a href="' . $url . '">' .  $label . '</a>';
  
    # now we can push these links out to @rows in a table
    push @rows, '      <table width="95%" border="0">' .  $HNL . '        <tr valign="bottom">';
--- 66,75 ----
    # label is full month and year
    $label = $m->{next_month_label} . ' ';
!   $label .= time2str("%Y", $m->{next_month_start_epoch});
    my $next_link = '<a href="' . $url . '">' .  $label . '</a>';
  
+   # Add a div for CSS
+   push @rows, '<div id="pager">' . $HNL;
+ 
    # now we can push these links out to @rows in a table
    push @rows, '      <table width="95%" border="0">' .  $HNL . '        <tr valign="bottom">';
***************
*** 98,102 ****
  
  
!   my $ref = &Apache::AppWrap::Subs::sqlSelectHashRef( $select, $from, $where);
    # $ref is an array of hash refs of the form $row->{col_name} = $date,
    # one hash element for each date type field in the table. 
--- 102,106 ----
  
  
!   my $ref = Apache::AppWrap::Subs::sqlSelectHashRef( $select, $from, $where);
    # $ref is an array of hash refs of the form $row->{col_name} = $date,
    # one hash element for each date type field in the table. 
***************
*** 148,154 ****
    $args{current_month} = $current_month;
  
!   $ref = &Apache::AppWrap::Calendar::first_try( $opts, \%args);
    push @rows, join("", @$ref) if $ref && scalar(@$ref);
  
    ######## left side links (vbar phase) #########
    my $menu_func = $my_tables->{$table}{func_calendar};
--- 152,161 ----
    $args{current_month} = $current_month;
  
!   $ref = first_try( $opts, \%args);
    push @rows, join("", @$ref) if $ref && scalar(@$ref);
  
+   # Close CSS <div>
+   push @rows, '</div>' . $HNL;
+ 
    ######## left side links (vbar phase) #########
    my $menu_func = $my_tables->{$table}{func_calendar};
***************
*** 158,176 ****
    # wrapped in <td> tags
    if ($menu_func) {
!     my @subs = split(/;/, $menu_func );
      foreach (@subs) {
        my $ref = eval $_;
  #$log->debug("\nCore_lib::calendar: menu_func eval error = $@") if ($@);
!       push @{ $opts->{menuitems} }, join("", @$ref) if $ref and scalar(@$ref);
      }
    }
  
    # might be able to use a pdf maker to print calendars
- #  my $download_links = &Apache::AppWrap::Subs::make_download_links($opts);
- #  foreach (@$download_links) {
- #    push @{ $opts->{menuitems} }, $_ . $HNL;
- #  }
  
!   my $link_vars = &Apache::AppWrap::Subs::cclinks($opts);
    $opts->{Title} =  'Calendar of ' . $link_vars->{label};
    $opts->{Rows} = \@rows;
--- 165,181 ----
    # wrapped in <td> tags
    if ($menu_func) {
!     my @subs = split(/\s*;\s*/, $menu_func );
      foreach (@subs) {
        my $ref = eval $_;
  #$log->debug("\nCore_lib::calendar: menu_func eval error = $@") if ($@);
!       if ($ref and scalar(@$ref)) {
! 		push @{ $opts->{menuitems} }, join("", @$ref);
! 	  }
      }
    }
  
    # might be able to use a pdf maker to print calendars
  
!   my $link_vars = Apache::AppWrap::Subs::cclinks($opts);
    $opts->{Title} =  'Calendar of ' . $link_vars->{label};
    $opts->{Rows} = \@rows;
***************
*** 182,186 ****
    }
  
!   &Apache::AppWrap::Subs::Webify($opts);
    return OK;
  }	# end handler
--- 187,191 ----
    }
  
!   Apache::AppWrap::Subs::Webify($opts);
    return OK;
  }	# end handler
***************
*** 255,259 ****
  
      # get the day of month of the current date 
!     my $item = &Date::Format::time2str("%d", $date);
      $item =~ s/^0//;
      # start any displayed text below the date
--- 260,264 ----
  
      # get the day of month of the current date 
!     my $item = time2str("%d", $date);
      $item =~ s/^0//;
      # start any displayed text below the date
***************
*** 312,332 ****
  #$log->debug("next year: $m{next_year_mid_num}");
  
!   $m{current_year_start_epoch} = &str2time('01/01/' . $m{current_year_mid_num});
!   $m{current_year_end_epoch} = &str2time('12/31/' . $m{current_year_mid_num});
  
!   $m{previous_year_start_epoch} = &str2time('01/01/' . $m{previous_year_mid_num});
!   $m{previous_year_end_epoch} = &str2time('12/31/' . $m{previous_year_mid_num});
  
!   $m{next_year_start_epoch} = &str2time('01/01/' . $m{next_year_mid_num});
!   $m{next_year_end_epoch} = &str2time('12/31/' . $m{next_year_mid_num});
  
    ###############################
    # month info
!   $m{current_month_mid_num} = &time2str("%m", $in_date);
!   $m{current_month_start_epoch} = &str2time($m{current_month_mid_num} . '/01/' . $m{current_year_mid_num});
    $m{previous_month_end_epoch} = $m{current_month_start_epoch} - 1;
  
    # add 1 second to the end of the current month to yield the start of the next month
!   my ($mid_year,$next_month,$mid_day) = &Date::Calc::Add_Delta_YMD($m{current_year_mid_num}, $m{current_month_mid_num}, '01', '0', '1', '0');
    $m{next_month_mid_num} = $next_month;
    # this takes account of the current month being december
--- 317,337 ----
  #$log->debug("next year: $m{next_year_mid_num}");
  
!   $m{current_year_start_epoch} = str2time('01/01/' . $m{current_year_mid_num});
!   $m{current_year_end_epoch} = str2time('12/31/' . $m{current_year_mid_num});
  
!   $m{previous_year_start_epoch} = str2time('01/01/' . $m{previous_year_mid_num});
!   $m{previous_year_end_epoch} = str2time('12/31/' . $m{previous_year_mid_num});
  
!   $m{next_year_start_epoch} = str2time('01/01/' . $m{next_year_mid_num});
!   $m{next_year_end_epoch} = str2time('12/31/' . $m{next_year_mid_num});
  
    ###############################
    # month info
!   $m{current_month_mid_num} = time2str("%m", $in_date);
!   $m{current_month_start_epoch} = str2time($m{current_month_mid_num} . '/01/' . $m{current_year_mid_num});
    $m{previous_month_end_epoch} = $m{current_month_start_epoch} - 1;
  
    # add 1 second to the end of the current month to yield the start of the next month
!   my ($mid_year,$next_month,$mid_day) = Date::Calc::Add_Delta_YMD($m{current_year_mid_num}, $m{current_month_mid_num}, '01', '0', '1', '0');
    $m{next_month_mid_num} = $next_month;
    # this takes account of the current month being december
***************
*** 335,345 ****
    # maybe don't need next_month_end_epoch, yet
  
!   $m{previous_month_mid_num} = &time2str("%m", $m{previous_month_end_epoch});
!   $m{previous_month_start_epoch} = &str2time($m{previous_month_mid_num} . '/01/' . $m{current_year_mid_num});
  
  
!   $m{current_month_label} = &time2str("%B", $in_date);
!   $m{previous_month_label} = &time2str("%B", $m{previous_month_start_epoch});
!   $m{next_month_label} = &time2str("%B", $m{next_month_start_epoch});
  
    return \%m;
--- 340,350 ----
    # maybe don't need next_month_end_epoch, yet
  
!   $m{previous_month_mid_num} = time2str("%m", $m{previous_month_end_epoch});
!   $m{previous_month_start_epoch} = str2time($m{previous_month_mid_num} . '/01/' . $m{current_year_mid_num});
  
  
!   $m{current_month_label} = time2str("%B", $in_date);
!   $m{previous_month_label} = time2str("%B", $m{previous_month_start_epoch});
!   $m{next_month_label} = time2str("%B", $m{next_month_start_epoch});
  
    return \%m;