From 9d51ce3f885ab399813a05ea7db3783bfb94ba64 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 10 Oct 2014 14:43:39 +0100 Subject: [PATCH] towards dialog and propagation dialog and code --- CRM/Activity/Form/Activity.php | 2 - templates/CRM/Activity/Form/Activity.tpl | 29 +------- .../Form/ManageEvent/ConfirmRepeatMode.tpl | 69 +++++++++++++++---- templates/CRM/Event/Form/ManageEvent/Tab.tpl | 3 +- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index 4d3b90c425..5935166d9b 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -505,8 +505,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { } if ($this->_action & CRM_Core_Action::UPDATE) { - $mapper = array('CRM_Activity_Form_Activity' => ''); - $this->assign('mapper', json_encode($mapper)); CRM_Core_Form_RecurringEntity::preProcess('activity'); } } diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index bfcb5eb37d..20b712d335 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -330,31 +330,4 @@ {/if} {* end of form block*} {/if} {* end of snippet if*} -{literal} - -{/literal} -{foreach from=$mapper key=k item=item} - {$k} {$item} -{/foreach} -{include file="CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl" entityType="activity" entityID=$activityId entityTable="civicrm_activity" mapper=$mapper} \ No newline at end of file +{include file="CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl" entityID=$activityId entityTable="civicrm_activity"} \ No newline at end of file diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl index 7a9955b785..67ff59d8db 100644 --- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl @@ -25,34 +25,75 @@ *}
- {ts}How would you like this change to affect other {$entityType}s in the repetition set?{/ts}

+ {ts}How would you like this change to affect other entities in the repetition set?{/ts}

- +
-
{ts}All other {$entityType}s in the series will remain same.{/ts}
+
{ts}All other entities in the series will remain same.{/ts}
- +
-
{ts}Change applies to this and all the following {$entityType}s.{/ts}
+
{ts}Change applies to this and all the following entities.{/ts}
- +
-
{ts}Change applies to all the {$entityType}s in the series.{/ts}
+
{ts}Change applies to all the entities in the series.{/ts}
- {literal} {/literal} - -{include file="CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl" entityType="event"} +{include file="CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl" entityID=$id entityTable="civicrm_event"} -- 2.25.1