[AppWrap-cvs] AppWrap/Apache/AppWrap Subs.pm,1.30,1.31 Pager.pm,1.12,1.13

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

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

Modified Files:
	Subs.pm Pager.pm 
Log Message:
Many i18n and CSS changes

Index: Subs.pm
===================================================================
RCS file: /cvsroot/appwrap/AppWrap/Apache/AppWrap/Subs.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Subs.pm	5 Dec 2002 03:54:18 -0000	1.30
--- Subs.pm	7 Dec 2002 02:08:29 -0000	1.31
***************
*** 31,37 ****
  use File::Spec ();
  
! $Apache::AppWrap::Subs::VERSION = "0.52";
  
  ######
  # 02Dec02. (several)	convert to my_tables table_type directive
  # 15Nov02. &favorites	Split on optional whitespace surrounding comma.
--- 31,38 ----
  use File::Spec ();
  
[...1555 lines suppressed...]
*** 4612,4616 ****
  #  $r->print($graph->gd->png);
    ########################
- #  &Apache::AppWrap::Subs::Webify($opts);
  
    return \@rows;
--- 4250,4253 ----
***************
*** 4631,4635 ****
    my $from = 'notifychange';
    my $where = 'tablename=' . $tablename;
!   my $ref = &Apache::AppWrap::Subs::sqlSelectHashRef($select, $from, $where);
    if ($ref && scalar(keys %$ref)) {
      # there may be entries to send to separate emails
--- 4268,4272 ----
    my $from = 'notifychange';
    my $where = 'tablename=' . $tablename;
!   my $ref = sqlSelectHashRef($select, $from, $where);
    if ($ref && scalar(keys %$ref)) {
      # there may be entries to send to separate emails

Index: Pager.pm
===================================================================
RCS file: /cvsroot/appwrap/AppWrap/Apache/AppWrap/Pager.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Pager.pm	5 Dec 2002 03:56:36 -0000	1.12
--- Pager.pm	7 Dec 2002 02:08:29 -0000	1.13
***************
*** 25,28 ****
--- 25,29 ----
  use Apache::Log ();
  use Apache::Util ();
+ use Apache::Constants qw(:common);
  
  $Apache::AppWrap::Pager::VERSION = "0.06";
***************
*** 69,77 ****
    my $my_defaults = $opts->{my_defaults};
  
-   # temporary while some display text remains hardcoded
-   my $msgs = $opts->{display_text};
-   $msgs ||= $opts->{msgs};
-   # this didn't help
-   $opts->{msgs} ||= $msgs;
  
    my $kv = $opts->{valid_kv} || $opts->{args}{kv};
--- 70,73 ----
***************
*** 146,169 ****
    } 
  
!   # we could get link vars anywhere, but here is OK.
!   my $link_vars = Apache::AppWrap::Subs::cclinks( $opts );
  
!   # some alt messages use these variables
!   my $kt = $my_tables->{$table}{key_type};
!   my $kt_label;
! #  my $kt_label = $my_columns->{$table}{$kt}{label};
!   if ($kt && exists $my_columns->{$table}{$kt}{label}) {
!   	$kt_label = $my_columns->{$table}{$kt}{label};
!   }
  
!   my $sort_by = $sort_hash{$sb}{sql};
!   my $title = $msgs->{title};
!   $opts->{Title} = eval $title if $title;
! #$test=$opts->{phase};
! #$log->debug("\npaginator: raw_title=$title, title=$opts->{Title}, phase=$test");
  
! #  my $sort_label = 'Sorted by ' . $sort_hash{$sb}{label};
!   my $subtitle = $msgs->{subtitle};
!   $opts->{SubTitle} = eval $subtitle if $subtitle;
  
    # sort the provided data according to the selected sort order
--- 142,177 ----
    } 
  
! 	# some alt messages use these variables
! 	my $kt = $my_tables->{$table}{key_type};
! 	my $kt_label;
! 	if ($kt && exists $my_columns->{$table}{$kt}{label}) {
! 	$kt_label = $my_columns->{$table}{$kt}{label};
! 	}
  
! 	my $sort_by = $sort_hash{$sb}{sql};
  
! 	# this is how we get display text
! 	my $msgs = $opts->{display_text};
! 	$msgs ||= Apache::AppWrap::Subs::get_display_text($opts);
! 	$opts->{display_text} ||= $msgs;
! 	$opts->{msgs} = $msgs;
  
! 
! 	my $link_vars = Apache::AppWrap::Subs::cclinks($opts);
! 
! 	my $title = eval $msgs->{title} if $msgs->{title};
! 	unless ($title) {
! 		$r->log_error("Pager: no title eval'd: $msgs->{title}");
!   		return SERVER_ERROR;
! 	}
! 	$opts->{Title} =  $title;
! 
! 	my $subtitle = eval $msgs->{subtitle} if $msgs->{subtitle};
! 	unless ($subtitle) {
! 		$r->log_error("Pager: no subtitle eval'd: $msgs->{subtitle}");
!   		return SERVER_ERROR;
! 	}
! 	# app color, app name, col name
! 	$opts->{SubTitle} = $subtitle;
  
    # sort the provided data according to the selected sort order
***************
*** 296,305 ****
    my $left;
  	if (exists $my_tables->{$table}{table_type} && 
! 		$my_tables->{$table}{table_type} eq 'meta_data') {
  #	if ($my_tables->{$table}{user_data}) {
  		my $dv_icons = visualize($opts);
- #  my $dv_icons = apache::appwrap::subs::visualize($opts);
  		$left = join("", @$dv_icons) if $dv_icons && scalar(@$dv_icons);
- #  my $left = join("", @$dv_icons) if $dv_icons && scalar(@$dv_icons);
  	}
    push @rows, '          <td width="30%" align="left">';
--- 304,311 ----
    my $left;
  	if (exists $my_tables->{$table}{table_type} && 
! 		$my_tables->{$table}{table_type} =~ m/^(user|meta)_data$/) {
  #	if ($my_tables->{$table}{user_data}) {
  		my $dv_icons = visualize($opts);
  		$left = join("", @$dv_icons) if $dv_icons && scalar(@$dv_icons);
  	}
    push @rows, '          <td width="30%" align="left">';
***************
*** 794,806 ****
    my $table = $opts->{table};
    my $label = $my_tables->{$table}{label};
- #  # bug out if this is a report
- #  return '' if $my_tables->{$table}{table_type} eq 'report';
  
    my $image_dir = $config{imageurl} || $config{homeurl};
    $image_dir .= '/' . $config{images};
  #  my $image_dir = $config{homeurl} . '/' . $config{images};
- 
- #  # bail if this is a tab summary, visualization useless.
- #  return if exists $opts->{args}{top_summary};
  
    my $r = Apache::Request->instance( Apache->request );
--- 800,807 ----