projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2641cb7 e099179)
Merge pull request #1765 from lynndanzig/master
authorcolemanw <coleman@civicrm.org>
Wed, 11 Dec 2013 21:27:17 +0000 (13:27 -0800)
committercolemanw <coleman@civicrm.org>
Wed, 11 Dec 2013 21:27:17 +0000 (13:27 -0800)
CRM-13497 - Add html type to schema xml

1  2 
xml/schema/Campaign/Campaign.xml patch | diff1 | diff2 | blob | history
xml/schema/Contact/Contact.xml patch | diff1 | diff2 | blob | history
xml/schema/Contact/Group.xml patch | diff1 | diff2 | blob | history
xml/schema/Contribute/ContributionPage.xml patch | diff1 | diff2 | blob | history
xml/schema/Contribute/ContributionRecur.xml patch | diff1 | diff2 | blob | history
xml/schema/Contribute/ContributionSoft.xml patch | diff1 | diff2 | blob | history
xml/schema/Core/MappingField.xml patch | diff1 | diff2 | blob | history
xml/schema/Core/WordReplacement.xml patch | diff1 | diff2 | blob | history

diff --cc xml/schema/Campaign/Campaign.xml
Simple merge
diff --cc xml/schema/Contact/Contact.xml
Simple merge
diff --cc xml/schema/Contact/Group.xml
Simple merge
diff --cc xml/schema/Contribute/ContributionPage.xml
index 10aa925d26a57910f3a5126aa4ab94ebc021548f,2eb505980289a7218721fa947597fc5f13e2ea69..738ab211dfff878abf770782f521093f3af2ab7e
--- 1/xml/schema/Contribute/ContributionPage.xml
--- 2/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@@ -29,11 -28,12 +29,13 @@@
    </field>
    <field>
      <name>intro_text</name>
 +    <title>Contribution Page Introduction Text</title>
      <type>text</type>
-     <htmlType>textarea</htmlType>
-     <rows>6</rows>
-     <cols>50</cols>
+     <html>
+       <type>TextArea</type>
+       <rows>6</rows>
+       <cols>50</cols>
+     </html>
      <localizable>true</localizable>
      <comment>Text and html allowed. Displayed below title.</comment>
      <add>1.3</add>
@@@ -345,11 -360,12 +363,13 @@@
    </field>
    <field>
      <name>honor_block_text</name>
 +    <title>Contribution Page Honor Block Text</title>
      <type>text</type>
-     <htmlType>textarea</htmlType>
-     <rows>2</rows>
-     <cols>50</cols>
+     <html>
+       <type>TextArea</type>
+       <rows>2</rows>
+       <cols>50</cols>
+     </html>
      <localizable>true</localizable>
      <comment>text for honor block.</comment>
      <add>1.5</add>
diff --cc xml/schema/Core/MappingField.xml
index cf2ef8783a695aa232be26f675dbc04af3bde1db,da9e05043b4cc083e5c6bc20130c2759f5d01346..1094e08af1cf38d9ed14d4607c8844112ca44ff7
--- 1/xml/schema/Core/MappingField.xml
--- 2/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@@ -130,9 -139,12 +139,12 @@@
         <name>operator</name>
         <type>enum</type>
         <values>&#61;, !&#61;, &#62;, &#60;, &#62;&#61;, &#60;&#61;,
 -       IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL</values>
 +       IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL, IS NOT EMPTY, IS EMPTY</values>
         <comment>SQL WHERE operator for search-builder mapping fields (search criteria).</comment>
        <add>1.5</add>
+       <html>
+         <type>Select</type>
+       </html>
    </field>
    <field>
         <name>value</name>
diff --cc xml/schema/Core/WordReplacement.xml
Simple merge