openinteract-commits Mailing List for OpenInteract (Page 282)

Brought to you by: a_v, lachoy, mjbaker

openinteract-commits — CVS updates for OpenInteract/SPOPS

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (381)	Nov (176)	Dec (310)
2002	Jan (334)	Feb (96)	Mar (149)	Apr (214)	May (120)	Jun (56)	Jul (10)	Aug (273)	Sep (182)	Oct (56)	Nov (125)	Dec (22)
2003	Jan (63)	Feb (181)	Mar (498)	Apr (433)	May (39)	Jun (512)	Jul (276)	Aug (156)	Sep (101)	Oct (66)	Nov (24)	Dec (161)
2004	Jan (1)	Feb (377)	Mar (68)	Apr (26)	May (107)	Jun (333)	Jul (13)	Aug	Sep (76)	Oct (88)	Nov (170)	Dec (91)
2005	Jan (52)	Feb (239)	Mar (402)	Apr (15)	May (2)	Jun (1)	Jul (13)	Aug	Sep (71)	Oct (34)	Nov	Dec
2006	Jan (5)	Feb (5)	Mar (2)	Apr	May	Jun	Jul	Aug (3)	Sep (7)	Oct (2)	Nov	Dec
2007	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 280 281 282 283 284 .. 289 > >> (Page 282 of 289)

[Openinteract-commits] CVS: OpenInteract/pkg/base_page MANIFEST,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-20 15:10:13

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page
In directory usw-pr-cvs1:/tmp/cvs-serv12579

Modified Files:
	MANIFEST 
Log Message:
update file listing


Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/MANIFEST,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MANIFEST	2001/10/17 12:09:41	1.1
--- MANIFEST	2001/10/20 15:10:10	1.2
***************
*** 2,17 ****
  MANIFEST
  MANIFEST.SKIP
! OpenInteract/Handler/BasePage.pm
! OpenInteract/SQLInstall/BasePage.pm
  conf/action.perl
  conf/spops.perl
  doc/base_page.pod
  doc/titles
! package.conf
  template/edit_document_box.meta
  template/edit_document_box.tmpl
! template/static_dir_listing.meta
! template/static_dir_listing.tmpl
  template/static_page_form.meta
  template/static_page_form.tmpl
- 
--- 2,21 ----
  MANIFEST
  MANIFEST.SKIP
! package.conf
  conf/action.perl
  conf/spops.perl
  doc/base_page.pod
  doc/titles
! OpenInteract/Page.pm
! OpenInteract/Page/Database.pm
! OpenInteract/Page/File.pm
! OpenInteract/Handler/Page.pm
! OpenInteract/SQLInstall/BasePage.pm
  template/edit_document_box.meta
  template/edit_document_box.tmpl
! template/page_directory_list.meta
! template/page_directory_list.tmpl
! template/page_search_form.meta
! template/page_search_form.tmpl
  template/static_page_form.meta
  template/static_page_form.tmpl

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/data - New directory

From: Chris W. <la...@us...> - 2001-10-20 15:09:36

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/data
In directory usw-pr-cvs1:/tmp/cvs-serv12458/base_page/data

Log Message:
Directory /cvsroot/openinteract/OpenInteract/pkg/base_page/data added to the repository

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity/data install_security.dat,NONE,1.1

From: Chris W. <la...@us...> - 2001-10-18 18:01:42

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity/data
In directory usw-pr-cvs1:/tmp/cvs-serv31569

Added Files:
	install_security.dat 
Log Message:
added security settings for handler


--- NEW FILE: install_security.dat ---
$security = [ 
    { spops_class => 'OpenInteract::Security',
      field_order => [ qw/ class object_id scope scope_id security_level / ],
      transform_default_to_id    => [ 'scope_id' ],
      transform_class_to_website => [ 'class' ] },
    [ 'OpenInteract::Handler::ObjectActivity', 0, 'g', 'site_admin_group', 8 ],
];

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity/data - New directory

From: Chris W. <la...@us...> - 2001-10-18 18:01:02

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity/data
In directory usw-pr-cvs1:/tmp/cvs-serv31429/data

Log Message:
Directory /cvsroot/openinteract/OpenInteract/pkg/object_activity/data added to the repository

[Openinteract-commits] CVS: OpenInteract Changes,1.71,1.72 MANIFEST,1.66,1.67

From: Chris W. <la...@us...> - 2001-10-18 13:49:44

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv16795

Modified Files:
	Changes MANIFEST 
Log Message:
meta


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/Changes,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Changes	2001/10/17 04:47:07	1.71
--- Changes	2001/10/18 13:49:41	1.72
***************
*** 11,14 ****
--- 11,16 ----
   accommodate the changes.
  
+  - Added 'object_activity' package to browse object activity logs.
+ 
  Individual:
  
***************
*** 55,67 ****
     - Moved 'website_name' ==> 'server_info'->'website_name'
  
  
!  * OpenInteract/Template/Plugin.pm:
  
!    - Fix dumb (!) POD error that prevented 'perldoc' from working
!    (identified itself as OI::Template::Provider in the head)
  
!  * OpenInteract/Template/Provider.pm:
  
-    - Use new location for 'template_ext' (old one is ok for now)
  
  
--- 57,71 ----
     - Moved 'website_name' ==> 'server_info'->'website_name'
  
+  * OpenInteract/UI/Main.pm:
  
!    - Don't assume that the template will be a fully-qualified name, or
!    that a non-qualified name will be in the base_theme package. Also
!    add/clarify some docs.
  
!  * OpenInteract/Template/Plugin.pm:
  
!    - Fix dumb POD error that prevented 'perldoc' from working
!    (identified itself as OI::Template::Provider in the head - doh!)
  
  
  

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/MANIFEST,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** MANIFEST	2001/10/18 03:57:52	1.66
--- MANIFEST	2001/10/18 13:49:41	1.67
***************
*** 113,116 ****
--- 113,117 ----
  template/form_login
  template/form_radio
+ template/form_reset
  template/form_select
  template/form_select_intro

[Openinteract-commits] CVS: OpenInteract/template form_submit_row,1.2,1.3

From: Chris W. <la...@us...> - 2001-10-18 13:48:51

Update of /cvsroot/openinteract/OpenInteract/template
In directory usw-pr-cvs1:/tmp/cvs-serv16626

Modified Files:
	form_submit_row 
Log Message:
include a 'Reset' button if asked


Index: form_submit_row
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/form_submit_row,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** form_submit_row	2001/10/09 00:52:45	1.2
--- form_submit_row	2001/10/18 13:48:48	1.3
***************
*** 1,9 ****
  [%########################################
!   form_submit_row( name, value, count, colspan )
!     Display a row with a right-aligned submit button.
    ########################################-%]
  
  [%- DEFAULT colspan = 2 -%]
  <tr bgcolor="[% INCLUDE row_color %]" align="right">
!    <td colspan="[% colspan %]">[% INCLUDE form_submit %]</td>
  </tr>
--- 1,13 ----
  [%########################################
!   form_submit_row( name, value, count, colspan, reset, reset_label )
!     Display a row with a right-aligned submit button. If reset is true
!     then we also include a reset button.
    ########################################-%]
  
  [%- DEFAULT colspan = 2 -%]
  <tr bgcolor="[% INCLUDE row_color %]" align="right">
!    <td colspan="[% colspan %]">
!      [%- IF reset %][% INCLUDE form_reset( value = reset_label ) %][% END -%]
!      [%- INCLUDE form_submit -%]
!    </td>
  </tr>

[Openinteract-commits] CVS: OpenInteract/template form_reset,NONE,1.1

From: Chris W. <la...@us...> - 2001-10-18 13:48:35

Update of /cvsroot/openinteract/OpenInteract/template
In directory usw-pr-cvs1:/tmp/cvs-serv16554

Added Files:
	form_reset 
Log Message:
added widget to represent a 'Reset' button


--- NEW FILE: form_reset ---
[%########################################
  form_reset( value )
     Reset button
  ########################################-%]
[%- DEFAULT value = 'Reset' -%]
<input type="reset" value="[% value %]">

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity/OpenInteract ObjectActivity.pm,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 13:47:49

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv16352/OpenInteract

Modified Files:
	ObjectActivity.pm 
Log Message:
various template and data manipulation updates (fairly small)


Index: ObjectActivity.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/OpenInteract/ObjectActivity.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectActivity.pm	2001/10/18 01:38:27	1.1
--- ObjectActivity.pm	2001/10/18 13:47:44	1.2
***************
*** 4,8 ****
  
  use strict;
! use Class::Date;
  
  my @SEARCH_FIELDS = qw( class object_id action action_by action_on );
--- 4,8 ----
  
  use strict;
! use Class::Date qw( -DateParse );
  
  my @SEARCH_FIELDS = qw( class object_id action action_by action_on );
***************
*** 25,36 ****
      my @value = ();
  
!     # Do the easy criteria 
  
      foreach my $field ( @SEARCH_FIELDS ) {
! 	my $this_value = $p->{ $field } || $apr->param( $field );
! 	next unless $this_value;
! 	push @where, " $field = ? ";
! 	push @value, $this_value;
! 	$R->DEBUG && $R->scrib( 1, "Setting criteria ($field) to ($this_value)" );
      }
  
--- 25,36 ----
      my @value = ();
  
!     # Do the easy criteria
  
      foreach my $field ( @SEARCH_FIELDS ) {
!         my $this_value = $p->{ $field } || $apr->param( $field );
!         next unless $this_value;
!         push @where, " $field = ? ";
!         push @value, $this_value;
!         $R->DEBUG && $R->scrib( 1, "Setting criteria ($field) to ($this_value)" );
      }
  
***************
*** 40,70 ****
      my $date_fmt = '%Y-%m-%d';
      if ( $exact_date ) {
! 	push @where, " ( action_on > ? AND action_on < ? ) ";
! 	my $date_before = $exact_date - '1D';
! 	my $date_after  = $exact_date + '1D';
! 	push @value, $date_before->strftime( $date_fmt ), $date_after->strftime( $date_fmt );
      }
  
      else {
! 	my $start_date = $class->read_date( 'action_on_start', $p );
! 	my $end_date   = $class->read_date( 'action_on_end', $p );
! 	if ( $start_date ) {
! 	    push @where, " action_on >= ? ";
! 	    push @value, $start_date->strftime( $date_fmt );
! 	}
! 	if ( $end_date ) {
! 	    push @where, " action_on <= ?";
! 	    push @value, $end_date->strftime( $date_fmt );
! 	}
      }
  
      my $order = $p->{order} || $apr->param( 'order' ) || 'action_on DESC';
      return SPOPS::SQLInterface->db_select({ db     => $R->db,
! 					    select => \@RECORD_FIELDS,
! 					    from   => [ OBJECT_ACTIVITY_TABLE ],
! 					    where  => join( ' AND ', @where ),
! 					    order  => $order,
! 					    return => 'hash',
! 					    value  => \@value });
  }
  
--- 40,70 ----
      my $date_fmt = '%Y-%m-%d';
      if ( $exact_date ) {
!         push @where, " ( action_on > ? AND action_on < ? ) ";
!         my $date_before = $exact_date - '1D';
!         my $date_after  = $exact_date + '1D';
!         push @value, $date_before->strftime( $date_fmt ), $date_after->strftime( $date_fmt );
      }
  
      else {
!         my $start_date = $class->read_date( 'action_on_start', $p );
!         my $end_date   = $class->read_date( 'action_on_end', $p );
!         if ( $start_date ) {
!             push @where, " action_on >= ? ";
!             push @value, $start_date->strftime( $date_fmt );
!         }
!         if ( $end_date ) {
!             push @where, " action_on <= ?";
!             push @value, $end_date->strftime( $date_fmt );
!         }
      }
  
      my $order = $p->{order} || $apr->param( 'order' ) || 'action_on DESC';
      return SPOPS::SQLInterface->db_select({ db     => $R->db,
!                                             select => \@RECORD_FIELDS,
!                                             from   => [ OBJECT_ACTIVITY_TABLE ],
!                                             where  => join( ' AND ', @where ),
!                                             order  => $order,
!                                             return => 'hash',
!                                             value  => \@value });
  }
  
***************
*** 82,112 ****
      my ( %user_cache );
      foreach my $rec ( @{ $activity_list } ) {
! 	my $object_class = $rec->{class};
! 	my $object = eval { $object_class->fetch( $rec->{object_id} ) };
! 	if ( $@ or ! $object ) {
! 	    $rec->{object_type} = 'unknown';
! 	    $rec->{title}       = 'n/a';
! 	}
! 	else {
! 	    my $info = $object->object_description;
! 	    $rec->{object_type} = $info->{name};
! 	    $rec->{title}       = $info->{title};
! 	    $rec->{display_url} = $info->{url};
! 	}
! 
! 	unless ( $user_cache{ $rec->{action_by} } ) {
! 	    my $user = eval { $R->user->fetch( $rec->{action_by} ) };
! 	    if ( $@ or ! $user ) {
! 		$rec->{login_name} = 'unknown';
! 	    }
! 	    else {
! 		$user_cache{ $rec->{action_by} } = $user->object_description;
! 	    }
! 	}
! 	if ( my $user = $user_cache{ $rec->{action_by} } ) {
! 	    $rec->{login_name}       = $user->{title};
! 	    $rec->{user_display_url} = $user->{url};
! 	}
  
      }
      return $activity_list;
--- 82,111 ----
      my ( %user_cache );
      foreach my $rec ( @{ $activity_list } ) {
!         my $object_class = $rec->{class};
!         my $object = eval { $object_class->fetch( $rec->{object_id} ) };
!         if ( $@ or ! $object ) {
!             $rec->{object_type} = 'unknown';
!             $rec->{title}       = 'n/a';
!         }
!         else {
!             my $info = $object->object_description;
!             $rec->{object_type} = $info->{name};
!             $rec->{title}       = $info->{title};
!             $rec->{display_url} = $info->{url};
!         }
  
+         unless ( $user_cache{ $rec->{action_by} } ) {
+             my $user = eval { $R->user->fetch( $rec->{action_by} ) };
+             if ( $@ or ! $user ) {
+                 $rec->{login_name} = 'unknown';
+             }
+             else {
+                 $user_cache{ $rec->{action_by} } = $user->object_description;
+             }
+         }
+         if ( my $user = $user_cache{ $rec->{action_by} } ) {
+             $rec->{login_name}       = $user->{title};
+             $rec->{user_display_url} = $user->{url};
+         }
      }
      return $activity_list;
***************
*** 116,133 ****
  sub read_date {
      my ( $class, $field, $p ) = @_;
-     my ( $date_string );
      if ( $p->{ $field } ) {
! 	$date_string = $p->{ $field };
!     }
!     else {
! 	my $apr = OpenInteract::Request->instance->apache;
! 	my ( $y, $m, $d ) = ( $apr->param( "${field}_year" ),
! 			      $apr->param( "${field}_month" ),
! 			      $apr->param( "${field}_day" ) );
! 	return undef unless ( $y and $m and $d );
! 	$date_string = join( '-', $y, $m, $d );
      }
!     return undef unless ( $date_string );
!     return Class::Date->date( $date_string );
  }
  
--- 115,128 ----
  sub read_date {
      my ( $class, $field, $p ) = @_;
      if ( $p->{ $field } ) {
!         my $date_string = $p->{ $field };
!         return Class::Date::date( $date_string );
      }
!     my $apr = OpenInteract::Request->instance->apache;
!     my ( $y, $m, $d ) = ( $apr->param( "${field}_year" ),
!                           $apr->param( "${field}_month" ),
!                           $apr->param( "${field}_day" ) );
!     return undef unless ( $y and $m and $d );
!     return Class::Date->new([ $y, $m, $d ]);
  }

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity/template listing.tmpl,1.1,1.2 search_form.tmpl,1.1,1.2 search_results.tmpl,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 13:47:49

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity/template
In directory usw-pr-cvs1:/tmp/cvs-serv16352/template

Modified Files:
	listing.tmpl search_form.tmpl search_results.tmpl 
Log Message:
various template and data manipulation updates (fairly small)


Index: listing.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/template/listing.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** listing.tmpl	2001/10/18 01:38:27	1.1
--- listing.tmpl	2001/10/18 13:47:44	1.2
***************
*** 8,20 ****
  [%- END -%]
  
  [%- MACRO activity_row BLOCK -%]
! <tr bgcolor="[% PROCESS row_color %]" valign="middle">
!   <td>[% record.action_on %]</td>
!   <td>[% record.action %]</td>
!   <td>[% record.object_type %]</td>
!   <td>[% show_with_url( record.title, record.display_url ) %]</td>
!   <td>[% show_with_url( record.login_name, record.user_display_url ) %]</td>
  </tr>
  [%- END -%]
  
  [%- DEFAULT table_width = '75%' -%]
--- 8,29 ----
  [%- END -%]
  
+ [%- MACRO activity_cell( text ) BLOCK -%]
+ <td><font size="-1">[% text %]</font></td>
+ [%- END -%]
+ 
  [%- MACRO activity_row BLOCK -%]
! <tr valign="middle" align="center" bgcolor="[% PROCESS row_color %]">
!   [% activity_cell( record.action_on ) -%]
!   [% activity_cell( record.action ) -%]
!   [% activity_cell( record.object_type ) -%]
!   [% activity_cell( show_with_url( record.title, record.display_url ) ) -%]
!   [% activity_cell( show_with_url( record.login_name, record.user_display_url ) ) -%]
  </tr>
  [%- END -%]
+ 
+ 
+ [%########################################
+   DISPLAY START
+   ########################################-%]
  
  [%- DEFAULT table_width = '75%' -%]

Index: search_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/template/search_form.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** search_form.tmpl	2001/10/18 01:38:27	1.1
--- search_form.tmpl	2001/10/18 13:47:44	1.2
***************
*** 1,6 ****
- [%########################################
-   DISPLAY START
-   ########################################-%]
- 
  [%- DEFAULT theme = OI.theme_properties;
      SET count     = 0; -%]
--- 1,2 ----
***************
*** 16,20 ****
  and the fewer results you will retrieve.</p>
  
! <form name="activity_search" method="GET" action="/ObjectActivity/search/">
  
  [% INCLUDE table_bordered_begin( width = '75%' ) -%]
--- 12,17 ----
  and the fewer results you will retrieve.</p>
  
! <form name="activity_search" method="GET"
!       action="/ObjectActivity/search/">
  
  [% INCLUDE table_bordered_begin( width = '75%' ) -%]
***************
*** 25,31 ****
  
    [%- count = count + 1 -%]
!   [% INCLUDE label_form_date_row( label = 'Activity On', name = 'action_on' ) %]
  
    [%- count = count + 1 -%]
    [% INCLUDE label_form_select_row( label = 'Activity Type', plain = 1,
  				    name  = 'action',
--- 22,35 ----
  
    [%- count = count + 1 -%]
!   [% INCLUDE label_form_date_row( label = 'Activity On', name = 'action_on',
!                                   is_blank = 1 ) %]
  
    [%- count = count + 1 -%]
+   [% INCLUDE label_row_begin( label = 'Activity Between' ) -%]
+   <td>[% INCLUDE date_select( field_prefix = 'action_on_start', is_blank = 1 ) -%] -<br>
+       [% INCLUDE date_select( field_prefix = 'action_on_end', is_blank = 1 ) -%]</td>
+   </tr>
+ 
+   [%- count = count + 1 -%]
    [% INCLUDE label_form_select_row( label = 'Activity Type', plain = 1,
  				    name  = 'action',
***************
*** 45,52 ****
  
    [%- count = count + 1 -%]
!   [% INCLUDE form_submit_row( value = 'Search' ) -%]
  
! [% INCLUDE table_bordered_end() -%]
  
  </form>
  </div>
--- 49,57 ----
  
    [%- count = count + 1 -%]
!   [% INCLUDE form_submit_row( value = 'Search', reset = 1, reset_label = 'Reset' ) -%]
  
! [% PROCESS table_bordered_end -%]
  
  </form>
+ 
  </div>

Index: search_results.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/template/search_results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** search_results.tmpl	2001/10/18 01:38:27	1.1
--- search_results.tmpl	2001/10/18 13:47:44	1.2
***************
*** 4,11 ****
--- 4,19 ----
  <h2>Activity Search Results</h2>
  
+ [% IF NOT activity_list.size -%]
+ 
+ <p>There were no records found matching your criteria.</p>
+ 
+ [% ELSE -%]
+ 
  <p align="left">Following are the results matching your search of
  object activity.</p>
  
  [% INCLUDE object_activity::listing %]
+ 
+ [% END -%]
  
  </div>

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity Changes,1.2,1.3 package.conf,1.2,1.3

From: Chris W. <la...@us...> - 2001-10-18 13:47:49

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity
In directory usw-pr-cvs1:/tmp/cvs-serv16352

Modified Files:
	Changes package.conf 
Log Message:
various template and data manipulation updates (fairly small)


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/Changes,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Changes	2001/10/18 03:59:07	1.2
--- Changes	2001/10/18 13:47:44	1.3
***************
*** 1,4 ****
--- 1,14 ----
  Revision history for OpenInteract package object_activity.
  
+ 0.10  Thu Oct 18 09:49:38 EDT 2001
+ 
+       Things work (and look) nicely now...
+ 
+ 0.09  Thu Oct 18 09:33:16 EDT 2001
+ 
+ 0.08  Thu Oct 18 09:15:07 EDT 2001
+ 
+ 0.07  Thu Oct 18 09:07:17 EDT 2001
+ 
  0.06  Thu Oct 18 00:06:07 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/package.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** package.conf	2001/10/18 03:59:07	1.2
--- package.conf	2001/10/18 13:47:44	1.3
***************
*** 1,4 ****
  name             object_activity
! version          0.06
  author           Chris Winters <ch...@cw...>
  module           Class::Date
--- 1,4 ----
  name             object_activity
! version          0.10
  author           Chris Winters <ch...@cw...>
  module           Class::Date

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity/OpenInteract/Handler ObjectActivity.pm,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 13:47:49

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv16352/OpenInteract/Handler

Modified Files:
	ObjectActivity.pm 
Log Message:
various template and data manipulation updates (fairly small)


Index: ObjectActivity.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/OpenInteract/Handler/ObjectActivity.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectActivity.pm	2001/10/18 01:38:27	1.1
--- ObjectActivity.pm	2001/10/18 13:47:44	1.2
***************
*** 8,15 ****
  use SPOPS::SQLInterface;
  
! @OpenInteract::Handler::ObjectActivity::ISA     = qw( 
!    OpenInteract::Handler::GenericDispatcher  SPOPS::Secure 
  );
! $OpenInteract::Handler::ObjectActivity::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
  $OpenInteract::Handler::ObjectActivity::author            = 'ch...@cw...';
  $OpenInteract::Handler::ObjectActivity::default_method    = 'search_form';
--- 8,15 ----
  use SPOPS::SQLInterface;
  
! @OpenInteract::Handler::ObjectActivity::ISA     = qw(
!    OpenInteract::Handler::GenericDispatcher  SPOPS::Secure
  );
! $OpenInteract::Handler::ObjectActivity::VERSION           = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
  $OpenInteract::Handler::ObjectActivity::author            = 'ch...@cw...';
  $OpenInteract::Handler::ObjectActivity::default_method    = 'search_form';
***************
*** 21,31 ****
      my $R = OpenInteract::Request->instance;
      my %params = ();
!     my $CONFIG = $R->CONFIG;
!     foreach my $object_key ( sort keys %{ $CONFIG->{SPOPS} } ) {
! 	push @{ $params{class_name_list} }, $object_key;
! 	push @{ $params{class_list} }, $CONFIG->{SPOPS}{ $object_key }{class};
      }
      return $R->template->handler( {}, \%params,
! 				  { name => 'object_activity::search_form' } );
  }
  
--- 21,32 ----
      my $R = OpenInteract::Request->instance;
      my %params = ();
!     my $spops_conf = $R->CONFIG->{SPOPS};
!     foreach my $object_key ( sort keys %{ $spops_conf } ) {
!         push @{ $params{class_name_list} }, $object_key;
!         push @{ $params{class_list} }, $spops_conf->{ $object_key }{class};
      }
+     $R->{page}{title} = 'Search for Object Activity Records';
      return $R->template->handler( {}, \%params,
!                                   { name => 'object_activity::search_form' } );
  }
  
***************
*** 38,43 ****
                                                   OpenInteract::ObjectActivity->fetch_activity( $p ) );
      $R->{page}{title} = 'Object Activity Search Results';
!     return $R->template->handler( {}, \%params, 
! 				  { name => 'object_activity::search_results' } );
  }
  
--- 39,44 ----
                                                   OpenInteract::ObjectActivity->fetch_activity( $p ) );
      $R->{page}{title} = 'Object Activity Search Results';
!     return $R->template->handler( {}, \%params,
!                                   { name => 'object_activity::search_results' } );
  }

[Openinteract-commits] CVS: OpenInteract/pkg/lookup/template lookup_classes.tmpl,1.2,1.3 lookup_listing.tmpl,1.5,1.6 lookup_listing_columns.tmpl,1.4,1.5 lookup_partitions.tmpl,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 12:39:47

Update of /cvsroot/openinteract/OpenInteract/pkg/lookup/template
In directory usw-pr-cvs1:/tmp/cvs-serv3900/template

Modified Files:
	lookup_classes.tmpl lookup_listing.tmpl 
	lookup_listing_columns.tmpl lookup_partitions.tmpl 
Log Message:
update templates to use template widgets, including the error_message
and status_message items; modified the handler to generate a status message after an edit


Index: lookup_classes.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/template/lookup_classes.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lookup_classes.tmpl	2001/09/17 15:53:50	1.2
--- lookup_classes.tmpl	2001/10/18 12:39:44	1.3
***************
*** 1,3 ****
! [%- theme = OI.theme_properties -%]
  
  [%########################################
--- 1,3 ----
! [%- DEFAULT theme = OI.theme_properties -%]
  
  [%########################################
***************
*** 5,18 ****
    ########################################-%]
  
! [% MACRO lookup_row( lookup_info, count ) BLOCK -%]
!   [%- SET row_color = theme.odd_color -%]
!   [%- SET row_color = theme.even_color IF count mod 2 == 0 -%]
!   <tr bgcolor="[% row_color %]">
      <td>[% lookup_info.title %]</td>
-     [% lookup_url = OI.make_url( base = '/Lookups/listing/',
-                                  lookup_type = lookup_info.lookup_type ) -%]    
      <td><a href="[% lookup_url %]">List items</a></td>
    </tr>
! [% END -%]
  
  
--- 5,16 ----
    ########################################-%]
  
! [%- MACRO lookup_row BLOCK -%]
!   [%- lookup_url = OI.make_url( base = '/Lookups/listing/',
!                                 lookup_type = lookup_info.lookup_type ) -%]    
!   <tr bgcolor="[% PROCESS row_color %]">
      <td>[% lookup_info.title %]</td>
      <td><a href="[% lookup_url %]">List items</a></td>
    </tr>
! [%- END -%]
  
  
***************
*** 21,48 ****
    ########################################-%]
  
! [%- OI.comp( 'showerror', error_msg = error_msg ) -%]
  
! <h1 align="center">Lookup Classes</h1>
  
! <p>Following are all lookup types the system knows about. Click on
! <tt>List items</tt> to view and edit entries.</p>
  
! <div align="center">
  
! <table border="0" bgcolor="[% theme.border_color %]"
!        cellspacing="0" cellpadding="2">
! <tr><td>
  
!   <table border="0" width="100%" bgcolor="[% theme.bgcolor %]"
!          cellpadding="5" cellspacing="0">
  
  [% FOREACH lookup_info = lookup_list -%]
!    [% lookup_row( lookup_info, loop.count ) -%]
  [% END -%]
  
!   </table>
  
! </td></tr>
! </table>
  
  </div>
--- 19,47 ----
    ########################################-%]
  
! [%- PROCESS error_message -%]
! [%- PROCESS status_message -%]
  
! <div align="center">
  
! <h1>Lookup Classes</h1>
  
! [% IF NOT lookup_list.size -%]
  
! <p>You have not defined any lookup items in this site.</p>
  
! [% ELSE -%]
  
+ <p>Following are all lookup types the system knows about. Click on
+ <tt>List items</tt> to view and edit entries.</p>
+ 
+ [% INCLUDE table_bordered_begin -%]
+ 
  [% FOREACH lookup_info = lookup_list -%]
!    [% lookup_row( count = loop.count ) -%]
  [% END -%]
  
! [% INCLUDE table_bordered_end -%]
  
! [% END -%]
  
  </div>

Index: lookup_listing.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/template/lookup_listing.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lookup_listing.tmpl	2001/10/03 13:09:42	1.5
--- lookup_listing.tmpl	2001/10/18 12:39:44	1.6
***************
*** 1,6 ****
! [%- theme = OI.theme_properties -%]
! [%- DEFAULT blank_count = 5;
!     DEFAULT title       = 'Lookup Entry Editing';
!  -%]
  
  [%########################################
--- 1,5 ----
! [%- DEFAULT theme       = OI.theme_properties;
!     DEFAULT blank_count = 5;
!     DEFAULT title       = 'Lookup Entry Editing'; -%]
  
  [%########################################
***************
*** 19,23 ****
           <td>[% PROCESS lookup::lookup_field( label = label_list.$idx, id = this_id,
                                                size  = size_list.$idx,  value = o.$field,
!                                               name  = field,  ) -%]
           </td>
        </tr>
--- 18,22 ----
           <td>[% PROCESS lookup::lookup_field( label = label_list.$idx, id = this_id,
                                                size  = size_list.$idx,  value = o.$field,
!                                               name  = field ) -%]
           </td>
        </tr>
***************
*** 31,36 ****
    ########################################-%]
  
! <h1 align="center">Lookups: [% lookup_type %]</h1>
  
  <p>Following are all entries in the lookup table under 
  <b>[% lookup_type %]</b> 
--- 30,39 ----
    ########################################-%]
  
! [%- PROCESS error_message -%]
! 
! <div align="center">
  
+ <h1>Lookups: [% lookup_type %]</h1>
+ 
  <p>Following are all entries in the lookup table under 
  <b>[% lookup_type %]</b> 
***************
*** 40,62 ****
  Edit at will.</p>
  
- <div align="center">
- 
  <form name="lookup_listing" action="/Lookups/edit/" method="POST">
- 
- <table border="0" bgcolor="[% theme.border_color %]"
-        cellspacing="0" cellpadding="2">
- <tr><td>
  
!   <table border="0" width="100%" bgcolor="[% theme.bgcolor %]"
!          cellpadding="5" cellspacing="0">
  
  [% FOREACH item = lookup_list -%]
!   [%- SET row_color = theme.odd_color -%]
!   [%- SET row_color = theme.even_color IF loop.count mod 2 == 0 -%]
!   <tr bgcolor="[% row_color %]" valign="top" align="left">
!    <td>
!    [% lookup_entry_table( o = item ) -%]
!    </td>
!    <td><input type="checkbox" value="yes" name="[% remove_key %][% item.id %]"> Remove?</td>
    </tr>
  [% END -%]
--- 43,54 ----
  Edit at will.</p>
  
  <form name="lookup_listing" action="/Lookups/edit/" method="POST">
  
! [% INCLUDE table_bordered_begin -%]
  
  [% FOREACH item = lookup_list -%]
!   <tr bgcolor="[% PROCESS row_color( count = loop.count ) %]" valign="top" align="left">
!    <td>[% lookup_entry_table( o = item ) -%]</td>
!    <td>[% PROCESS form_checkbox( name = "$remove_key$item.id", value = 'yes' ) %] Remove?</td>
    </tr>
  [% END -%]
***************
*** 65,86 ****
    </tr>
  [% FOREACH blank_num = [ 1 .. blank_count ] -%]
!   [%- SET row_color = theme.odd_color -%]
!   [%- SET row_color = theme.even_color IF loop.count mod 2 == 0 -%]
!   <tr bgcolor="[% row_color %]" valign="top" align="left">
     <td colspan="2">
!    [% lookup_entry_table( id = "${new_key}${blank_num}" ) -%]
     </td>
    </tr>
  [% END -%]
  
!   <tr align="right">
!     <td colspan="2"><input type="submit" value="Save"></td>
!   </tr>
!   </table>
  
! </td></tr>
! </table>
  
! <input type="hidden" name="lookup_type" value="[% lookup_type %]">
  
  </form>
--- 57,72 ----
    </tr>
  [% FOREACH blank_num = [ 1 .. blank_count ] -%]
!   <tr bgcolor="[% PROCESS row_color( count = loop.count ) %]" valign="top" align="left">
     <td colspan="2">
!    [%- lookup_entry_table( id = "${new_key}${blank_num}" ) -%]
     </td>
    </tr>
  [% END -%]
  
! [%- PROCESS form_submit_row( value = 'Save', color = theme.bgcolor ) -%]
  
! [%- PROCESS table_bordered_end -%]
  
! [%- PROCESS form_hidden( name = 'lookup_type', value = lookup_type ) -%]
  
  </form>

Index: lookup_listing_columns.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/template/lookup_listing_columns.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lookup_listing_columns.tmpl	2001/10/03 13:09:42	1.4
--- lookup_listing_columns.tmpl	2001/10/18 12:39:44	1.5
***************
*** 20,28 ****
  
  [% MACRO lookup_entry_row BLOCK -%]
-   [%- SET row_color = theme.odd_color -%]
-   [%- SET row_color = theme.even_color IF count mod 2 == 0 -%]
    [% display_id = o.id || 'New Entry';
       this_id    = o.id || id -%]
!       <tr valign="middle" align="center" bgcolor="[% row_color %]">
          <td>ID: [% display_id %]</td>
    [% FOREACH idx = [ 0 .. field_list.max ] -%]
--- 20,26 ----
  
  [% MACRO lookup_entry_row BLOCK -%]
    [% display_id = o.id || 'New Entry';
       this_id    = o.id || id -%]
!       <tr valign="middle" align="center" bgcolor="[% PROCESS row_color %]">
          <td>ID: [% display_id %]</td>
    [% FOREACH idx = [ 0 .. field_list.max ] -%]
***************
*** 35,39 ****
    [% END -%]
          <td><font size="-1">
!   [% IF o %]<input type="checkbox" value="yes" name="[% remove_key %][% this_id %]">
    [% ELSE %]&nbsp;[% END -%]
          </font></td>
--- 33,37 ----
    [% END -%]
          <td><font size="-1">
!   [% IF o %][% PROCESS form_checkbox( name = "$remove_key$this_id", value = 'yes' ) -%]
    [% ELSE %]&nbsp;[% END -%]
          </font></td>
***************
*** 45,48 ****
--- 43,48 ----
    ########################################-%]
  
+ [%- PROCESS error_message -%]
+ 
  <h1 align="center">[% title %]</h1>
  
***************
*** 56,66 ****
  
  <form name="lookup_listing" action="/Lookups/edit/" method="POST">
- <table border="0" bgcolor="[% theme.border_color %]"
-        cellspacing="0" cellpadding="2">
- <tr><td>
  
!   <table border="0" width="100%" bgcolor="[% theme.bgcolor %]"
!          cellpadding="5" cellspacing="0">
!   [% lookup_header -%]  
  [% FOREACH item = lookup_list -%]
    [% lookup_entry_row( o = item, count = loop.count ) -%]
--- 56,63 ----
  
  <form name="lookup_listing" action="/Lookups/edit/" method="POST">
  
! [% INCLUDE table_bordered_begin -%]
! 
! [%- lookup_header -%]  
  [% FOREACH item = lookup_list -%]
    [% lookup_entry_row( o = item, count = loop.count ) -%]
***************
*** 73,85 ****
  [% END -%]
  
!   <tr align="right">
!     <td colspan="[% full_colspan %]"><input type="submit" value="Save"></td>
!   </tr>
!   </table>
  
! </td></tr>
! </table>
  
! <input type="hidden" name="lookup_type" value="[% lookup_type %]">
  
  </form>
--- 70,79 ----
  [% END -%]
  
! [% PROCESS form_submit_row( value = 'Save', colspan = full_colspan,
!                             color = theme.bgcolor ) -%]
  
! [% PROCESS table_bordered_end -%]
  
! [% PROCESS form_hidden( name = "lookup_type", value = lookup_type ) -%]
  
  </form>

Index: lookup_partitions.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/template/lookup_partitions.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lookup_partitions.tmpl	2001/10/01 22:02:37	1.1
--- lookup_partitions.tmpl	2001/10/18 12:39:44	1.2
***************
*** 1,3 ****
! [%- theme = OI.theme_properties -%]
  
  [%########################################
--- 1,3 ----
! [%- DEFAULT theme = OI.theme_properties -%]
  
  [%########################################
***************
*** 10,19 ****
    ########################################-%]
  
! [%- OI.comp( 'showerror', error_msg = error_msg ) -%]
  
  <h1 align="center">Lookup Partitions for [% lookup_type %]</h1>
  
! <p>Following are all values for the field <b>[% partition_field %]</b>.
! Choose one to edit objects that have that field's value.</p>
  
  <div align="center">
--- 10,20 ----
    ########################################-%]
  
! [%- PROCESS error_message -%]
  
  <h1 align="center">Lookup Partitions for [% lookup_type %]</h1>
  
! <p>Following are all values for the field 
! <b>[% partition_field %]</b>.  Choose one to
! edit objects that have that field's value.</p>
  
  <div align="center">
***************
*** 23,34 ****
  <p>Values: 
  
!   <select name="partition_value">
! [% FOREACH value = value_list -%]
!      <option value="[% value %]">[% value %]</option>
! [% END -%]
!   </select>
! 
!   <input type="submit" value="Go">
!   <input type="hidden" name="lookup_type" value="[% lookup_type %]">
  
  </form>
--- 24,31 ----
  <p>Values: 
  
! [% PROCESS form_submit( name = 'partition_value', plain = 1,
!                         value_list = value_list ) -%]
! [% PROCESS form_submit( value = 'Go' ) -%]
! [% PROCESS form_hidden( name = 'lookup_type', value= lookup_type ) -%]
  
  </form>

[Openinteract-commits] CVS: OpenInteract/pkg/lookup/doc lookup.pod,1.3,1.4

From: Chris W. <la...@us...> - 2001-10-18 12:39:47

Update of /cvsroot/openinteract/OpenInteract/pkg/lookup/doc
In directory usw-pr-cvs1:/tmp/cvs-serv3900/doc

Modified Files:
	lookup.pod 
Log Message:
update templates to use template widgets, including the error_message
and status_message items; modified the handler to generate a status message after an edit


Index: lookup.pod
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/doc/lookup.pod,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lookup.pod	2001/10/01 22:02:54	1.3
--- lookup.pod	2001/10/18 12:39:44	1.4
***************
*** 191,195 ****
  =head1 TO DO
  
! =head1 SEE ALSO
  
  =head1 AUTHORS
--- 191,195 ----
  =head1 TO DO
  
! Nothing known.
  
  =head1 AUTHORS

[Openinteract-commits] CVS: OpenInteract/pkg/lookup/OpenInteract/Handler LookupEdit.pm,1.5,1.6

From: Chris W. <la...@us...> - 2001-10-18 12:39:47

Update of /cvsroot/openinteract/OpenInteract/pkg/lookup/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv3900/OpenInteract/Handler

Modified Files:
	LookupEdit.pm 
Log Message:
update templates to use template widgets, including the error_message
and status_message items; modified the handler to generate a status message after an edit


Index: LookupEdit.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/OpenInteract/Handler/LookupEdit.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LookupEdit.pm	2001/10/03 13:09:42	1.5
--- LookupEdit.pm	2001/10/18 12:39:44	1.6
***************
*** 50,53 ****
--- 50,54 ----
      $R->{page}{title} = 'List Available Lookups';
      return $R->template->handler({}, { lookup_list => $class->_find_all_lookups,
+                                        status_msg  => $p->{status_msg},
                                         error_msg   => $p->{error_msg} },
                                   { name => 'lookup::lookup_classes' });
***************
*** 151,155 ****
          }
      }
!     return $class->list_lookups;
  }
  
--- 152,157 ----
          }
      }
!     return $class->list_lookups({
!               status_msg => "Entries for $lookup_type entered successfully" });
  }

[Openinteract-commits] CVS: OpenInteract/pkg/lookup Changes,1.5,1.6 package.conf,1.5,1.6

From: Chris W. <la...@us...> - 2001-10-18 12:39:47

Update of /cvsroot/openinteract/OpenInteract/pkg/lookup
In directory usw-pr-cvs1:/tmp/cvs-serv3900

Modified Files:
	Changes package.conf 
Log Message:
update templates to use template widgets, including the error_message
and status_message items; modified the handler to generate a status message after an edit


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/Changes,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Changes	2001/10/03 13:09:42	1.5
--- Changes	2001/10/18 12:39:44	1.6
***************
*** 1,4 ****
--- 1,9 ----
  Revision history for OpenInteract package lookup.
  
+ 0.16  Thu Oct 18 08:43:34 EDT 2001
+ 
+       Template updates (use widgets, display a 'no lookups' message if
+       there are none, ...)
+ 
  0.15  Tue Oct  2 10:52:21 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/package.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** package.conf	2001/10/03 13:09:42	1.5
--- package.conf	2001/10/18 12:39:44	1.6
***************
*** 1,4 ****
  name           lookup
! version        0.15
  author         Chris Winters <ch...@cw...>
  url            http://www.openinteract.org/
--- 1,4 ----
  name           lookup
! version        0.16
  author         Chris Winters <ch...@cw...>
  url            http://www.openinteract.org/

[Openinteract-commits] CVS: OpenInteract/template date_select,1.2,1.3 label_form_date_row,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 12:12:47

Update of /cvsroot/openinteract/OpenInteract/template
In directory usw-pr-cvs1:/tmp/cvs-serv30828

Modified Files:
	date_select label_form_date_row 
Log Message:
make blank handling consistent


Index: date_select
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/date_select,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** date_select	2001/10/14 20:54:47	1.2
--- date_select	2001/10/18 12:12:44	1.3
***************
*** 13,17 ****
       month_value  = chosen month (number)
       day_value    = chosen day (number)
!      blank        = if true, start each SELECT with a blank option
       year_field   = name for year SELECT
       month_field  = name for month SELECT
--- 13,17 ----
       month_value  = chosen month (number)
       day_value    = chosen day (number)
!      is_blank     = if true, start each SELECT with a blank option
       year_field   = name for year SELECT
       month_field  = name for month SELECT

Index: label_form_date_row
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/label_form_date_row,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** label_form_date_row	2001/10/14 20:54:31	1.1
--- label_form_date_row	2001/10/18 12:12:44	1.2
***************
*** 8,12 ****
  [%- INCLUDE data_cell_begin -%]
  [%- PROCESS date_select( object = OI.date_info_object( value ),
!                          blank = 1, field_prefix = name ) -%]
  [% field_label -%]
  </td></tr>
--- 8,12 ----
  [%- INCLUDE data_cell_begin -%]
  [%- PROCESS date_select( object = OI.date_info_object( value ),
!                          field_prefix = name ) -%]
  [% field_label -%]
  </td></tr>

[Openinteract-commits] CVS: OpenInteract/OpenInteract/Config Ini.pm,1.3,1.4

From: Chris W. <la...@us...> - 2001-10-18 12:03:37

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/Config
In directory usw-pr-cvs1:/tmp/cvs-serv29074

Modified Files:
	Ini.pm 
Log Message:
chop blanks off the end of all lines (otherwise we get things like
perl trying to call the method 'handler ') and use the right syntax
for referring to @_ members (blush)


Index: Ini.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Config/Ini.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ini.pm	2001/10/17 12:22:19	1.3
--- Ini.pm	2001/10/18 12:03:35	1.4
***************
*** 71,74 ****
--- 71,75 ----
          chomp;
          next if ( /^\s*$/ );
+         s/\s+$//;
          if ( /^\s*\#/ ) {
              push @comments, $_;
***************
*** 194,198 ****
  
  
! sub show_item { return join( ' = ', @_[1], @_[2] ) }
  
  1;
--- 195,199 ----
  
  
! sub show_item { return join( ' = ', $_[1], $_[2] ) }
  
  1;

[Openinteract-commits] CVS: OpenInteract/OpenInteract/Template Provider.pm,1.17,1.18

From: Chris W. <la...@us...> - 2001-10-18 12:02:33

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/Template
In directory usw-pr-cvs1:/tmp/cvs-serv28890

Modified Files:
	Provider.pm 
Log Message:
ensure template extension is looked up consistently


Index: Provider.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Template/Provider.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Provider.pm	2001/10/17 04:47:07	1.17
--- Provider.pm	2001/10/18 12:02:30	1.18
***************
*** 186,192 ****
      unless ( $tmpl_package and $tmpl_name ) {
          my $website_dir = $R->CONFIG->get_dir( 'template' );
!         my $tmpl_ext    = $R->CONFIG->{template_info}{template_ext} ||
!                           $R->CONFIG->{template_ext} ||
!                           DEFAULT_TEMPLATE_EXTENSION;
          my $common_template_name     = "$website_dir/$name";
          my $common_template_name_ext = "$common_template_name.$tmpl_ext";
--- 186,190 ----
      unless ( $tmpl_package and $tmpl_name ) {
          my $website_dir = $R->CONFIG->get_dir( 'template' );
!         my $tmpl_ext    = $self->_find_template_extension( $R->CONFIG );
          my $common_template_name     = "$website_dir/$name";
          my $common_template_name_ext = "$common_template_name.$tmpl_ext";
***************
*** 452,456 ****
      my $info = $repository->fetch_package_by_name({ name => $package });
      if ( $info ) {
!         my $template_ext = $R->CONFIG->{template_ext} || DEFAULT_TEMPLATE_EXTENSION;
          my @template_files = ( DEFAULT_PACKAGE_TEMPLATE_DIR . $template_name,
                                 DEFAULT_PACKAGE_TEMPLATE_DIR . "$template_name.$template_ext" );
--- 450,454 ----
      my $info = $repository->fetch_package_by_name({ name => $package });
      if ( $info ) {
!         my $template_ext = $self->_find_template_extension( $R->CONFIG );
          my @template_files = ( DEFAULT_PACKAGE_TEMPLATE_DIR . $template_name,
                                 DEFAULT_PACKAGE_TEMPLATE_DIR . "$template_name.$template_ext" );
***************
*** 466,469 ****
--- 464,475 ----
                    "information for ($package) not found in repository!" );
      return undef;
+ }
+ 
+ 
+ sub _find_template_extension {
+     my ( $self, $CONFIG ) = @_;
+     return $CONFIG->{template_info}{template_ext} ||
+            $CONFIG->{template_ext} ||
+            DEFAULT_TEMPLATE_EXTENSION;
  }

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity/OpenInteract/SQLInstall ObjectActivity.pm,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 03:59:10

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity/OpenInteract/SQLInstall
In directory usw-pr-cvs1:/tmp/cvs-serv20226/pkg/object_activity/OpenInteract/SQLInstall

Modified Files:
	ObjectActivity.pm 
Log Message:
fix sql installer (wrong table specified)


Index: ObjectActivity.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/OpenInteract/SQLInstall/ObjectActivity.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectActivity.pm	2001/10/18 01:38:27	1.1
--- ObjectActivity.pm	2001/10/18 03:59:07	1.2
***************
*** 9,13 ****
  
  my %files = (
!  tables   => [ 'object_activity.sql' ],
   data     => [],
   security => [ 'install_security.dat' ],
--- 9,13 ----
  
  my %files = (
!  tables   => [ 'object_track.sql' ],
   data     => [],
   security => [ 'install_security.dat' ],

[Openinteract-commits] CVS: OpenInteract/pkg/object_activity Changes,1.1,1.2 package.conf,1.1,1.2

From: Chris W. <la...@us...> - 2001-10-18 03:59:10

Update of /cvsroot/openinteract/OpenInteract/pkg/object_activity
In directory usw-pr-cvs1:/tmp/cvs-serv20226/pkg/object_activity

Modified Files:
	Changes package.conf 
Log Message:
fix sql installer (wrong table specified)


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/Changes,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Changes	2001/10/18 01:38:27	1.1
--- Changes	2001/10/18 03:59:07	1.2
***************
*** 1,4 ****
--- 1,8 ----
  Revision history for OpenInteract package object_activity.
  
+ 0.06  Thu Oct 18 00:06:07 EDT 2001
+ 
+       Fix SQL installer
+ 
  0.05  Wed 10/17/2001 
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/object_activity/package.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.conf	2001/10/18 01:38:27	1.1
--- package.conf	2001/10/18 03:59:07	1.2
***************
*** 1,4 ****
  name             object_activity
! version          0.05
  author           Chris Winters <ch...@cw...>
  module           Class::Date
--- 1,4 ----
  name             object_activity
! version          0.06
  author           Chris Winters <ch...@cw...>
  module           Class::Date

[Openinteract-commits] CVS: OpenInteract/OpenInteract Startup.pm,1.23,1.24

From: Chris W. <la...@us...> - 2001-10-18 03:58:40

Update of /cvsroot/openinteract/OpenInteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv20150/OpenInteract

Modified Files:
	Startup.pm 
Log Message:
cosmetic


Index: Startup.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Startup.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Startup.pm	2001/10/17 04:47:07	1.23
--- Startup.pm	2001/10/18 03:58:37	1.24
***************
*** 210,214 ****
      # also set other important classes from the config
  
!     my $config_file  = join( '/', $bc->{website_dir}, $bc->{config_dir}, $bc->{config_file} );
      my $C = eval { OpenInteract::Config->instance( $bc->{config_type}, $config_file ) };
      if ( $@ ) {
--- 210,215 ----
      # also set other important classes from the config
  
!     my $config_file  = join( '/', $bc->{website_dir},
!                                   $bc->{config_dir}, $bc->{config_file} );
      my $C = eval { OpenInteract::Config->instance( $bc->{config_type}, $config_file ) };
      if ( $@ ) {

[Openinteract-commits] CVS: OpenInteract MANIFEST,1.65,1.66

From: Chris W. <la...@us...> - 2001-10-18 03:57:55

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv20015

Modified Files:
	MANIFEST 
Log Message:
add login entries


Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/MANIFEST,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** MANIFEST	2001/10/17 12:08:51	1.65
--- MANIFEST	2001/10/18 03:57:52	1.66
***************
*** 111,114 ****
--- 111,115 ----
  template/form_checkbox
  template/form_hidden
+ template/form_login
  template/form_radio
  template/form_select
***************
*** 127,130 ****
--- 128,132 ----
  template/label_form_checkbox_row
  template/label_form_date_row
+ template/label_form_login_row
  template/label_form_radio_row
  template/label_form_select_row

[Openinteract-commits] CVS: OpenInteract/script oi_manage,1.47,1.48

From: Chris W. <la...@us...> - 2001-10-18 03:56:39

Update of /cvsroot/openinteract/OpenInteract/script
In directory usw-pr-cvs1:/tmp/cvs-serv19795

Modified Files:
	oi_manage 
Log Message:
cosmetic


Index: oi_manage
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/script/oi_manage,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** oi_manage	2001/10/18 02:46:27	1.47
--- oi_manage	2001/10/18 03:56:36	1.48
***************
*** 29,38 ****
  my %COMMANDS          = map { $_ => 1 }
                          qw( initial_packages list_packages list_actions list_objects
!                             install upgrade create_skeleton export_package check_package
!                             create_website install_sql test_db test_ldap change_spops_driver
!                             install_package apply_package remove_package upgrade_package
                              install_template dump_template remove_template
                              refresh_doc refresh_widget update_object
!                             upgrade_website_repository upgrade_installation_repository );
  
  # These are aliases people might type by accident instead of the
[...994 lines suppressed...]
      my $msg = "[oi_manage]: Failure! Cannot find base configuration or " .
                "configuration is invalid. Does the file: ($base_conf_file) " .
!               "exist in your website? " .
!               "(Specific error: <$p->{error}> from routine <$p->{sub}>)";
      die wrap( undef, undef, "$msg\n" );
  }
***************
*** 2633,2637 ****
      $line .= ': ' . wrap( undef, $indent, $status->{msg} )   if ( $status->{msg} );
      if ( $status->{notes} ) {
!         $line .= "\n\nNotes from Package Author (READ THESE)\n$status->{notes}\n$SEP\n";
      }
      return $line;
--- 2722,2727 ----
      $line .= ': ' . wrap( undef, $indent, $status->{msg} )   if ( $status->{msg} );
      if ( $status->{notes} ) {
!         $line .= "\n\nNotes from Package Author (READ THESE)\n" .
!                  "$status->{notes}\n$SEP\n";
      }
      return $line;

[Openinteract-commits] CVS: OpenInteract/OpenInteract/UI Main.pm,1.4,1.5

From: Chris W. <la...@us...> - 2001-10-18 02:47:46

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/UI
In directory usw-pr-cvs1:/tmp/cvs-serv7158

Modified Files:
	Main.pm 
Log Message:
don't assume that the template will be a fully-qualified name, or that
a non-qualified name will be in the base_theme package


Index: Main.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/UI/Main.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.pm	2001/09/21 17:10:44	1.4
--- Main.pm	2001/10/18 02:47:43	1.5
***************
*** 9,18 ****
      my $R = OpenInteract::Request->instance;
  
!     # Put the Popup and other directives here. A 'directive' exists
!     # before the actual url and should have been parsed out in the main
!     # Apache handler (see pkg/base/OpenInteract.pm). The value for the
!     # directive should be the key in the 'template_names' configuration
!     # information which is used below. More information about directives
!     # in the POD.
  
      if ( my $directive = $R->{ui}{directive} ) { 
--- 9,13 ----
      my $R = OpenInteract::Request->instance;
  
!     # Put the Popup and other directives here. (See DIRECTIVES in POD.)
  
      if ( my $directive = $R->{ui}{directive} ) { 
***************
*** 23,27 ****
          else {
              $R->{page}{_template_key_} = $R->CONFIG->{page_directives}{ $directive };
!             $R->DEBUG && $R->scrib( 1, "Using template key from directive: ($R->{page}{_template_key_})" );
          }
      }
--- 18,23 ----
          else {
              $R->{page}{_template_key_} = $R->CONFIG->{page_directives}{ $directive };
!             $R->DEBUG && $R->scrib( 1, "Using template key from directive: ",
!                                        "($R->{page}{_template_key_})" );
          }
      }
***************
*** 45,73 ****
      # Do our special content cases
  
!     return undef                 if ( $R->{page}{send_file} );
      return $R->{page}{content} if ( $R->{page}{_no_template_} );
  
!     # $template_key here is being used to lookup a template name within a
!     # theme
  
!     my $template_key  = $R->{page}{_template_key_};
!     $template_key   ||= 'simple_template' if ( $R->{page}{_simple_} );
!     $template_key   ||= 'main_template';
!     my $db_template_name = $R->{page}{_template_name_} || 
!                            $R->{theme}->property_value( $template_key );
!     my ( $template_pkg, $template_name ) = $R->site_template->parse_name( $db_template_name );
!     unless ( $template_pkg and $template_name ) {
!         $template_name = $db_template_name;
!         $template_pkg  = 'base_theme';
      }
  
!     $R->DEBUG && $R->scrib( 1, "Using template <<$db_template_name>> for full page" );
      $R->{main_template_vars} ||= {};
  
!     return $R->template->handler( {}, 
                                    { %{ $R->{main_template_vars} },
                                      page => $R->{page} },
!                                   { db      => $template_name,
!                                     package => $template_pkg } );
  }
  
--- 41,66 ----
      # Do our special content cases
  
!     return undef               if ( $R->{page}{send_file} );
      return $R->{page}{content} if ( $R->{page}{_no_template_} );
  
!     my $template_name = $R->{page}{_template_name_};
  
!     # If the template name isn't specified by the request, look for a
!     # template key which we can use to find the template in the theme.
! 
!     unless ( $template_name ) {
!         my $template_key  = $R->{page}{_template_key_};
!         $template_key   ||= 'simple_template' if ( $R->{page}{_simple_} );
!         $template_key   ||= 'main_template';
!         $template_name    = $R->{theme}->property_value( $template_key );
      }
  
!     $R->DEBUG && $R->scrib( 1, "Using template ($template_name) for full page" );
      $R->{main_template_vars} ||= {};
  
!     return $R->template->handler( {},
                                    { %{ $R->{main_template_vars} },
                                      page => $R->{page} },
!                                   { name => $template_name } );
  }
  
***************
*** 109,114 ****
   $R->{page}{_template_name_}
  
! to the name of the template to use. (This, and all templates named
! here, should be found in the 'base_theme' package.)
  
  You can also set a template that might vary by theme. This is not the
--- 102,109 ----
   $R->{page}{_template_name_}
  
! to the name of the template to use. This should be a fully-qualified
! template name -- such as 'mypkg::mytemplate'. If you do not specify a
! package the OI template provider will try to find the template in the
! global template directory.
  
  You can also set a template that might vary by theme. This is not the
***************
*** 163,167 ****
  A directive (or 'page directive') is placed before the relevant action
  in the URL and tells OpenInteract to display the content in a certain
! manner.
  
  For instance:
--- 158,163 ----
  A directive (or 'page directive') is placed before the relevant action
  in the URL and tells OpenInteract to display the content in a certain
! manner. The directive should have been parsed out in the main content
! handler (OpenInteract.pm).
  
  For instance:

[Openinteract-commits] CVS: OpenInteract/script oi_manage,1.46,1.47

From: Chris W. <la...@us...> - 2001-10-18 02:46:30

Update of /cvsroot/openinteract/OpenInteract/script
In directory usw-pr-cvs1:/tmp/cvs-serv6902

Modified Files:
	oi_manage 
Log Message:
add the new package 'object_activity' and the .ini configuration file


Index: oi_manage
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/script/oi_manage,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** oi_manage	2001/10/17 04:47:08	1.46
--- oi_manage	2001/10/18 02:46:27	1.47
***************
*** 66,71 ****
  my @WEBSITE_BASE_PKG  = qw( base base_box base_component base_error
                              base_group base_security base_template
!                             base_theme base_user lookup results_manage 
!                             static_page system_doc );
  
  # Extra packages shipped with OI -- small applications that show how things work
--- 66,71 ----
  my @WEBSITE_BASE_PKG  = qw( base base_box base_component base_error
                              base_group base_security base_template
!                             base_theme base_user lookup object_activity
!                             results_manage static_page system_doc );
  
  # Extra packages shipped with OI -- small applications that show how things work
***************
*** 1656,1667 ****
  
      my %file_match = (
!         "conf/sample-Stash.pm"           => "$p->{website_name}/Stash.pm",
!         "conf/sample-httpd_modperl.conf" => "conf/httpd_modperl.conf",
          "conf/sample-httpd_modperl_solo.conf" => "conf/httpd_modperl_solo.conf",
!         "conf/sample-httpd_static.conf"  => "conf/httpd_static.conf",
!         "conf/sample-base.conf"          =>  "conf/base.conf",
!         "conf/sample-server.perl"        => "conf/server.perl",
!         "conf/sample-startup.pl"         => "conf/startup.pl",
!         "INSTALL.website"                => "INSTALL.website"
      );
      my $replace_keys = [ '%%INTERACT_DIR%%', '%%WEBSITE_DIR%%',
--- 1656,1668 ----
  
      my %file_match = (
!         "conf/sample-Stash.pm"                => "$p->{website_name}/Stash.pm",
!         "conf/sample-httpd_modperl.conf"      => "conf/httpd_modperl.conf",
          "conf/sample-httpd_modperl_solo.conf" => "conf/httpd_modperl_solo.conf",
!         "conf/sample-httpd_static.conf"       => "conf/httpd_static.conf",
!         "conf/sample-base.conf"               => "conf/base.conf",
!         "conf/sample-server.perl"             => "conf/server.perl",
!         "conf/sample-server.ini"              => "conf/server.ini",
!         "conf/sample-startup.pl"              => "conf/startup.pl",
!         "INSTALL.website"                     => "INSTALL.website"
      );
      my $replace_keys = [ '%%INTERACT_DIR%%', '%%WEBSITE_DIR%%',

4 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 280 281 282 283 284 .. 289 > >> (Page 282 of 289)