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

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

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

Modified Files:
	form_select form_select_option 
Log Message:
update to enable plain select box creation (just from lists, not objects)


Index: form_select
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/form_select,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** form_select	2001/10/09 00:52:45	1.2
--- form_select	2001/10/11 15:12:05	1.3
***************
*** 1,5 ****
  [%########################################
    form_select( name(*), list/iterator(*), value_field(*), label_field, 
!                picked, first_label, is_multiple, size, field_label )
       Create a SELECT dropdown box where the options are specified by
       objects in 'list' or 'iterator'
--- 1,5 ----
  [%########################################
    form_select( name(*), list/iterator(*), value_field(*), label_field, 
!                picked, first_label, first_blank, is_multiple, size, field_label )
       Create a SELECT dropdown box where the options are specified by
       objects in 'list' or 'iterator'
***************
*** 7,14 ****
  
  [%- INCLUDE form_select_intro -%]
! [%- IF first_label -%]
    <option value="">[% first_label %]</option>
  [%- END -%]
! [% IF iterator %][% INCLUDE form_select_options_iterator -%]
! [% ELSE        %][% INCLUDE form_select_options_list() -%][% END -%]
  </select> [% field_label %]
--- 7,15 ----
  
  [%- INCLUDE form_select_intro -%]
! [%- IF first_label OR first_blank -%]
    <option value="">[% first_label %]</option>
  [%- END -%]
! [% IF plain       %][% INCLUDE form_select_options_plain_list -%]
! [% ELSIF iterator %][% INCLUDE form_select_options_iterator -%]
! [% ELSE           %][% INCLUDE form_select_options_list -%][% END -%]
  </select> [% field_label %]

Index: form_select_option
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/form_select_option,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** form_select_option	2001/10/08 20:24:02	1.2
--- form_select_option	2001/10/11 15:12:05	1.3
***************
*** 3,10 ****
       Display a single OPTION item for use in a <SELECT> dropdown.
    ########################################-%]
! 
! [%- SET use_label_field = label_field || value_field;
!     SET value           = item.$value_field;
!     SET label           = item.$use_label_field;
!     SET is_picked       = ( value == picked ) ? 'SELECTED' : ''; -%]
! <option value="[% value %]" [% is_pick %]>[% label %]</option>
\ No newline at end of file
--- 3,11 ----
       Display a single OPTION item for use in a <SELECT> dropdown.
    ########################################-%]
! [%- UNLESS plain -%]
!   [%- SET use_label_field = label_field || value_field;
!       SET value           = item.$value_field;
!       SET label           = item.$use_label_field; -%]
! [%- END -%]
! [%- SET is_picked = ( value == picked ) ? ' SELECTED' : '' -%] 
! <option value="[% value %]"[% is_picked %]>[% label %]</option>