CRM-15168 more metadata titles (& whitespace

diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index adb74025d3c68f17baacd4e518d8ecc23d0ade25..735822e0943d6699cfd3fb6f28d8a5c8c8165f8d 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -403,6 +403,7 @@
   </index>
   <field>
     <name>address_id</name>
+    <title>Contribution Address</title>
     <type>int unsigned</type>
     <comment>Conditional foreign key to civicrm_address.id. We insert an address record for each contribution when we have associated billing name and address data.</comment>
     <add>2.2</add>

diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 27b67554e3373f2f899005f7c3d20f59ad6ebe21..d2d61ce6cbeb2721a80fba76fb93edfee5b288c1 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -9,6 +9,7 @@
   <log>true</log>
   <field>
     <name>id</name>
+    <title>Contribution Page ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Contribution Id</comment>

diff --git a/xml/schema/Contribute/Product.xml b/xml/schema/Contribute/Product.xml
index 93c401305cc30485ca3a39cc7f0573fe5f9c8297..5bb0c9e301acacbdba0d6fbd59df8cb9dd935e1b 100644 (file)
--- a/xml/schema/Contribute/Product.xml
+++ b/xml/schema/Contribute/Product.xml
@@ -8,200 +8,200 @@
   <add>1.4</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <add>1.4</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <add>1.4</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>name</name>
-       <uniqueName>product_name</uniqueName>
-       <title>Product Name</title>
-       <type>varchar</type>
-       <length>255</length>
-       <required>true</required>
-       <export>true</export>
-       <localizable>true</localizable>
-       <comment>Required product/premium name</comment>
-       <add>1.4</add>
-  </field>
-  <field>
-      <name>description</name>
-      <title>Description</title>
-      <type>text</type>
-      <localizable>true</localizable>
-      <comment>Optional description of the product/premium.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>sku</name>
-      <title>SKU</title>
-      <type>varchar</type>
-      <length>50</length>
-      <export>true</export>
-      <comment>Optional product sku or code.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>options</name>
-      <title>Options</title>
-      <type>text</type>
-      <localizable>true</localizable>
-      <comment>Store comma-delimited list of color, size, etc. options for the product.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>image</name>
-      <title>Image</title>
-      <type>varchar</type>
-      <length>255</length>
-      <comment>Full or relative URL to uploaded image - fullsize.</comment>
-      <add>1.4</add>
-  </field>
-   <field>
-      <name>thumbnail</name>
-      <title>Thumbnail</title>
-      <type>varchar</type>
-      <length>255</length>
-      <comment>Full or relative URL to image thumbnail.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>price</name>
-      <title>Price</title>
-      <type>decimal</type>
-      <comment>Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>currency</name>
-      <type>varchar</type>
-      <length>3</length>
-      <default>NULL</default>
-      <comment>3 character string, value from config setting or input via user.</comment>
-      <add>3.2</add>
-      <pseudoconstant>
-        <table>civicrm_currency</table>
-        <keyColumn>name</keyColumn>
-        <labelColumn>full_name</labelColumn>
-        <nameColumn>numeric_code</nameColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-  </field>
-  <field>
-      <name>financial_type_id</name>
-      <title>Financial Type</title>
-      <type>int unsigned</type>
-      <default>NULL</default>
-      <pseudoconstant>
-        <table>civicrm_financial_type</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <comment>FK to Financial Type.</comment>
-      <add>4.3</add>
+    <name>name</name>
+    <uniqueName>product_name</uniqueName>
+    <title>Product Name</title>
+    <type>varchar</type>
+    <length>255</length>
+    <required>true</required>
+    <export>true</export>
+    <localizable>true</localizable>
+    <comment>Required product/premium name</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>description</name>
+    <title>Description</title>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Optional description of the product/premium.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>sku</name>
+    <title>SKU</title>
+    <type>varchar</type>
+    <length>50</length>
+    <export>true</export>
+    <comment>Optional product sku or code.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>options</name>
+    <title>Options</title>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Store comma-delimited list of color, size, etc. options for the product.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>image</name>
+    <title>Image</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Full or relative URL to uploaded image - fullsize.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>thumbnail</name>
+    <title>Thumbnail</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Full or relative URL to image thumbnail.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>price</name>
+    <title>Price</title>
+    <type>decimal</type>
+    <comment>Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>currency</name>
+    <type>varchar</type>
+    <length>3</length>
+    <default>NULL</default>
+    <comment>3 character string, value from config setting or input via user.</comment>
+    <add>3.2</add>
+    <pseudoconstant>
+      <table>civicrm_currency</table>
+      <keyColumn>name</keyColumn>
+      <labelColumn>full_name</labelColumn>
+      <nameColumn>numeric_code</nameColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>financial_type_id</name>
+    <title>Financial Type</title>
+    <type>int unsigned</type>
+    <default>NULL</default>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <comment>FK to Financial Type.</comment>
+    <add>4.3</add>
   </field>
   <foreignKey>
-       <name>financial_type_id</name>
-       <table>civicrm_financial_type</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
-       <add>4.3</add>
+    <name>financial_type_id</name>
+    <table>civicrm_financial_type</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
+    <add>4.3</add>
   </foreignKey>
 
   <field>
-      <name>min_contribution</name>
-      <title>Minimum Contribution</title>
-      <type>decimal</type>
-      <comment>Minimum contribution required to be eligible to select this premium.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>cost</name>
-      <title>Cost</title>
-      <type>decimal</type>
-      <comment>Actual cost of this product. Useful to determine net return from sale or using this as an incentive.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>is_active</name>
-      <title>Is Active</title>
-      <type>boolean</type>
-      <required>true</required>
-      <comment>Disabling premium removes it from the premiums_premium join table below.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>period_type</name>
-      <title>Period Type</title>
-      <type>varchar</type>
-      <length>8</length>
-      <default>'rolling'</default>
-      <comment>Rolling means we set start/end based on current day, fixed means we set start/end for current year or month
-(e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) </comment>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::periodType</callback>
-      </pseudoconstant>
-      <add>1.4</add>
-      <html>
-        <type>Select</type>
-      </html>
-  </field>
-  <field>
-      <name>fixed_period_start_day</name>
-      <title>Fixed Period Start Day</title>
-      <type>int</type>
-      <default>0101</default>
-      <comment>Month and day (MMDD) that fixed period type subscription or membership starts.</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>duration_unit</name>
-      <title>Duration Unit</title>
-      <type>varchar</type>
-      <length>8</length>
-      <default>'year'</default>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::getPremiumUnits</callback>
-      </pseudoconstant>
-      <add>1.4</add>
-      <html>
-        <type>Select</type>
-      </html>
-  </field>
-  <field>
-      <name>duration_interval</name>
-      <title>Duration Interval</title>
-      <type>int</type>
-      <comment>Number of units for total duration of subscription, service, membership (e.g. 12 Months).</comment>
-      <add>1.4</add>
-  </field>
-  <field>
-      <name>frequency_unit</name>
-      <title>Frequency Unit</title>
-      <type>varchar</type>
-      <length>8</length>
-      <default>'month'</default>
-      <comment>Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.</comment>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::getPremiumUnits</callback>
-      </pseudoconstant>
-      <add>1.4</add>
-      <html>
-        <type>Select</type>
-      </html>
-  </field>
-  <field>
-      <name>frequency_interval</name>
-      <title>Frequency Interval</title>
-      <type>int</type>
-      <comment>Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).</comment>
-      <add>1.4</add>
+    <name>min_contribution</name>
+    <title>Minimum Contribution</title>
+    <type>decimal</type>
+    <comment>Minimum contribution required to be eligible to select this premium.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>cost</name>
+    <title>Cost</title>
+    <type>decimal</type>
+    <comment>Actual cost of this product. Useful to determine net return from sale or using this as an incentive.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>is_active</name>
+    <title>Is Active</title>
+    <type>boolean</type>
+    <required>true</required>
+    <comment>Disabling premium removes it from the premiums_premium join table below.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>period_type</name>
+    <title>Period Type</title>
+    <type>varchar</type>
+    <length>8</length>
+    <default>'rolling'</default>
+    <comment>Rolling means we set start/end based on current day, fixed means we set start/end for current year or month
+      (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) </comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::periodType</callback>
+    </pseudoconstant>
+    <add>1.4</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>fixed_period_start_day</name>
+    <title>Fixed Period Start Day</title>
+    <type>int</type>
+    <default>0101</default>
+    <comment>Month and day (MMDD) that fixed period type subscription or membership starts.</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>duration_unit</name>
+    <title>Duration Unit</title>
+    <type>varchar</type>
+    <length>8</length>
+    <default>'year'</default>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::getPremiumUnits</callback>
+    </pseudoconstant>
+    <add>1.4</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>duration_interval</name>
+    <title>Duration Interval</title>
+    <type>int</type>
+    <comment>Number of units for total duration of subscription, service, membership (e.g. 12 Months).</comment>
+    <add>1.4</add>
+  </field>
+  <field>
+    <name>frequency_unit</name>
+    <title>Frequency Unit</title>
+    <type>varchar</type>
+    <length>8</length>
+    <default>'month'</default>
+    <comment>Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::getPremiumUnits</callback>
+    </pseudoconstant>
+    <add>1.4</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>frequency_interval</name>
+    <title>Frequency Interval</title>
+    <type>int</type>
+    <comment>Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).</comment>
+    <add>1.4</add>
   </field>
 </table>

diff --git a/xml/schema/Core/OptionGroup.xml b/xml/schema/Core/OptionGroup.xml
index 2a998c97cc21a4375827e2d0edb9b79e4b6b89f8..9aecfd8aa23f12451ffd72e70661315ade65cad5 100644 (file)
--- a/xml/schema/Core/OptionGroup.xml
+++ b/xml/schema/Core/OptionGroup.xml
@@ -7,59 +7,59 @@
   <add>1.5</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Option Group ID</comment>
-       <add>1.5</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Option Group ID</comment>
+    <add>1.5</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>name</name>
-       <title>Option Group Name</title>
-       <type>varchar</type>
-       <length>64</length>
-       <required>true</required>
-       <comment>Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.</comment>
-       <add>1.5</add>
+    <name>name</name>
+    <title>Option Group Name</title>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>title</name>
-       <type>varchar</type>
-       <length>255</length>
-       <localizable>true</localizable>
-       <comment>Option Group title.</comment>
-       <add>1.5</add>
+    <name>title</name>
+    <type>varchar</type>
+    <length>255</length>
+    <localizable>true</localizable>
+    <comment>Option Group title.</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>description</name>
-       <type>varchar</type>
-       <length>255</length>
-       <localizable>true</localizable>
-       <comment>Option group description.</comment>
-       <add>1.5</add>
+    <name>description</name>
+    <type>varchar</type>
+    <length>255</length>
+    <localizable>true</localizable>
+    <comment>Option group description.</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>is_reserved</name>
-       <type>boolean</type>
-       <default>1</default>
-       <comment>Is this a predefined system option group (i.e. it can not be deleted)?</comment>
-       <add>1.5</add>
+    <name>is_reserved</name>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Is this a predefined system option group (i.e. it can not be deleted)?</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>is_active</name>
-       <type>boolean</type>
-       <comment>Is this option group active?</comment>
-       <add>1.5</add>
+    <name>is_active</name>
+    <type>boolean</type>
+    <comment>Is this option group active?</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>is_locked</name>
-       <type>boolean</type>
-       <comment>A lock to remove the ability to add new options via the UI.</comment>
-       <add>4.5</add>
+    <name>is_locked</name>
+    <type>boolean</type>
+    <comment>A lock to remove the ability to add new options via the UI.</comment>
+    <add>4.5</add>
   </field>
   <index>
     <name>UI_name</name>

diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml
index f18a8022d072e72428b6d6fbfb44d1b08abafc11..707132c8b86078addbbb6b3c823ccf34ba2668e8 100644 (file)
--- a/xml/schema/Core/OptionValue.xml
+++ b/xml/schema/Core/OptionValue.xml
@@ -8,6 +8,7 @@
   <log>true</log>
   <field>
       <name>id</name>
+    <title>Option Value ID</title>
       <type>int unsigned</type>
       <required>true</required>
       <comment>Option ID</comment>
@@ -19,6 +20,7 @@
   </primaryKey>
   <field>
       <name>option_group_id</name>
+    <title>Option Group ID</title>
       <type>int unsigned</type>
       <required>true</required>
       <comment>Group which this option belongs to.</comment>
@@ -124,6 +126,7 @@
   </field>
   <field>
        <name>is_active</name>
+    <title>Option Is Active</title>
        <type>boolean</type>
        <default>1</default>
        <comment>Is this option active?</comment>

diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml
index 4f01f75e5624902d3baaf0bcf655afaa00b3edea..dd854ec11d5104cb3d2e3788cd7908dd8ce94100 100644 (file)
--- a/xml/schema/Core/Phone.xml
+++ b/xml/schema/Core/Phone.xml
@@ -81,6 +81,7 @@
   </index>
   <field>
     <name>mobile_provider_id</name>
+    <title>Mobile Provider</title>
     <type>int unsigned</type>
     <comment>Which Mobile Provider does this phone belong to.</comment>
     <add>1.1</add>

diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml
index c1c1d52346269ceb2bcecd09bb2cd03bf9673f19..9abca1d4246ee8f0ec865ba395bf795a0f2673e4 100644 (file)
--- a/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@ -219,6 +219,7 @@
   </field>
   <field>
     <name>contribution_recur_id</name>
+    <title>Memberhip Recurring Contribution</title>
     <type>int unsigned</type>
     <comment>Conditional foreign key to civicrm_contribution_recur id. Each membership in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.</comment>
     <add>3.3</add>

diff --git a/xml/schema/Member/MembershipStatus.xml b/xml/schema/Member/MembershipStatus.xml
index 03cbec8012b46a212b02e975d0292381f55d8cb1..3033319ca5078b055d37b12dbfae1a0c7a0306c2 100644 (file)
--- a/xml/schema/Member/MembershipStatus.xml
+++ b/xml/schema/Member/MembershipStatus.xml
@@ -9,6 +9,7 @@
   <log>true</log>
   <field>
       <name>id</name>
+    <title>Membership Status ID</title>
       <type>int unsigned</type>
       <required>true</required>
       <comment>Membership Id</comment>