Skip to content
Snippets Groups Projects
Commit 011aeb62 authored by eileen's avatar eileen
Browse files

CRM-12595 fix formatting in xml files

parent b75dce3e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 126 additions and 126 deletions
xml/configuration/AdultDayCareReferral.xml
+ 2
− 2
View file @ 011aeb62
......@@ -19,7 +19,7 @@
<ActivityType>
<name>Follow up</name>
</ActivityType>
<ActivityType>
<ActivityType>
<name>Change Case Type</name>
</ActivityType>
<ActivityType>
......@@ -79,6 +79,6 @@
</RelationshipType>
<RelationshipType>
<name>Benefits Specialist</name>
</RelationshipType>
</RelationshipType>
</CaseRoles>
</CaseType>
xml/configuration/HousingSupport.xml
+ 2
− 2
View file @ 011aeb62
......@@ -25,7 +25,7 @@
<ActivityType>
<name>Follow up</name>
</ActivityType>
<ActivityType>
<ActivityType>
<name>Change Case Type</name>
</ActivityType>
<ActivityType>
......@@ -104,6 +104,6 @@
</RelationshipType>
<RelationshipType>
<name>Benefits Specialist</name>
</RelationshipType>
</RelationshipType>
</CaseRoles>
</CaseType>
xml/configuration/Settings.xml
+ 19
− 19
View file @ 011aeb62
<?xml version="1.0" encoding="UTF-8"?>
<Settings>
<!-- List the group whose members should appear as contacts on all Manage Case screens.
Only one group name is supported for now.
It needs to match the name column in the civicrm_group table (not the title), so avoid using space characters. -->
<group name="Case_Resources" />
<!-- Set this to 1 if you want case activity emails to be redacted -->
<!-- List the group whose members should appear as contacts on all Manage Case screens.
Only one group name is supported for now.
It needs to match the name column in the civicrm_group table (not the title), so avoid using space characters. -->
<group name="Case_Resources" />
<!-- Set this to 1 if you want case activity emails to be redacted -->
<RedactActivityEmail>0</RedactActivityEmail>
<!-- Set this to 1 if you want to allow multiple clients to be associated with a single case -->
<AllowMultipleCaseClients>0</AllowMultipleCaseClients>
<!-- Set this to 1 if you want to have activity types on Manage Case
screen sorted in XML file order, default is alphabetical -->
<NaturalActivityTypeSort>0</NaturalActivityTypeSort>
<!-- Add activity types which should NOT be editable here with editable = 0 -->
<ActivityTypes>
<ActivityType>
<name>Change Case Status</name>
<editable>0</editable>
<!-- Set this to 1 if you want to allow multiple clients to be associated with a single case -->
<AllowMultipleCaseClients>0</AllowMultipleCaseClients>
<!-- Set this to 1 if you want to have activity types on Manage Case
screen sorted in XML file order, default is alphabetical -->
<NaturalActivityTypeSort>0</NaturalActivityTypeSort>
<!-- Add activity types which should NOT be editable here with editable = 0 -->
<ActivityTypes>
<ActivityType>
<name>Change Case Status</name>
<editable>0</editable>
</ActivityType>
<ActivityType>
<name>Change Case Start Date</name>
<editable>0</editable>
<ActivityType>
<name>Change Case Start Date</name>
<editable>0</editable>
</ActivityType>
</ActivityTypes>
</ActivityTypes>
</Settings>
\ No newline at end of file
xml/schema/ACL/Cache.xml
+ 1
− 1
View file @ 011aeb62
......@@ -36,7 +36,7 @@
<required>true</required>
<comment>Foreign Key to ACL</comment>
<add>1.6</add>
</field>
</field>
<foreignKey>
<name>acl_id</name>
<table>civicrm_acl</table>
......
xml/schema/Activity/ActivityTarget.xml
+ 3
− 3
View file @ 011aeb62
......@@ -18,7 +18,7 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
<field>
<field>
<name>activity_id</name>
<type>int unsigned</type>
<title>Activity ID</title>
......@@ -34,7 +34,7 @@
<onDelete>CASCADE</onDelete>
</foreignKey>
<field>
<field>
<name>target_contact_id</name>
<title>Contact ID (match to contact)</title>
<import>true</import>
......@@ -54,7 +54,7 @@
<index>
<name>UI_activity_target_contact_id</name>
<fieldName>target_contact_id</fieldName>
<fieldName>activity_id</fieldName>
<fieldName>activity_id</fieldName>
<unique>true</unique>
<add>2.0</add>
</index>
......
xml/schema/Bridge/OG.xml
+ 60
− 60
View file @ 011aeb62
......@@ -17,67 +17,67 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
<field>
<name>drupal_og_id</name>
<type>int unsigned</type>
<comment>Foreign key to the organic group.</comment>
<add>2.0</add>
<field>
<name>drupal_og_id</name>
<type>int unsigned</type>
<comment>Foreign key to the organic group.</comment>
<add>2.0</add>
</field>
<index>
<name>index_drupal_og_id</name>
<fieldName>index_drupal_og_id</fieldName>
<add>2.0</add>
<index>
<name>index_drupal_og_id</name>
<fieldName>index_drupal_og_id</fieldName>
<add>2.0</add>
</index>
<field>
<name>group_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to civicrm group.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>group_id</name>
<table>civicrm_group</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
<field>
<name>acl_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to civicrm acl.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>acl_id</name>
<table>civicrm_acl</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
<field>
<name>admin_group_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to admin civicrm group.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>admin_group_id</name>
<table>civicrm_group</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
<field>
<name>admin_acl_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to civicrm acl.</comment>
<field>
<name>group_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to civicrm group.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>group_id</name>
<table>civicrm_group</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
<field>
<name>acl_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to civicrm acl.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>acl_id</name>
<table>civicrm_acl</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
<field>
<name>admin_group_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to admin civicrm group.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>admin_acl_id</name>
<table>civicrm_acl</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
</field>
<foreignKey>
<name>admin_group_id</name>
<table>civicrm_group</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
<field>
<name>admin_acl_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to civicrm acl.</comment>
<add>2.0</add>
</field>
<foreignKey>
<name>admin_acl_id</name>
<table>civicrm_acl</table>
<key>id</key>
<add>2.0</add>
</foreignKey>
</table>
xml/schema/Core/ActionSchedule.xml
+ 6
− 6
View file @ 011aeb62
......@@ -192,7 +192,7 @@
<name>group_id</name>
<type>int unsigned</type>
<comment>FK to Group</comment>
<add>3.4</add>
<add>3.4</add>
</field>
<foreignKey>
<name>group_id</name>
......@@ -202,14 +202,14 @@
</foreignKey>
<field>
<name>msg_template_id</name>
<type>int unsigned</type>
<comment>FK to the message template.</comment>
<type>int unsigned</type>
<comment>FK to the message template.</comment>
</field>
<foreignKey>
<name>msg_template_id</name>
<table>civicrm_msg_template</table>
<key>id</key>
<onDelete>SET NULL</onDelete>
<table>civicrm_msg_template</table>
<key>id</key>
<onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>absolute_date</name>
......
xml/schema/Core/MappingField.xml
+ 1
− 1
View file @ 011aeb62
......@@ -111,7 +111,7 @@
<field>
<name>grouping</name>
<type>int unsigned</type>
<default>1</default>
<default>1</default>
<comment>Used to group mapping_field records into related sets (e.g. for criteria sets in search builder mappings).</comment>
<add>1.5</add>
</field>
......
xml/schema/Event/Cart/files.xml
+ 1
− 1
View file @ 011aeb62
<?xml version="1.0" encoding="iso-8859-1" ?>
<tables xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="Cart.xml" parse="xml" />
<xi:include href="Cart.xml" parse="xml" />
<xi:include href="EventInCart.xml" parse="xml" />
</tables>
xml/schema/Mailing/Event/Forward.xml
+ 1
− 1
View file @ 011aeb62
......@@ -36,7 +36,7 @@
<name>dest_queue_id</name>
<table>civicrm_mailing_event_queue</table>
<key>id</key>
<onDelete>SET NULL</onDelete>
<onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>time_stamp</name>
......
xml/schema/Mailing/Event/Queue.xml
+ 2
− 2
View file @ 011aeb62
......@@ -30,7 +30,7 @@
<field>
<name>email_id</name>
<type>int unsigned</type>
<default>NULL</default>
<default>NULL</default>
<comment>FK to Email</comment>
</field>
<foreignKey>
......@@ -61,7 +61,7 @@
<field>
<name>phone_id</name>
<type>int unsigned</type>
<default>NULL</default>
<default>NULL</default>
<comment>FK to Phone</comment>
</field>
<foreignKey>
......
xml/schema/Member/Membership.xml
+ 1
− 1
View file @ 011aeb62
......@@ -132,7 +132,7 @@
<field>
<name>owner_membership_id</name>
<type>int unsigned</type>
<title>Primary Member ID</title>
<title>Primary Member ID</title>
<comment>Optional FK to Parent Membership.</comment>
<export>true</export>
<add>1.7</add>
......
xml/templates/message_templates/case_activity_html.tpl
+ 6
− 6
View file @ 011aeb62
......@@ -39,25 +39,25 @@
{if $manageCaseURL}
<tr>
<td colspan="2" {$valueStyle}>
<a href="{$manageCaseURL}" title="{ts}Manage Case{/ts}">{ts}Manage Case{/ts}</a>
<a href="{$manageCaseURL}" title="{ts}Manage Case{/ts}">{ts}Manage Case{/ts}</a>
</td>
</tr>
{/if}
{/if}
{if $editActURL}
{if $editActURL}
<tr>
<td colspan="2" {$valueStyle}>
<a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
<a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
</td>
</tr>
{/if}
{if $viewActURL}
<tr>
<td colspan="2" {$valueStyle}>
<a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
<a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
</td>
</tr>
{/if}
</tr>
{/if}
{foreach from=$activity.fields item=field}
<tr>
<td {$labelStyle}>
......
xml/templates/message_templates/contribution_online_receipt_html.tpl
+ 1
− 1
View file @ 011aeb62
......@@ -137,7 +137,7 @@
<td colspan="2" {$labelStyle}>
{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
</td>
{/if}
{/if}
<tr>
</tr>
<td colspan="2" {$labelStyle}>
......
xml/templates/message_templates/contribution_recurring_billing_html.tpl
+ 1
− 1
View file @ 011aeb62
......@@ -58,7 +58,7 @@
{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
</td>
</tr>
</table>
</table>
</center>
</body>
......
xml/templates/message_templates/contribution_recurring_edit_text.tpl
+ 3
− 3
View file @ 011aeb62
{ts 1=$contact.display_name}Dear %1{/ts},
{ts 1=$contact.display_name}Dear %1{/ts},
{ts}Your recurring contribution has been updated as requested:{/ts}
{ts}Your recurring contribution has been updated as requested:{/ts}
{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2(s) %3{/ts}
{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}
{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}
{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}
\ No newline at end of file
xml/templates/message_templates/contribution_recurring_notify_html.tpl
+ 2
− 2
View file @ 011aeb62
......@@ -67,7 +67,7 @@
</tr>
<tr>
<td {$labelStyle}>
{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
</td>
</tr>
{/if}
......@@ -77,7 +77,7 @@
{if $auto_renew_membership}
<tr>
<td>
<p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>
<p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>
</td>
</tr>
{else}
......
xml/templates/message_templates/contribution_recurring_notify_text.tpl
+ 1
− 1
View file @ 011aeb62
......@@ -10,7 +10,7 @@
{ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by <a href="%1">visiting this web page</a>.{/ts}
{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
{else}
{ts}Thanks for your recurring contribution sign-up.{/ts}
......
xml/templates/message_templates/event_offline_receipt_html.tpl
+ 11
− 11
View file @ 011aeb62
......@@ -178,12 +178,12 @@ registration process.{/ts}</p>
<th>{ts}Qty{/ts}</th>
<th>{ts}Each{/ts}</th>
<th>{ts}Total{/ts}</th>
{if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
{if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
</tr>
{foreach from=$value item=line}
<tr>
<td>
{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
</td>
<td>
{$line.qty}
......@@ -194,11 +194,11 @@ registration process.{/ts}</p>
<td>
{$line.line_total|crmMoney}
</td>
{if $pricesetFieldsCount }
<td>
{$line.participant_count}
{if $pricesetFieldsCount }
<td>
{$line.participant_count}
</td>
{/if}
{/if}
</tr>
{/foreach}
</table>
......@@ -228,10 +228,10 @@ registration process.{/ts}</p>
</tr>
{if $pricesetFieldsCount }
<tr>
<td {$labelStyle}>
{ts}Total Participants{/ts}</td>
<td {$labelStyle}>
{ts}Total Participants{/ts}</td>
<td {$valueStyle}>
{assign var="count" value= 0}
{assign var="count" value= 0}
{foreach from=$lineItem item=pcount}
{assign var="lineItemCount" value=0}
{if $pcount neq 'skip'}
......@@ -240,11 +240,11 @@ registration process.{/ts}</p>
{/foreach}
{if $lineItemCount < 1 }
assign var="lineItemCount" value=1}
{/if}
{/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
{$count}
{$count}
</td>
</tr>
{/if}
......
xml/templates/message_templates/event_offline_receipt_text.tpl
+ 2
− 2
View file @ 011aeb62
......@@ -145,14 +145,14 @@ registration process.{/ts}
{/foreach}
{if $lineItemCount < 1 }
{assign var="lineItemCount" value=1}
{/if}
{/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
{ts}Total Participants{/ts}: {$count}
{/if}
{if $is_pay_later }
==========================================================={if $pricesetFieldsCount }===================={/if}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment