Added test cgi radio.

diff --git a/data/zakformtests/xml/cgi.xml b/data/zakformtests/xml/cgi.xml
index a2bdede37dae8e8d0beb164f8e08da8d57cd1a85..a7ab054cd2ed2fba33ad3d06c93e5487787751d9 100644 (file)
--- a/data/zakformtests/xml/cgi.xml
+++ b/data/zakformtests/xml/cgi.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <zakform>
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>id</id>
        <type>integer</type>
        <is-key>TRUE</is-key>
@@ -20,7 +20,7 @@
   <!--         <label>label8</label> -->
   <!-- </element> -->
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>name</id>
        <type>string</type>
        <default-value>John Doe</default-value>
@@ -30,7 +30,7 @@
        <validator type="zak_form_element_validator_notempty"></validator>
   </element>
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>age</id>
        <type>integer</type>
        <default-value>33</default-value>
@@ -39,14 +39,14 @@
        <validator type="zak_form_element_validator_notempty">0</validator>
   </element>
 
-  <element type="zak_cgi_form_element_check">
+  <element type="zak_form_cgi_form_element_check">
        <id>married</id>
        <type>boolean</type>
        <default-value>TRUE</default-value>
        <label>Married</label>
   </element>
 
-  <element type="zak_cgi_form_element_text_area">
+  <element type="zak_form_cgi_form_element_text_area">
        <id>description</id>
        <type>string</type>
        <default-value>dafault value for textview
@@ -56,7 +56,7 @@ and                                    some            tabs
        <label>Description</label>
   </element>
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>birthday</id>
        <type>datetime</type>
        <default-value>@now</default-value>
@@ -65,41 +65,25 @@ and                                  some            tabs
        <validator type="zak_form_element_validator_date">%d/%m/%Y</validator>
   </element>
 
-  <!-- <element type="zak_cgi_form_element_radio"> -->
-  <!--         <id>sex</id> -->
-  <!--         <type>string</type> -->
-  <!--         <default-value>M</default-value> -->
-  <!--         <widget>rbtnNone</widget> -->
-  <!--         <label>label3</label> -->
-  <!--         <return-value></return-value> -->
-  <!-- </element> -->
-
-  <!-- <element type="zak_cgi_form_element_radio"> -->
-  <!--         <id>sex</id> -->
-  <!--         <type>string</type> -->
-  <!--         <default-value>M</default-value> -->
-  <!--         <widget>rbtnMale</widget> -->
-  <!--         <label>label3</label> -->
-  <!--         <return-value>M</return-value> -->
-  <!-- </element> -->
-
-  <!-- <element type="zak_cgi_form_element_radio"> -->
-  <!--         <id>sex</id> -->
-  <!--         <type>string</type> -->
-  <!--         <default-value>M</default-value> -->
-  <!--         <widget>rbtnFemale</widget> -->
-  <!--         <label>label3</label> -->
-  <!--         <return-value>F</return-value> -->
-  <!-- </element> -->
+  <element type="zak_form_cgi_form_element_radio">
+       <id>sex</id>
+       <type>string</type>
+       <default-value>M</default-value>
+       <label>Sex</label>
+       <zak-cgi-options>
+         <option value="M" content="Male"/>
+         <option value="F" content="Female"/>
+       </zak-cgi-options>
+  </element>
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>income</id>
        <type>float</type>
        <format currency_symbol="" decimals="3" thousands_separator="-" />
        <label>Income</label>
   </element>
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>date_from</id>
        <type>datetime</type>
        <format>%d/%m/%Y</format>
@@ -107,7 +91,7 @@ and                                   some            tabs
        <validator type="zak_form_element_validator_date">%d/%m/%Y</validator>
   </element>
 
-  <element type="zak_cgi_form_element_text">
+  <element type="zak_form_cgi_form_element_text">
        <id>date_to</id>
        <type>datetime</type>
        <format>%d/%m/%Y</format>
@@ -115,7 +99,7 @@ and                                   some            tabs
        <validator type="zak_form_element_validator_date">%d/%m/%Y</validator>
   </element>
 
-  <element type="zak_cgi_form_element_submit">
+  <element type="zak_form_cgi_form_element_submit">
        <id>submit</id>
        <to-load>FALSE</to-load>
        <to-save>FALSE</to-save>