[Openinteract-commits] CVS: OpenInteract2/pkg/base_box/OpenInteract2/Action Box.pm,1.10,1.11

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25795/OpenInteract2/Action

Modified Files:
	Box.pm 
Log Message:
Allow title, title image and ALT tag of title image to be reference with localization key

Index: Box.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action/Box.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Box.pm	25 Sep 2004 18:18:23 -0000	1.10
--- Box.pm	24 Oct 2004 15:03:01 -0000	1.11
***************
*** 253,259 ****
          }
          $shell_params->{content} = $base_content;
!         $shell_params->{label} = $action->param( 'title' );
!         $shell_params->{label_image_src} = $action->param( 'title_image_src' );
!         $shell_params->{label_image_alt} = $action->param( 'title_image_alt' );
          push @content, $action->generate_content( $shell_params,
                                                    { name => $shell_template } );
--- 253,262 ----
          }
          $shell_params->{content} = $base_content;
!         $shell_params->{label} = $action->message_from_key_or_param(
!             'title', 'title_key' );
!         $shell_params->{label_image_src} = $action->message_from_key_or_param(
!             'title_image_src', 'title_image_src_key' );
!         $shell_params->{label_image_alt} = $action->message_from_key_or_param(
!             'title_image_alt', 'title_image_alt_key' );
          push @content, $action->generate_content( $shell_params,
                                                    { name => $shell_template } );
***************
*** 315,319 ****
  
   # Define an OI action (in conf/action.ini) to be used for a
!  # template-only box:
   
   [frequent_links_box]
--- 318,323 ----
  
   # Define an OI action (in conf/action.ini) to be used for a
!  # template-only box, using a localization key instead of a direct
!  # title :
   
   [frequent_links_box]
***************
*** 321,325 ****
   template   = mypkg::box_frequent_links
   weight     = 8
!  title      = Frequent Links
   security   = no
  
--- 325,329 ----
   template   = mypkg::box_frequent_links
   weight     = 8
!  title_key  = frequent_links.title
   security   = no
  
***************
*** 522,525 ****
--- 526,536 ----
  =item *
  
+ B<title_key> ($) (optional)
+ 
+ Localization key to use for box title, generally used in place of
+ 'title' and if both are present this will be used.
+ 
+ =item *
+ 
  B<title_image_src> ($) (optional)
  
***************
*** 528,531 ****
--- 539,549 ----
  =item *
  
+ B<title_image_src_key> ($) (optional)
+ 
+ Localization key to use for image title, generally used in place of
+ 'title_image_src' and if both are present this will be used.
+ 
+ =item *
+ 
  B<title_image_alt> ($) (optional)
  
***************
*** 534,537 ****
--- 552,563 ----
  =item *
  
+ B<title_image_alt_key> ($) (optional)
+ 
+ Localization key to use for the 'alt' tag in the image title,
+ generally used in place of 'title_image_alt' and if both are present
+ this will be used.
+ 
+ =item *
+ 
  B<weight> ($)