[Cmfcollectorng-cvs] CMFCollectorNG/skins/collectorng collector_macros.pt,1.13.2.1,1.13.2.2 collector_issue_edit_form.pt,1.10,1.10.2.1

[<aj...@us...>]

Update of /cvsroot/cmfcollectorng/CMFCollectorNG/skins/collectorng
In directory sc8-pr-cvs1:/tmp/cvs-serv28981

Modified Files:
      Tag: V-0_20-branch
	collector_macros.pt collector_issue_edit_form.pt 
Log Message:
added conditional support for custom1-3


Index: collector_macros.pt
===================================================================
RCS file: /cvsroot/cmfcollectorng/CMFCollectorNG/skins/collectorng/collector_macros.pt,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** collector_macros.pt	21 Mar 2003 09:21:53 -0000	1.13.2.1
--- collector_macros.pt	1 Apr 2003 07:29:11 -0000	1.13.2.2
***************
*** 207,218 ****
             <td>
               <table>
!                <tr tal:repeat="item python:['importance','topic','subtopic','version_info', 'operating_system','classification']">
!                  <th valign="top" align="right"
!                      i18n:translate="" 
!                      tal:content="python: here.trans(getProp(item).getDescription()) + ':'"/>
!                  <td> 
!                    <div tal:replace="python: here.format_value(getProp(item).getRepresentation(getattr(here, item)))"/>
!                  </td>
!                </tr>
  
                 <tr>
--- 207,221 ----
             <td>
               <table>
! 
!                <metal:block tal:repeat="item python:['importance','topic','subtopic','version_info', 'operating_system','classification','custom1','custom2','custom3']">
!                  <tr tal:condition="python: getProp(item).getUsed()">
!                    <th valign="top" align="right"
!                        i18n:translate="" 
!                        tal:content="python: here.trans(getProp(item).getDescription()) + ':'"/>
!                    <td> 
!                      <div tal:replace="python: here.format_value(getProp(item).getRepresentation(getattr(here, item)))"/>
!                    </td>
!                  </tr>
!                </metal:block>
  
                 <tr>
***************
*** 265,269 ****
            <tr>
              <td>
!               <span tal:repeat="item python:['submitter_company','submitter_name','submitter_position','submitter_address','submitter_city','submitter_phone','submitter_fax','submitter_email']">
                  <span tal:condition="python: getattr(here, item, '')">
                    <b i18n:translate=""
--- 268,272 ----
            <tr>
              <td>
!               <span tal:repeat="item python:['submitter_company','submitter_name','submitter_position','submitter_address','submitter_city','submitter_phone','submitter_fax','submitter_email','haufeidx']">
                  <span tal:condition="python: getattr(here, item, '')">
                    <b i18n:translate=""

Index: collector_issue_edit_form.pt
===================================================================
RCS file: /cvsroot/cmfcollectorng/CMFCollectorNG/skins/collectorng/collector_issue_edit_form.pt,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** collector_issue_edit_form.pt	4 Feb 2003 17:59:13 -0000	1.10
--- collector_issue_edit_form.pt	1 Apr 2003 07:29:11 -0000	1.10.2.1
***************
*** 18,22 ****
  
        <form method="POST" enctype="multipart/form-data" action="collector_issue_edit" 
!             name="myform" 
              tal:condition="python: 'TrackerAdmin'== here.getTrackerRole(member) or
                                     'Manager'==here.getTrackerRole(member) or
--- 18,22 ----
  
        <form method="POST" enctype="multipart/form-data" action="collector_issue_edit" 
!             name="myform"                                                                   
              tal:condition="python: 'TrackerAdmin'== here.getTrackerRole(member) or
                                     'Manager'==here.getTrackerRole(member) or
***************
*** 29,37 ****
             <legend i18n:translate="legend_issue_details">Issue details</legend>
             <table>
! 
!              <tr tal:repeat="field python:['title','description','solution','importance','topic','subtopic','version_info','operating_system','classification','security_related']">
!                <th tal:content="python: here.trans(getProp(field).getDescription())" /> 
!                <td tal:content="structure python: here.render_property(getProp(field),getattr(here, field))" />
!              </tr>
             </table>
           </fieldset>
--- 29,38 ----
             <legend i18n:translate="legend_issue_details">Issue details</legend>
             <table>
!              <metal:block tal:repeat="field python:['title','description','solution','importance','topic','subtopic','version_info','operating_system','classification','security_related','custom1','custom2','custom3']">
!                <tr tal:condition="python: getProp(field).getUsed()">
!                  <th tal:content="python: here.trans(getProp(field).getDescription())" /> 
!                  <td tal:content="structure python: here.render_property(getProp(field),getattr(here, field))" />
!                </tr>
!              </metal:block>
             </table>
           </fieldset>