From d4aebf1696e8c6f6ca001ce1ed0f81238a00893b Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 29 Dec 2013 14:33:28 -0800 Subject: [PATCH] ScheduleReminders - fix php fatal & whitespace cleanup --- .../Form/ManageEvent/ScheduleReminders.php | 2 +- templates/CRM/Admin/Page/Reminders.tpl | 59 ++-- .../Form/ManageEvent/ScheduleReminders.tpl | 294 +++++++++--------- 3 files changed, 177 insertions(+), 178 deletions(-) diff --git a/CRM/Event/Form/ManageEvent/ScheduleReminders.php b/CRM/Event/Form/ManageEvent/ScheduleReminders.php index eb448c1875..de285bf3bc 100755 --- a/CRM/Event/Form/ManageEvent/ScheduleReminders.php +++ b/CRM/Event/Form/ManageEvent/ScheduleReminders.php @@ -74,7 +74,7 @@ class CRM_Event_Form_ManageEvent_ScheduleReminders extends CRM_Event_Form_Manage $format['action'] = CRM_Core_Action::formLink( $links, $action, - array('id' => $format['id'])), + array('id' => $format['id']), ts('more'), FALSE, 'event.reminder.list', diff --git a/templates/CRM/Admin/Page/Reminders.tpl b/templates/CRM/Admin/Page/Reminders.tpl index fc4c6646db..7f97a331e1 100755 --- a/templates/CRM/Admin/Page/Reminders.tpl +++ b/templates/CRM/Admin/Page/Reminders.tpl @@ -25,37 +25,36 @@ +--------------------------------------------------------------------+ *} {* this template is for configuring Scheduled Reminders Table*} - - {strip} +{strip} {include file="CRM/common/enableDisableApi.tpl"} {include file="CRM/common/crmeditable.tpl"} - {include file="CRM/common/jsortable.tpl"} - - - - - - - - - - - - - - {foreach from=$rows item=row} - - - - - - - - - - - {/foreach} -
{ts}Title{/ts}{ts}Reminder For{/ts}{ts}When{/ts}{ts}While{/ts}{ts}Repeat{/ts}{ts}Active?{/ts}
{$row.title}{$row.entity} - {$row.value}{if $row.absolute_date}{$row.absolute_date|crmDate}{else}{$row.start_action_offset} {$row.start_action_unit}{if $row.start_action_offset > 1}{ts}(s){/ts}{/if} {$row.start_action_condition} {$row.entityDate}{/if}{$row.status}{if $row.is_repeat eq 1}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.action|replace:'xx':$row.id}
- {/strip} + {include file="CRM/common/jsortable.tpl"} + + + + + + + + + + + + + + {foreach from=$rows item=row} + + + + + + + + + + + {/foreach} +
{ts}Title{/ts}{ts}Reminder For{/ts}{ts}When{/ts}{ts}While{/ts}{ts}Repeat{/ts}{ts}Active?{/ts}
{$row.title}{$row.entity} - {$row.value}{if $row.absolute_date}{$row.absolute_date|crmDate}{else}{$row.start_action_offset} {$row.start_action_unit}{if $row.start_action_offset > 1}{ts}(s){/ts}{/if} {$row.start_action_condition} {$row.entityDate}{/if}{$row.status}{if $row.is_repeat eq 1}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.action|replace:'xx':$row.id}
+{/strip} diff --git a/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl b/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl index 2f95866c12..96c1076d24 100755 --- a/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl @@ -27,44 +27,44 @@ {* This template is used for adding/scheduling reminders. *}
-{if $rows} -
- {include file="CRM/Admin/Page/Reminders.tpl"} + {if $rows} +
+ {include file="CRM/Admin/Page/Reminders.tpl"} -
-
{ts}Add Reminder{/ts} -
+
+
{ts}Add Reminder{/ts}
+
-{else} + {else} -
+
{include file="CRM/common/formButtons.tpl" location="top"} -
-{if $action eq 8} -
-
- {ts 1=$reminderName}WARNING: You are about to delete the Reminder titled %1.{/ts} {ts}Do you want to continue?{/ts}
-{else} - {* added onload javascript for source contact*} - {literal} - - {/literal} - - + {/literal} +
+ - - + + - - + + - - - + + + - - - - + + + + - - + + - - - - + + - - + + - - + + - - + + - - -
{$form.title.label}{$form.title.html}
{$form.entity.label} {$form.entity.html}
{$form.start_action_offset.label}{include file="CRM/common/jcalendar.tpl" elementName=absolute_date} {ts}OR{/ts}
{include file="CRM/common/jcalendar.tpl" elementName=absolute_date} {ts}OR{/ts}
{$form.start_action_offset.html}   {$form.start_action_unit.html}   {$form.start_action_condition.html}   {$form.start_action_date.html}
{$form.record_activity.label}{$form.start_action_offset.html}   {$form.start_action_unit.html}   {$form.start_action_condition.html}   {$form.start_action_date.html}
{$form.record_activity.label} {$form.record_activity.html}
{$form.is_repeat.label}
{$form.is_repeat.label} {$form.is_repeat.html}  {ts}Enable repetition.{/ts}
- + + + + - - +
+ - - + + + -
{$form.repetition_frequency_interval.label}   {$form.repetition_frequency_interval.html}{$form.repetition_frequency_unit.html}{$form.repetition_frequency_interval.label}   {$form.repetition_frequency_interval.html}{$form.repetition_frequency_unit.html}
{$form.end_frequency_interval.label}   {$form.end_frequency_interval.html} - {$form.end_frequency_unit.html}   {$form.end_action.html}   {$form.end_date.html}{$form.end_frequency_unit.html}   {$form.end_action.html}   {$form.end_date.html}
-
+
{$form.recipient.label}{$form.limit_to.html}  {$form.recipient.html}  {help id="recipient" file="CRM/Admin/Page/ScheduleReminders.hlp" title=$form.recipient.label}
{$form.recipient_listing.label}{$form.recipient_listing.html}
{$form.recipient_manual_id.label} {$form.recipient_manual_id.html}{edit}{ts}You can manually send out the reminders to these recipients.{/ts}{/edit}
{$form.group_id.label} {$form.group_id.html}
-
{ts}Email{/ts} - - - - - - - - - - - - - -
{$form.is_active.html} {$form.is_active.label}
{$form.template.label}{$form.template.html}
{$form.subject.label}{$form.subject.html}
- {include file="CRM/Contact/Form/Task/EmailCommon.tpl" upload=1 noAttach=1} -
-{/if} - -
- {include file="CRM/common/formButtons.tpl" location="bottom"}
-
+ + + +
{ts}Email{/ts} + + + + + + + + + + + + + +
{$form.is_active.html} {$form.is_active.label}
{$form.template.label}{$form.template.html}
{$form.subject.label}{$form.subject.html}
+ {include file="CRM/Contact/Form/Task/EmailCommon.tpl" upload=1 noAttach=1} +
+ {/if} + +
+ {include file="CRM/common/formButtons.tpl" location="bottom"}
+
{/if} {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id = "is_repeat" - trigger_value = "true" - target_element_id = "repeatFields" - target_element_type = "table-row" - field_type = "radio" - invert = "false" +trigger_field_id = "is_repeat" +trigger_value = "true" +target_element_id = "repeatFields" +target_element_type = "table-row" +field_type = "radio" +invert = "false" } {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="recipient" - trigger_value = 'manual' - target_element_id ="recipientManual" - target_element_type ="table-row" - field_type ="select" - invert = 0 +trigger_field_id ="recipient" +trigger_value = 'manual' +target_element_id ="recipientManual" +target_element_type ="table-row" +field_type ="select" +invert = 0 } {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="recipient" - trigger_value = 'group' - target_element_id ="recipientGroup" - target_element_type ="table-row" - field_type ="select" - invert = 0 +trigger_field_id ="recipient" +trigger_value = 'group' +target_element_id ="recipientGroup" +target_element_type ="table-row" +field_type ="select" +invert = 0 } - {literal} - - {/literal} + } + + cj('#absolute_date_display').click( function( ) { + if(cj('#absolute_date_display').val()) { + cj('#relativeDate').hide(); + cj('#relativeDateRepeat').hide(); + cj('#repeatFields').hide(); + } else { + cj('#relativeDate').show(); + cj('#relativeDateRepeat').show(); + } + }); + + +{/literal} -- 2.25.1