X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=xml%2Fschema%2FCampaign%2FSurvey.xml;h=e85b1eeb13e947515f82a4a6486903f21f13549b;hb=c3b9508c6f950351186517c3a321a0aed4ee7ff8;hp=0f8d394f9cbf5f487a7a3e0101c1445c64057e9c;hpb=6d087d5bd6fd4bb318ab970ff391e87db5ada37c;p=civicrm-core.git

diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml
index 0f8d394f9c..e85b1eeb13 100644
--- a/xml/schema/Campaign/Survey.xml
+++ b/xml/schema/Campaign/Survey.xml
@@ -24,6 +24,7 @@
       <type>varchar</type>
       <length>255</length>
       <required>true</required>
+      <localizable>true</localizable>
       <comment>Title of the Survey.</comment>
       <import>true</import>
       <add>3.3</add>
@@ -38,7 +39,6 @@
       <table>civicrm_campaign</table>
       <keyColumn>id</keyColumn>
       <labelColumn>title</labelColumn>
-      <condition>(end_date IS NULL OR end_date > NOW())</condition>
     </pseudoconstant>
     <add>3.3</add>
   </field>
@@ -52,7 +52,7 @@
 
   <field>
     <name>activity_type_id</name>
-    <title>Activity Type ID</title>
+    <title>Activity Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
     <comment>Implicit FK to civicrm_option_value where option_group = activity_type</comment>
@@ -61,6 +61,9 @@
     <pseudoconstant>
       <optionGroupName>activity_type</optionGroupName>
     </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <index>
     <name>UI_activity_type_id</name>
@@ -72,19 +75,24 @@
     <name>recontact_interval</name>
     <type>text</type>
     <comment>Recontact intervals for each status.</comment>
-    <htmlType>textarea</htmlType>
-    <rows>20</rows>
-    <cols>80</cols>
+    <html>
+      <type>TextArea</type>
+      <rows>20</rows>
+      <cols>80</cols>
+    </html>
     <add>3.3</add>
   </field>
 
   <field>
     <name>instructions</name>
     <type>text</type>
+    <localizable>true</localizable>
     <comment>Script instructions for volunteers to use for the survey.</comment>
-    <htmlType>textarea</htmlType>
-    <rows>20</rows>
-    <cols>80</cols>
+    <html>
+      <type>TextArea</type>
+      <rows>20</rows>
+      <cols>80</cols>
+    </html>
     <add>3.3</add>
   </field>
 
@@ -200,9 +208,11 @@
     <name>thankyou_text</name>
     <title>Thank-you Text</title>
     <type>text</type>
-    <htmlType>textarea</htmlType>
-    <rows>8</rows>
-    <cols>60</cols>
+    <html>
+      <type>TextArea</type>
+      <rows>8</rows>
+      <cols>60</cols>
+    </html>
     <localizable>true</localizable>
     <comment>text and html allowed. displayed above result on success page</comment>
     <add>4.2</add>
