projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86d3bfa)
CRM-15168 whitespace only
authorEileen McNaughton <eileen@fuzion.co.nz>
Fri, 22 Aug 2014 23:03:53 +0000 (11:03 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Fri, 22 Aug 2014 23:03:53 +0000 (11:03 +1200)
xml/schema/ACL/EntityRole.xml patch | blob | blame | history
xml/schema/Contact/ContactType.xml patch | blob | blame | history
xml/schema/Contribute/ContributionPage.xml patch | blob | blame | history
xml/schema/Core/MailSettings.xml patch | blob | blame | history
xml/schema/Core/UFField.xml patch | blob | blame | history

diff --git a/xml/schema/ACL/EntityRole.xml b/xml/schema/ACL/EntityRole.xml
index 0432031236ae978b8ca6d69477455844b8754d58..471787fdd128d47c8f11e4f28a8c84b693927cd4 100644 (file)
--- a/xml/schema/ACL/EntityRole.xml
+++ b/xml/schema/ACL/EntityRole.xml
@@ -9,6 +9,7 @@
   <field>
     <name>id</name>
     <type>int unsigned</type>
+    <title>Entity Role</title>
     <required>true</required>
     <comment>Unique table ID</comment>
     <add>1.6</add>
@@ -19,6 +20,7 @@
   </primaryKey>
   <field>
     <name>acl_role_id</name>
+    <title>ACL Role ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)</comment>
diff --git a/xml/schema/Contact/ContactType.xml b/xml/schema/Contact/ContactType.xml
index 79582abbf2510468315bb1bc8fbbcb8d7be7ce75..6088cec3fe931c285cd0c90bb2f08b5f334a3bf4 100644 (file)
--- a/xml/schema/Contact/ContactType.xml
+++ b/xml/schema/Contact/ContactType.xml
@@ -7,22 +7,22 @@
   <comment>Provide type information for contacts</comment>
   <add>3.1</add>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Contact Type ID</comment>
-      <add>1.1</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Contact Type ID</comment>
+    <add>1.1</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>name</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>Internal name of Contact Type (or Subtype).</comment>
-       <add>3.1</add>
+    <name>name</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>Internal name of Contact Type (or Subtype).</comment>
+    <add>3.1</add>
   </field>
   <index>
     <name>contact_type</name>
@@ -31,49 +31,49 @@
     <add>3.1</add>
   </index>
   <field>
-       <name>label</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>localized Name of Contact Type.</comment>
-       <localizable>true</localizable>
-       <add>3.1</add>
+    <name>label</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>localized Name of Contact Type.</comment>
+    <localizable>true</localizable>
+    <add>3.1</add>
   </field>
   <field>
-       <name>description</name>
-       <type>text</type>
-       <html>
-         <type>TextArea</type>
-         <rows>2</rows>
-         <cols>60</cols>
-       </html>
-       <comment>localized Optional verbose description of the type.</comment>
-       <localizable>true</localizable>
-       <add>3.1</add>
+    <name>description</name>
+    <type>text</type>
+    <html>
+      <type>TextArea</type>
+      <rows>2</rows>
+      <cols>60</cols>
+    </html>
+    <comment>localized Optional verbose description of the type.</comment>
+    <localizable>true</localizable>
+    <add>3.1</add>
   </field>
   <field>
-       <name>image_URL</name>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>URL of image if any.</comment>
-       <add>3.1</add>
+    <name>image_URL</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>URL of image if any.</comment>
+    <add>3.1</add>
   </field>
   <field>
-      <name>parent_id</name>
-      <type>int unsigned</type>
-      <comment>Optional FK to parent contact type.</comment>
-       <add>3.1</add>
+    <name>parent_id</name>
+    <type>int unsigned</type>
+    <comment>Optional FK to parent contact type.</comment>
+    <add>3.1</add>
   </field>
   <foreignKey>
-       <name>parent_id</name>
-       <table>civicrm_contact_type</table>
-       <key>id</key>
-       <add>3.1</add>
+    <name>parent_id</name>
+    <table>civicrm_contact_type</table>
+    <key>id</key>
+    <add>3.1</add>
   </foreignKey>
   <field>
-       <name>is_active</name>
-       <type>boolean</type>
-       <comment>Is this entry active?</comment>
-       <add>3.1</add>
+    <name>is_active</name>
+    <type>boolean</type>
+    <comment>Is this entry active?</comment>
+    <add>3.1</add>
   </field>
   <field>
     <name>is_reserved</name>
@@ -81,4 +81,4 @@
     <comment>Is this contact type a predefined system type</comment>
     <add>3.1</add>
   </field>
-  </table>
+</table>
diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 76b4775ca3fe1266284d8565654b5b7d3cf2e412..25429e2ad4f090ef0b4c888f49ac06abf63f85ac 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -347,12 +347,14 @@
   </field>
   <field>
     <name>is_active</name>
+    <title>Is Page Active?</title>
     <type>boolean</type>
     <comment>Is this property active?</comment>
     <add>1.3</add>
   </field>
   <field>
     <name>footer_text</name>
+    <title>Footer Text</title>
     <type>text</type>
     <html>
       <type>TextArea</type>
@@ -365,6 +367,7 @@
   </field>
   <field>
     <name>amount_block_is_active</name>
+    <title>Is Amount Block Active?</title>
     <type>boolean</type>
     <comment>Is this property active?</comment>
     <default>1</default>
@@ -372,6 +375,7 @@
   </field>
   <field>
     <name>start_date</name>
+    <title>Contribution Page Start Date</title>
     <type>datetime</type>
     <title>Contribution Page Start Date</title>
     <comment>Date and time that this page starts.</comment>
diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml
index f887cfbc9ed5b875eb9123eb39a2201e754c1ba2..08585e17c59aa060b68c6fdac6e59f59c2b743cc 100644 (file)
--- a/xml/schema/Core/MailSettings.xml
+++ b/xml/schema/Core/MailSettings.xml
@@ -16,22 +16,22 @@
     <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>domain_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <pseudoconstant>
-          <table>civicrm_domain</table>
-          <keyColumn>id</keyColumn>
-          <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <comment>Which Domain is this match entry for</comment>
-      <add>3.1</add>
+    <name>domain_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <comment>Which Domain is this match entry for</comment>
+    <add>3.1</add>
   </field>
   <foreignKey>
-       <name>domain_id</name>
-       <table>civicrm_domain</table>
-       <key>id</key>
-       <add>4.5</add>
+    <name>domain_id</name>
+    <table>civicrm_domain</table>
+    <key>id</key>
+    <add>4.5</add>
   </foreignKey>
   <field>
     <name>name</name>
diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml
index 6fd2c438bb2b31a597190911eb44ce30d150857d..ae7fec50bf71380684a94ebcd617cd079cf63d48 100644 (file)
--- a/xml/schema/Core/UFField.xml
+++ b/xml/schema/Core/UFField.xml
@@ -8,167 +8,167 @@
   <add>1.1</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Unique table ID</comment>
-      <add>1.1</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Unique table ID</comment>
+    <add>1.1</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>uf_group_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Which form does this field belong to.</comment>
-      <add>1.1</add>
-      <pseudoconstant>
-        <table>civicrm_uf_group</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>title</labelColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
+    <name>uf_group_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Which form does this field belong to.</comment>
+    <add>1.1</add>
+    <pseudoconstant>
+      <table>civicrm_uf_group</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>title</labelColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <foreignKey>
-       <name>uf_group_id</name>
-       <table>civicrm_uf_group</table>
-       <key>id</key>
-       <add>1.1</add>
-       <onDelete>CASCADE</onDelete>
+    <name>uf_group_id</name>
+    <table>civicrm_uf_group</table>
+    <key>id</key>
+    <add>1.1</add>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-       <name>field_name</name>
-       <type>varchar</type>
-       <length>64</length>
-       <required>true</required>
-       <comment>Name for CiviCRM field which is being exposed for sharing.</comment>
-       <add>1.1</add>
-  </field>
-  <field>
-       <name>is_active</name>
-       <type>boolean</type>
-       <default>1</default>
-       <comment>Is this field currently shareable? If false, hide the field for all sharing contexts.</comment>
-       <add>1.1</add>
-  </field>
-  <field>
-       <name>is_view</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>the field is view only and not editable in user forms.</comment>
-       <add>1.1</add>
+    <name>field_name</name>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>Name for CiviCRM field which is being exposed for sharing.</comment>
+    <add>1.1</add>
   </field>
   <field>
-       <name>is_required</name>
-       <type>boolean</type>
-        <default>0</default>
-       <comment>Is this field required when included in a user or registration form?</comment>
-       <add>1.1</add>
-  </field>
-  <field>
-      <name>weight</name>
-      <type>int</type>
-      <required>true</required>
-      <default>1</default>
-      <comment>Controls field display order when user framework fields are displayed in registration and account editing forms.</comment>
-      <add>1.1</add>
+    <name>is_active</name>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Is this field currently shareable? If false, hide the field for all sharing contexts.</comment>
+    <add>1.1</add>
   </field>
   <field>
-     <name>help_post</name>
-     <type>text</type>
-     <localizable>true</localizable>
-     <comment>Description and/or help text to display after this field.</comment>
-     <add>1.1</add>
+    <name>is_view</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>the field is view only and not editable in user forms.</comment>
+    <add>1.1</add>
   </field>
   <field>
-     <name>help_pre</name>
-     <type>text</type>
-     <localizable>true</localizable>
-     <comment>Description and/or help text to display before this field.</comment>
-     <add>3.2</add>
+    <name>is_required</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this field required when included in a user or registration form?</comment>
+    <add>1.1</add>
   </field>
   <field>
-       <name>is_registration</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this field included in new user registration forms?</comment>
-       <add>1.1</add>
-       <drop>1.3</drop>
+    <name>weight</name>
+    <type>int</type>
+    <required>true</required>
+    <default>1</default>
+    <comment>Controls field display order when user framework fields are displayed in registration and account editing forms.</comment>
+    <add>1.1</add>
   </field>
   <field>
-       <name>is_match</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this field part of the key for matching users to contacts?</comment>
-       <add>1.1</add>
-       <drop>1.3</drop>
+    <name>help_post</name>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Description and/or help text to display after this field.</comment>
+    <add>1.1</add>
   </field>
   <field>
-       <name>visibility</name>
-       <type>varchar</type>
-       <length>32</length>
-       <default>'User and User Admin Only'</default>
-       <comment>In what context(s) is this field visible.</comment>
-       <pseudoconstant>
-         <callback>CRM_Core_SelectValues::ufVisibility</callback>
-       </pseudoconstant>
-       <add>1.1</add>
-       <html>
-         <type>Select</type>
-       </html>
+    <name>help_pre</name>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Description and/or help text to display before this field.</comment>
+    <add>3.2</add>
   </field>
   <field>
-       <name>listings_title</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>Page title for listings page (users who share a common value for this property).</comment>
-       <add>1.1</add>
-       <drop>1.2</drop>
+    <name>is_registration</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this field included in new user registration forms?</comment>
+    <add>1.1</add>
+    <drop>1.3</drop>
   </field>
   <field>
-       <name>in_selector</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this field included as a column in the selector table?</comment>
-       <add>1.2</add>
+    <name>is_match</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this field part of the key for matching users to contacts?</comment>
+    <add>1.1</add>
+    <drop>1.3</drop>
+  </field>
+  <field>
+    <name>visibility</name>
+    <type>varchar</type>
+    <length>32</length>
+    <default>'User and User Admin Only'</default>
+    <comment>In what context(s) is this field visible.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::ufVisibility</callback>
+    </pseudoconstant>
+    <add>1.1</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>listings_title</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>Page title for listings page (users who share a common value for this property).</comment>
+    <add>1.1</add>
+    <drop>1.2</drop>
+  </field>
+  <field>
+    <name>in_selector</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this field included as a column in the selector table?</comment>
+    <add>1.2</add>
   </field>
   <field>
-       <name>is_searchable</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this field included search form of profile?</comment>
-       <add>1.4</add>
+    <name>is_searchable</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this field included search form of profile?</comment>
+    <add>1.4</add>
   </field>
   <field>
-       <name>location_type_id</name>
-       <type>int unsigned</type>
-       <comment>Location type of this mapping, if required</comment>
-      <add>1.3</add>
+    <name>location_type_id</name>
+    <type>int unsigned</type>
+    <comment>Location type of this mapping, if required</comment>
+    <add>1.3</add>
   </field>
   <foreignKey>
-       <name>location_type_id</name>
-       <table>civicrm_location_type</table>
-       <key>id</key>
-       <add>1.3</add>
-       <onDelete>SET NULL</onDelete>
+    <name>location_type_id</name>
+    <table>civicrm_location_type</table>
+    <key>id</key>
+    <add>1.3</add>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-       <name>phone_type</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>Phone type, if required</comment>
-       <add>1.3</add>
-       <drop>2.2</drop>
+    <name>phone_type</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>Phone type, if required</comment>
+    <add>1.3</add>
+    <drop>2.2</drop>
   </field>
   <field>
-       <name>phone_type_id</name>
-       <type>int unsigned</type>
-       <comment>Phone Type Id, if required</comment>
-       <add>2.2</add>
+    <name>phone_type_id</name>
+    <type>int unsigned</type>
+    <comment>Phone Type Id, if required</comment>
+    <add>2.2</add>
   </field>
   <field>
     <name>website_type_id</name>
@@ -177,20 +177,20 @@
     <add>4.5</add>
   </field>
   <field>
-       <name>label</name>
-       <type>varchar</type>
-       <length>255</length>
-       <required>true</required>
-       <localizable>true</localizable>
-       <comment>To save label for fields.</comment>
-      <add>1.4</add>
+    <name>label</name>
+    <type>varchar</type>
+    <length>255</length>
+    <required>true</required>
+    <localizable>true</localizable>
+    <comment>To save label for fields.</comment>
+    <add>1.4</add>
   </field>
   <field>
-       <name>field_type</name>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>This field saves field type (ie individual,household.. field etc).</comment>
-      <add>1.4</add>
+    <name>field_type</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>This field saves field type (ie individual,household.. field etc).</comment>
+    <add>1.4</add>
   </field>
   <field>
     <name>is_reserved</name>