From 224ddbbf1904a6354fa27d9e95db820dc83413f2 Mon Sep 17 00:00:00 2001 From: Daniel Barreto Date: Thu, 19 Feb 2015 20:23:39 -0500 Subject: [PATCH] Fix, rename mail template file names - refs BT#9092 --- .../src/AdvancedSubscriptionPlugin.php | 34 +++++++++---------- ...in.tpl => admin_accepted_notice_admin.tpl} | 0 ....tpl => admin_accepted_notice_student.tpl} | 0 ...tpl => admin_accepted_notice_superior.tpl} | 0 ...in.tpl => admin_rejected_notice_admin.tpl} | 0 ....tpl => admin_rejected_notice_student.tpl} | 0 ...tpl => admin_rejected_notice_superior.tpl} | 0 ...reminder.tpl => reminder_notice_admin.tpl} | 0 ...minder.tpl => reminder_notice_student.tpl} | 0 ...inder.tpl => reminder_notice_superior.tpl} | 0 ...x.tpl => reminder_notice_superior_max.tpl} | 0 ...l => student_no_superior_notice_admin.tpl} | 0 ...=> student_no_superior_notice_student.tpl} | 0 ...eceived.tpl => student_notice_student.tpl} | 0 ...perior.tpl => student_notice_superior.tpl} | 0 ...tpl => superior_accepted_notice_admin.tpl} | 0 ...l => superior_accepted_notice_student.tpl} | 0 ... => superior_accepted_notice_superior.tpl} | 0 ...l => superior_rejected_notice_student.tpl} | 0 ... => superior_rejected_notice_superior.tpl} | 0 20 files changed, 17 insertions(+), 17 deletions(-) rename plugin/advancedsubscription/views/{advsub_approval_admin_accepted_notice_admin.tpl => admin_accepted_notice_admin.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_approval_admin_accepted_notice_student.tpl => admin_accepted_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_approval_admin_accepted_notice_superior.tpl => admin_accepted_notice_superior.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_approval_admin_rejected_notice_admin.tpl => admin_rejected_notice_admin.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_approval_admin_rejected_notice_student.tpl => admin_rejected_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_approval_admin_rejected_notice_superior.tpl => admin_rejected_notice_superior.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_approved_reminder.tpl => reminder_notice_admin.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_received_reminder.tpl => reminder_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_superior_reminder.tpl => reminder_notice_superior.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_superior_reminder_max.tpl => reminder_notice_superior_max.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_no_superior_info_admin.tpl => student_no_superior_notice_admin.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_received_no_superior.tpl => student_no_superior_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_received.tpl => student_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_superior.tpl => student_notice_superior.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_approved_info_admin.tpl => superior_accepted_notice_admin.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_superior_approved.tpl => superior_accepted_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_approve_confirmed.tpl => superior_accepted_notice_superior.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_superior_disapproved.tpl => superior_rejected_notice_student.tpl} (100%) rename plugin/advancedsubscription/views/{advsub_request_disapprove_confirmed.tpl => superior_rejected_notice_superior.tpl} (100%) diff --git a/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.php b/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.php index bc9eeeed12..f205c68826 100644 --- a/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.php +++ b/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.php @@ -383,7 +383,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailStudentRequest'), - $tpl->fetch('/advancedsubscription/views/advsub_request_received.tpl'), + $tpl->fetch('/advancedsubscription/views/student_notice_student.tpl'), $data['s'] ); // Mail to superior @@ -391,7 +391,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['superior']['user_id'], $this->get_lang('MailStudentRequest'), - $tpl->fetch('/advancedsubscription/views/advsub_request_superior.tpl'), + $tpl->fetch('/advancedsubscription/views/student_notice_superior.tpl'), $data['s'], true ); @@ -402,7 +402,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailBossAccept'), - $tpl->fetch('/advancedsubscription/views/advsub_request_superior_approved.tpl'), + $tpl->fetch('/advancedsubscription/views/superior_accepted_notice_student.tpl'), $data['s'] ); // Mail to superior @@ -410,7 +410,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['superior']['user_id'], $this->get_lang('MailBossAccept'), - $tpl->fetch('/advancedsubscription/views/advsub_request_approve_confirmed.tpl'), + $tpl->fetch('/advancedsubscription/views/superior_accepted_notice_superior.tpl'), $data['s'] ); // Mail to admin @@ -420,7 +420,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $adminId, $this->get_lang('MailBossAccept'), - $tpl->fetch('/advancedsubscription/views/advsub_request_approved_info_admin.tpl'), + $tpl->fetch('/advancedsubscription/views/superior_accepted_notice_admin.tpl'), $data['s'], true ); @@ -432,7 +432,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailBossReject'), - $tpl->fetch('/advancedsubscription/views/advsub_request_superior_disapproved.tpl'), + $tpl->fetch('/advancedsubscription/views/superior_rejected_notice_student.tpl'), $data['s'], true ); @@ -441,7 +441,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['superior']['user_id'], $this->get_lang('MailBossReject'), - $tpl->fetch('/advancedsubscription/views/advsub_request_disapprove_confirmed.tpl'), + $tpl->fetch('/advancedsubscription/views/superior_rejected_notice_superior.tpl'), $data['s'] ); break; @@ -451,7 +451,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailStudentRequestSelect'), - $tpl->fetch('/advancedsubscription/views/advsub_request_received.tpl'), + $tpl->fetch('/advancedsubscription/views/student_notice_student.tpl'), $data['s'] ); // Mail to superior @@ -459,7 +459,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['superior']['user_id'], $this->get_lang('MailStudentRequestSelect'), - $tpl->fetch('/advancedsubscription/views/advsub_request_superior.tpl'), + $tpl->fetch('/advancedsubscription/views/student_notice_superior.tpl'), $data['s'], true ); @@ -470,7 +470,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailAdminAccept'), - $tpl->fetch('/advancedsubscription/views/advsub_approval_admin_accepted_notice_student.tpl'), + $tpl->fetch('/advancedsubscription/views/admin_accepted_notice_student.tpl'), $data['s'] ); // Mail to superior @@ -478,7 +478,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['superior']['user_id'], $this->get_lang('MailAdminAccept'), - $tpl->fetch('/advancedsubscription/views/advsub_approval_admin_accepted_notice_superior.tpl'), + $tpl->fetch('/advancedsubscription/views/admin_accepted_notice_superior.tpl'), $data['s'] ); // Mail to admin @@ -488,7 +488,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $adminId, $this->get_lang('MailAdminAccept'), - $tpl->fetch('/advancedsubscription/views/advsub_approval_admin_accepted_notice_admin.tpl'), + $tpl->fetch('/advancedsubscription/views/admin_accepted_notice_admin.tpl'), $data['s'], true ); @@ -499,7 +499,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailAdminReject'), - $tpl->fetch('/advancedsubscription/views/advsub_approval_admin_rejected_notice_student.tpl'), + $tpl->fetch('/advancedsubscription/views/admin_rejected_notice_student.tpl'), $data['s'], true ); @@ -508,7 +508,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['superior']['user_id'], $this->get_lang('MailAdminReject'), - $tpl->fetch('/advancedsubscription/views/advsub_approval_admin_rejected_notice_superior.tpl'), + $tpl->fetch('/advancedsubscription/views/admin_rejected_notice_superior.tpl'), $data['s'] ); // Mail to admin @@ -518,7 +518,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $adminId, $this->get_lang('MailAdminReject'), - $tpl->fetch('/advancedsubscription/views/advsub_approval_admin_rejected_notice_admin.tpl'), + $tpl->fetch('/advancedsubscription/views/admin_rejected_notice_admin.tpl'), $data['s'] ); break; @@ -528,7 +528,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $data['student']['user_id'], $this->get_lang('MailStudentRequestNoBoss'), - $tpl->fetch('/advancedsubscription/views/advsub_request_received_no_superior.tpl'), + $tpl->fetch('/advancedsubscription/views/student_no_superior_notice_student.tpl'), $data['s'] ); // Mail to admin @@ -538,7 +538,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $data['u'], $adminId, $this->get_lang('MailStudentRequestNoBoss'), - $tpl->fetch('/advancedsubscription/views/advsub_request_no_superior_info_admin.tpl'), + $tpl->fetch('/advancedsubscription/views/student_no_superior_notice_admin.tpl'), $data['s'], true ); diff --git a/plugin/advancedsubscription/views/advsub_approval_admin_accepted_notice_admin.tpl b/plugin/advancedsubscription/views/admin_accepted_notice_admin.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_approval_admin_accepted_notice_admin.tpl rename to plugin/advancedsubscription/views/admin_accepted_notice_admin.tpl diff --git a/plugin/advancedsubscription/views/advsub_approval_admin_accepted_notice_student.tpl b/plugin/advancedsubscription/views/admin_accepted_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_approval_admin_accepted_notice_student.tpl rename to plugin/advancedsubscription/views/admin_accepted_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_approval_admin_accepted_notice_superior.tpl b/plugin/advancedsubscription/views/admin_accepted_notice_superior.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_approval_admin_accepted_notice_superior.tpl rename to plugin/advancedsubscription/views/admin_accepted_notice_superior.tpl diff --git a/plugin/advancedsubscription/views/advsub_approval_admin_rejected_notice_admin.tpl b/plugin/advancedsubscription/views/admin_rejected_notice_admin.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_approval_admin_rejected_notice_admin.tpl rename to plugin/advancedsubscription/views/admin_rejected_notice_admin.tpl diff --git a/plugin/advancedsubscription/views/advsub_approval_admin_rejected_notice_student.tpl b/plugin/advancedsubscription/views/admin_rejected_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_approval_admin_rejected_notice_student.tpl rename to plugin/advancedsubscription/views/admin_rejected_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_approval_admin_rejected_notice_superior.tpl b/plugin/advancedsubscription/views/admin_rejected_notice_superior.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_approval_admin_rejected_notice_superior.tpl rename to plugin/advancedsubscription/views/admin_rejected_notice_superior.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_approved_reminder.tpl b/plugin/advancedsubscription/views/reminder_notice_admin.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_approved_reminder.tpl rename to plugin/advancedsubscription/views/reminder_notice_admin.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_received_reminder.tpl b/plugin/advancedsubscription/views/reminder_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_received_reminder.tpl rename to plugin/advancedsubscription/views/reminder_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_superior_reminder.tpl b/plugin/advancedsubscription/views/reminder_notice_superior.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_superior_reminder.tpl rename to plugin/advancedsubscription/views/reminder_notice_superior.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_superior_reminder_max.tpl b/plugin/advancedsubscription/views/reminder_notice_superior_max.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_superior_reminder_max.tpl rename to plugin/advancedsubscription/views/reminder_notice_superior_max.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_no_superior_info_admin.tpl b/plugin/advancedsubscription/views/student_no_superior_notice_admin.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_no_superior_info_admin.tpl rename to plugin/advancedsubscription/views/student_no_superior_notice_admin.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_received_no_superior.tpl b/plugin/advancedsubscription/views/student_no_superior_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_received_no_superior.tpl rename to plugin/advancedsubscription/views/student_no_superior_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_received.tpl b/plugin/advancedsubscription/views/student_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_received.tpl rename to plugin/advancedsubscription/views/student_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_superior.tpl b/plugin/advancedsubscription/views/student_notice_superior.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_superior.tpl rename to plugin/advancedsubscription/views/student_notice_superior.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_approved_info_admin.tpl b/plugin/advancedsubscription/views/superior_accepted_notice_admin.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_approved_info_admin.tpl rename to plugin/advancedsubscription/views/superior_accepted_notice_admin.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_superior_approved.tpl b/plugin/advancedsubscription/views/superior_accepted_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_superior_approved.tpl rename to plugin/advancedsubscription/views/superior_accepted_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_approve_confirmed.tpl b/plugin/advancedsubscription/views/superior_accepted_notice_superior.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_approve_confirmed.tpl rename to plugin/advancedsubscription/views/superior_accepted_notice_superior.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_superior_disapproved.tpl b/plugin/advancedsubscription/views/superior_rejected_notice_student.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_superior_disapproved.tpl rename to plugin/advancedsubscription/views/superior_rejected_notice_student.tpl diff --git a/plugin/advancedsubscription/views/advsub_request_disapprove_confirmed.tpl b/plugin/advancedsubscription/views/superior_rejected_notice_superior.tpl similarity index 100% rename from plugin/advancedsubscription/views/advsub_request_disapprove_confirmed.tpl rename to plugin/advancedsubscription/views/superior_rejected_notice_superior.tpl