From 278f760d5588aa0258c561bb80763521475c4081 Mon Sep 17 00:00:00 2001 From: ".John" Date: Thu, 13 Mar 2014 22:57:25 +0000 Subject: [PATCH] Improve coding style on HTML templates Improve coding style on HTML templates --- .../event_offline_receipt_html.tpl | 14 ++++++++------ .../event_online_receipt_html.tpl | 14 ++++++++------ .../message_templates/participant_confirm_html.tpl | 12 ++++++------ .../event_offline_receipt_html.tpl | 14 ++++++++------ .../event_online_receipt_html.tpl | 14 ++++++++------ .../message_templates/participant_confirm_html.tpl | 12 ++++++------ 6 files changed, 44 insertions(+), 36 deletions(-) diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl index 149dfeb1ac..204506b218 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl @@ -130,14 +130,16 @@ registration process.{/ts}

{/if} {/foreach} {/if} + {if $event.is_public} - - - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} - - + + + {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} + + {/if} + {if $email} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index 1e08789cf6..66953bcec6 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -158,14 +158,16 @@ registration process.{/ts}

{/if} {/foreach} {/if} + {if $event.is_public} - - - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} - - + + + {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} + + {/if} + {if $event.is_share} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl index 97b4f1610a..87a921cbdc 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl @@ -138,12 +138,12 @@ {/if} {if $event.is_public} - - - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} - - + + + {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} + + {/if} {if $contact.email} diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 149dfeb1ac..204506b218 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -130,14 +130,16 @@ registration process.{/ts}

{/if} {/foreach} {/if} + {if $event.is_public} - - - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} - - + + + {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} + + {/if} + {if $email} diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index 1e08789cf6..66953bcec6 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -158,14 +158,16 @@ registration process.{/ts}

{/if} {/foreach} {/if} + {if $event.is_public} - - - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} - - + + + {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} + + {/if} + {if $event.is_share} diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl index 97b4f1610a..87a921cbdc 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -138,12 +138,12 @@ {/if} {if $event.is_public} - - - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} - - + + + {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} + + {/if} {if $contact.email} -- 2.25.1