From cf0a0c96aa5641a09cebd02e5389a5115e02c544 Mon Sep 17 00:00:00 2001 From: Alexander Yakovlev Date: Mon, 5 Mar 2018 19:05:17 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {emails => components/email}/email.tpl | 11 +++++------ emails/email.blog_invite_new.tpl | 2 +- emails/email.comment_new.tpl | 2 +- emails/email.comment_reply.tpl | 2 +- emails/email.invite.tpl | 2 +- emails/email.reactivation.tpl | 2 +- emails/email.registration.tpl | 2 +- emails/email.registration_activate.tpl | 2 +- emails/email.reminder_code.tpl | 2 +- emails/email.reminder_password.tpl | 2 +- emails/email.talk_comment_new.tpl | 2 +- emails/email.talk_new.tpl | 2 +- emails/email.topic_new.tpl | 2 +- emails/email.user_changemail_from.tpl | 2 +- emails/email.user_changemail_to.tpl | 2 +- emails/email.user_complaint.tpl | 2 +- emails/email.user_friend_new.tpl | 2 +- emails/email.wall.new.tpl | 2 +- emails/email.wall.reply.tpl | 2 +- 19 files changed, 23 insertions(+), 24 deletions(-) rename {emails => components/email}/email.tpl (83%) diff --git a/emails/email.tpl b/components/email/email.tpl similarity index 83% rename from emails/email.tpl rename to components/email/email.tpl index b23552a..4d75c98 100644 --- a/emails/email.tpl +++ b/components/email/email.tpl @@ -46,9 +46,8 @@
-  IF Hub.club -
- {Config::Get('view.description')} +

 IF Hub.club

+

{Config::Get('view.description')}
@@ -69,7 +68,7 @@ {$title} -
+   {/if} {* Текст *} @@ -91,11 +90,11 @@ diff --git a/emails/email.blog_invite_new.tpl b/emails/email.blog_invite_new.tpl index 3dc4f5a..28f14e5 100644 --- a/emails/email.blog_invite_new.tpl +++ b/emails/email.blog_invite_new.tpl @@ -2,7 +2,7 @@ * Приглашение в закрытый блог *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.blog_invite_new.text' params=[ diff --git a/emails/email.comment_new.tpl b/emails/email.comment_new.tpl index 297b084..8fdb1a4 100644 --- a/emails/email.comment_new.tpl +++ b/emails/email.comment_new.tpl @@ -2,7 +2,7 @@ * Оповещение о новом комментарии в топике *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.comment_new.text' params=[ diff --git a/emails/email.comment_reply.tpl b/emails/email.comment_reply.tpl index fec3352..69d8e4c 100644 --- a/emails/email.comment_reply.tpl +++ b/emails/email.comment_reply.tpl @@ -2,7 +2,7 @@ * Оповещение об ответе на комментарий *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.comment_reply.text' params=[ diff --git a/emails/email.invite.tpl b/emails/email.invite.tpl index ff9f402..9d49076 100644 --- a/emails/email.invite.tpl +++ b/emails/email.invite.tpl @@ -2,7 +2,7 @@ * Приглашение на сайт *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.invite.text' params=[ diff --git a/emails/email.reactivation.tpl b/emails/email.reactivation.tpl index a7ccf67..9009987 100644 --- a/emails/email.reactivation.tpl +++ b/emails/email.reactivation.tpl @@ -2,7 +2,7 @@ * Повторная активация *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.reactivation.text' params=[ diff --git a/emails/email.registration.tpl b/emails/email.registration.tpl index 1a3c362..b81af91 100644 --- a/emails/email.registration.tpl +++ b/emails/email.registration.tpl @@ -2,7 +2,7 @@ * Регистрация *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.registration.text' params=[ diff --git a/emails/email.registration_activate.tpl b/emails/email.registration_activate.tpl index 8d645e2..484bc5e 100644 --- a/emails/email.registration_activate.tpl +++ b/emails/email.registration_activate.tpl @@ -2,7 +2,7 @@ * Подтверждение регистрации *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.registration_activate.text' params=[ diff --git a/emails/email.reminder_code.tpl b/emails/email.reminder_code.tpl index 10d9217..89e1a80 100644 --- a/emails/email.reminder_code.tpl +++ b/emails/email.reminder_code.tpl @@ -2,7 +2,7 @@ * Смена пароля *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.reminder_code.text' params=[ diff --git a/emails/email.reminder_password.tpl b/emails/email.reminder_password.tpl index c3b7caf..af840a5 100644 --- a/emails/email.reminder_password.tpl +++ b/emails/email.reminder_password.tpl @@ -2,7 +2,7 @@ * Новый пароль *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.reminder_password.text' params=[ diff --git a/emails/email.talk_comment_new.tpl b/emails/email.talk_comment_new.tpl index 704eb1c..a7f143f 100644 --- a/emails/email.talk_comment_new.tpl +++ b/emails/email.talk_comment_new.tpl @@ -2,7 +2,7 @@ * Оповещение о новом сообщении в диалоге *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.talk_comment_new.text' params=[ diff --git a/emails/email.talk_new.tpl b/emails/email.talk_new.tpl index 5a7e368..647b969 100644 --- a/emails/email.talk_new.tpl +++ b/emails/email.talk_new.tpl @@ -2,7 +2,7 @@ * Оповещение о новом сообщении *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.talk_new.text' params=[ diff --git a/emails/email.topic_new.tpl b/emails/email.topic_new.tpl index b3db6eb..1832b57 100644 --- a/emails/email.topic_new.tpl +++ b/emails/email.topic_new.tpl @@ -2,7 +2,7 @@ * Оповещение о новом топике *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.topic_new.text' params=[ diff --git a/emails/email.user_changemail_from.tpl b/emails/email.user_changemail_from.tpl index 6cfbf03..fbc4768 100644 --- a/emails/email.user_changemail_from.tpl +++ b/emails/email.user_changemail_from.tpl @@ -2,7 +2,7 @@ * Смена почты *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.user_changemail.text' params=[ diff --git a/emails/email.user_changemail_to.tpl b/emails/email.user_changemail_to.tpl index 3ce2094..74ced61 100644 --- a/emails/email.user_changemail_to.tpl +++ b/emails/email.user_changemail_to.tpl @@ -2,7 +2,7 @@ * Смена почты *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.user_changemail.text' params=[ diff --git a/emails/email.user_complaint.tpl b/emails/email.user_complaint.tpl index de33d80..f5d03e0 100644 --- a/emails/email.user_complaint.tpl +++ b/emails/email.user_complaint.tpl @@ -2,7 +2,7 @@ * Жалоба *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.user_complaint.text' params=[ diff --git a/emails/email.user_friend_new.tpl b/emails/email.user_friend_new.tpl index 5960a30..f1d2e99 100644 --- a/emails/email.user_friend_new.tpl +++ b/emails/email.user_friend_new.tpl @@ -2,7 +2,7 @@ * Заявка в друзья *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.user_friend_new.text' params=[ diff --git a/emails/email.wall.new.tpl b/emails/email.wall.new.tpl index aca2080..186d00c 100644 --- a/emails/email.wall.new.tpl +++ b/emails/email.wall.new.tpl @@ -2,7 +2,7 @@ * Новое сообщение на стене *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.wall_new.text' params=[ diff --git a/emails/email.wall.reply.tpl b/emails/email.wall.reply.tpl index c4825ab..eecea25 100644 --- a/emails/email.wall.reply.tpl +++ b/emails/email.wall.reply.tpl @@ -2,7 +2,7 @@ * Ответ на сообщение на стене *} -{extends 'email'} +{extends 'component@email.email'} {block 'content'} {lang name='emails.wall_reply.text' params=[
- +
 
{Config::Get('view.name')} {if isset($oUserTo) }
- +
 
Чтобы отписаться от уведомлений, снимите галочки в вашем профиле. {/if}