Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-28-17-02-35

[civicrm-core.git] / xml / schema / Core / LocBlock.xml

diff --git a/xml/schema/Core/LocBlock.xml b/xml/schema/Core/LocBlock.xml
index d33d404f3857a0ff5918305161a996d6fcfa02e9..75a80185d50c969c0aea6c23ea711c5997811d0f 100644 (file)
--- a/xml/schema/Core/LocBlock.xml
+++ b/xml/schema/Core/LocBlock.xml
@@ -8,110 +8,119 @@
   <add>2.0</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Unique ID</comment>
-      <add>2.0</add>
+    <name>id</name>
+    <title>Location Block ID</title>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Unique ID</comment>
+    <add>2.0</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>address_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>address_id</name>
+    <title>Location Block Address</title>
+    <type>int unsigned</type>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>address_id</name> 
-       <table>civicrm_address</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>address_id</name>
+    <table>civicrm_address</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>email_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>email_id</name>
+    <title>Location Block Email</title>
+    <type>int unsigned</type>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>email_id</name> 
-       <table>civicrm_email</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>email_id</name>
+    <table>civicrm_email</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>phone_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>phone_id</name>
+    <title>Location Block Phone</title>
+    <type>int unsigned</type>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>phone_id</name> 
-       <table>civicrm_phone</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>phone_id</name>
+    <table>civicrm_phone</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>im_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>im_id</name>
+    <title>Location Block IM</title>
+    <type>int unsigned</type>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>im_id</name> 
-       <table>civicrm_im</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>im_id</name>
+    <table>civicrm_im</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>address_2_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>address_2_id</name>
+    <title>Location Block IM 2</title>
+    <type>int unsigned</type>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>address_2_id</name> 
-       <table>civicrm_address</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>address_2_id</name>
+    <table>civicrm_address</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>email_2_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>email_2_id</name>
+    <type>int unsigned</type>
+    <title>Email 2</title>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>email_2_id</name> 
-       <table>civicrm_email</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>email_2_id</name>
+    <table>civicrm_email</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>phone_2_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>phone_2_id</name>
+    <type>int unsigned</type>
+    <title>Phone 2</title>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>phone_2_id</name> 
-       <table>civicrm_phone</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>phone_2_id</name>
+    <table>civicrm_phone</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
-      <name>im_2_id</name>
-      <type>int unsigned</type>
-      <add>2.0</add>
+    <name>im_2_id</name>
+    <type>int unsigned</type>
+    <title>Instant Messenger 2</title>
+    <add>2.0</add>
   </field>
-  <foreignKey> 
-       <name>im_2_id</name> 
-       <table>civicrm_im</table> 
-       <key>id</key> 
-       <add>2.0</add> 
-       <onDelete>SET NULL</onDelete>
-  </foreignKey> 
+  <foreignKey>
+    <name>im_2_id</name>
+    <table>civicrm_im</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
 </table>