From c8827d3236f5760ac8683e338436bc4e4a9035d0 Mon Sep 17 00:00:00 2001 From: rub Date: Tue, 30 Sep 2008 21:14:16 +0000 Subject: Fix bad content of NBM mail. git-svn-id: http://piwigo.org/svn/trunk@2628 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_modify.php | 1 - .../yoga/mail/text/html/admin/cat_group_info.tpl | 9 ---- template/yoga/mail/text/html/admin/index.php | 30 ------------ .../mail/text/html/admin/notification_by_mail.tpl | 57 ---------------------- template/yoga/mail/text/html/cat_group_info.tpl | 9 ++++ .../yoga/mail/text/html/notification_by_mail.tpl | 57 ++++++++++++++++++++++ .../yoga/mail/text/plain/admin/cat_group_info.tpl | 9 ---- template/yoga/mail/text/plain/admin/index.php | 30 ------------ .../mail/text/plain/admin/notification_by_mail.tpl | 42 ---------------- template/yoga/mail/text/plain/cat_group_info.tpl | 9 ++++ .../yoga/mail/text/plain/notification_by_mail.tpl | 42 ++++++++++++++++ 11 files changed, 117 insertions(+), 178 deletions(-) delete mode 100644 template/yoga/mail/text/html/admin/cat_group_info.tpl delete mode 100644 template/yoga/mail/text/html/admin/index.php delete mode 100644 template/yoga/mail/text/html/admin/notification_by_mail.tpl create mode 100644 template/yoga/mail/text/html/cat_group_info.tpl create mode 100644 template/yoga/mail/text/html/notification_by_mail.tpl delete mode 100644 template/yoga/mail/text/plain/admin/cat_group_info.tpl delete mode 100644 template/yoga/mail/text/plain/admin/index.php delete mode 100644 template/yoga/mail/text/plain/admin/notification_by_mail.tpl create mode 100644 template/yoga/mail/text/plain/cat_group_info.tpl create mode 100644 template/yoga/mail/text/plain/notification_by_mail.tpl diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 6f313f9ea..74f59f0a8 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -485,7 +485,6 @@ SELECT id, file, path, tn_ext get_str_email_format(true), /* TODO add a checkbox in order to choose format*/ get_l10n_args('[%s] Come to visit the category %s', array($conf['gallery_title'], $category['name'])), - 'admin', 'cat_group_info', array ( diff --git a/template/yoga/mail/text/html/admin/cat_group_info.tpl b/template/yoga/mail/text/html/admin/cat_group_info.tpl deleted file mode 100644 index 2c8c45d6a..000000000 --- a/template/yoga/mail/text/html/admin/cat_group_info.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{* $Id$ *} -
-

{'Informations'|@translate}

-

{$IMG_URL}

-

{'Hello,'|@translate}

-

{'Come to discover the category:'|@translate} {$CAT_NAME}

-

{$CPL_CONTENT}

-

{'See you soon.'|@translate}

-
diff --git a/template/yoga/mail/text/html/admin/index.php b/template/yoga/mail/text/html/admin/index.php deleted file mode 100644 index c15b15795..000000000 --- a/template/yoga/mail/text/html/admin/index.php +++ /dev/null @@ -1,30 +0,0 @@ - diff --git a/template/yoga/mail/text/html/admin/notification_by_mail.tpl b/template/yoga/mail/text/html/admin/notification_by_mail.tpl deleted file mode 100644 index 52627ebe4..000000000 --- a/template/yoga/mail/text/html/admin/notification_by_mail.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{* $Id$ *} -
-

{'Notification'|@translate}

-

{'nbm_content_hello_1'|@translate}{$USERNAME}{'nbm_content_hello_2'|@translate}

- -{if isset($subscribe_by_admin)} -

{'nbm_content_subscribe_by_admin'|@translate}

-{/if} -{if isset($subscribe_by_himself)} -

{'nbm_content_subscribe_by_himself'|@translate}

-{/if} -{if isset($unsubscribe_by_admin)} -

{'nbm_content_unsubscribe_by_admin'|@translate}

-{/if} -{if isset($unsubscribe_by_himself)} -

{'nbm_content_unsubscribe_by_himself'|@translate}

-{/if} -{if isset($content_new_elements_single)} -

{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_single'|@translate}{$content_new_elements_single.DATE_SINGLE}.

-{/if} -{if isset($content_new_elements_between)} -

{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_between_1'|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{'nbm_content_new_elements_between_2'|@translate}{$content_new_elements_between.DATE_BETWEEN_2}.

-{/if} - -{if not empty($global_new_lines)} - -{/if} - -{if not empty($custom_mail_content)} -

{$custom_mail_content}

-{/if} - -{if not empty($GOTO_GALLERY_TITLE)} -

{'nbm_content_goto_1'|@translate}{$GOTO_GALLERY_TITLE}{'nbm_content_goto_2'|@translate}

-{/if} -

{'nbm_content_byebye'|@translate}

-

{$SEND_AS_NAME}

-

-

-{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$UNSUBSCRIBE_LINK}
-{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$SUBSCRIBE_LINK}
-{'nbm_content_problem_contact'|@translate}{$CONTACT_EMAIL}
-

-

-{if not empty($recent_posts)} -
-
- {foreach from=$recent_posts item=recent_post } -

{$recent_post.TITLE}

- {$recent_post.HTML_DATA} - {/foreach} -{/if} -
diff --git a/template/yoga/mail/text/html/cat_group_info.tpl b/template/yoga/mail/text/html/cat_group_info.tpl new file mode 100644 index 000000000..2c8c45d6a --- /dev/null +++ b/template/yoga/mail/text/html/cat_group_info.tpl @@ -0,0 +1,9 @@ +{* $Id$ *} +
+

{'Informations'|@translate}

+

{$IMG_URL}

+

{'Hello,'|@translate}

+

{'Come to discover the category:'|@translate} {$CAT_NAME}

+

{$CPL_CONTENT}

+

{'See you soon.'|@translate}

+
diff --git a/template/yoga/mail/text/html/notification_by_mail.tpl b/template/yoga/mail/text/html/notification_by_mail.tpl new file mode 100644 index 000000000..52627ebe4 --- /dev/null +++ b/template/yoga/mail/text/html/notification_by_mail.tpl @@ -0,0 +1,57 @@ +{* $Id$ *} +
+

{'Notification'|@translate}

+

{'nbm_content_hello_1'|@translate}{$USERNAME}{'nbm_content_hello_2'|@translate}

+ +{if isset($subscribe_by_admin)} +

{'nbm_content_subscribe_by_admin'|@translate}

+{/if} +{if isset($subscribe_by_himself)} +

{'nbm_content_subscribe_by_himself'|@translate}

+{/if} +{if isset($unsubscribe_by_admin)} +

{'nbm_content_unsubscribe_by_admin'|@translate}

+{/if} +{if isset($unsubscribe_by_himself)} +

{'nbm_content_unsubscribe_by_himself'|@translate}

+{/if} +{if isset($content_new_elements_single)} +

{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_single'|@translate}{$content_new_elements_single.DATE_SINGLE}.

+{/if} +{if isset($content_new_elements_between)} +

{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_between_1'|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{'nbm_content_new_elements_between_2'|@translate}{$content_new_elements_between.DATE_BETWEEN_2}.

+{/if} + +{if not empty($global_new_lines)} + +{/if} + +{if not empty($custom_mail_content)} +

{$custom_mail_content}

+{/if} + +{if not empty($GOTO_GALLERY_TITLE)} +

{'nbm_content_goto_1'|@translate}{$GOTO_GALLERY_TITLE}{'nbm_content_goto_2'|@translate}

+{/if} +

{'nbm_content_byebye'|@translate}

+

{$SEND_AS_NAME}

+

+

+{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$UNSUBSCRIBE_LINK}
+{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$SUBSCRIBE_LINK}
+{'nbm_content_problem_contact'|@translate}{$CONTACT_EMAIL}
+

+

+{if not empty($recent_posts)} +
+
+ {foreach from=$recent_posts item=recent_post } +

{$recent_post.TITLE}

+ {$recent_post.HTML_DATA} + {/foreach} +{/if} +
diff --git a/template/yoga/mail/text/plain/admin/cat_group_info.tpl b/template/yoga/mail/text/plain/admin/cat_group_info.tpl deleted file mode 100644 index d91c0ebcc..000000000 --- a/template/yoga/mail/text/plain/admin/cat_group_info.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{* $Id$ *} -{'Hello,'|@translate} - -{'Come to discover the category:'|@translate} {$CAT_NAME} -{$LINK} - -{$CPL_CONTENT} - -{'See you soon.'|@translate} diff --git a/template/yoga/mail/text/plain/admin/index.php b/template/yoga/mail/text/plain/admin/index.php deleted file mode 100644 index c15b15795..000000000 --- a/template/yoga/mail/text/plain/admin/index.php +++ /dev/null @@ -1,30 +0,0 @@ - diff --git a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl b/template/yoga/mail/text/plain/admin/notification_by_mail.tpl deleted file mode 100644 index 256232f37..000000000 --- a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{* $Id$ *} -{'nbm_content_hello_1'|@translate}{$USERNAME}{'nbm_content_hello_2'|@translate} - -{if isset($subscribe_by_admin)} -{'nbm_content_subscribe_by_admin'|@translate} -{/if} -{if isset($subscribe_by_himself)} -{'nbm_content_subscribe_by_himself'|@translate} -{/if} -{if isset($unsubscribe_by_admin)} -{'nbm_content_unsubscribe_by_admin'|@translate} -{/if} -{if isset($unsubscribe_by_himself)} -{'nbm_content_unsubscribe_by_himself'|@translate} -{/if} -{if isset($content_new_elements_single)} -{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_single'|@translate}{$content_new_elements_single.DATE_SINGLE}. -{/if} -{if isset($content_new_elements_between)} -{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_between_1'|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{'nbm_content_new_elements_between_2'|@translate}{$content_new_elements_between.DATE_BETWEEN_2}. -{/if} -{if not empty($global_new_lines)} -{foreach from=$global_new_lines item=line} - o {$line} -{/foreach} -{/if} -{if not empty($custom_mail_content)} -{$custom_mail_content} -{/if} -{if not empty($GOTO_GALLERY_TITLE)} -{'nbm_content_goto_1'|@translate}{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} {'nbm_content_goto_2'|@translate} -{/if} - -{'nbm_content_byebye'|@translate} - {$SEND_AS_NAME} - -______________________________________________________________________________ - -{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$UNSUBSCRIBE_LINK} -{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$SUBSCRIBE_LINK} -{'nbm_content_problem_contact'|@translate}{$CONTACT_EMAIL} -______________________________________________________________________________ diff --git a/template/yoga/mail/text/plain/cat_group_info.tpl b/template/yoga/mail/text/plain/cat_group_info.tpl new file mode 100644 index 000000000..d91c0ebcc --- /dev/null +++ b/template/yoga/mail/text/plain/cat_group_info.tpl @@ -0,0 +1,9 @@ +{* $Id$ *} +{'Hello,'|@translate} + +{'Come to discover the category:'|@translate} {$CAT_NAME} +{$LINK} + +{$CPL_CONTENT} + +{'See you soon.'|@translate} diff --git a/template/yoga/mail/text/plain/notification_by_mail.tpl b/template/yoga/mail/text/plain/notification_by_mail.tpl new file mode 100644 index 000000000..256232f37 --- /dev/null +++ b/template/yoga/mail/text/plain/notification_by_mail.tpl @@ -0,0 +1,42 @@ +{* $Id$ *} +{'nbm_content_hello_1'|@translate}{$USERNAME}{'nbm_content_hello_2'|@translate} + +{if isset($subscribe_by_admin)} +{'nbm_content_subscribe_by_admin'|@translate} +{/if} +{if isset($subscribe_by_himself)} +{'nbm_content_subscribe_by_himself'|@translate} +{/if} +{if isset($unsubscribe_by_admin)} +{'nbm_content_unsubscribe_by_admin'|@translate} +{/if} +{if isset($unsubscribe_by_himself)} +{'nbm_content_unsubscribe_by_himself'|@translate} +{/if} +{if isset($content_new_elements_single)} +{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_single'|@translate}{$content_new_elements_single.DATE_SINGLE}. +{/if} +{if isset($content_new_elements_between)} +{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_between_1'|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{'nbm_content_new_elements_between_2'|@translate}{$content_new_elements_between.DATE_BETWEEN_2}. +{/if} +{if not empty($global_new_lines)} +{foreach from=$global_new_lines item=line} + o {$line} +{/foreach} +{/if} +{if not empty($custom_mail_content)} +{$custom_mail_content} +{/if} +{if not empty($GOTO_GALLERY_TITLE)} +{'nbm_content_goto_1'|@translate}{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} {'nbm_content_goto_2'|@translate} +{/if} + +{'nbm_content_byebye'|@translate} + {$SEND_AS_NAME} + +______________________________________________________________________________ + +{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$UNSUBSCRIBE_LINK} +{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}{$SUBSCRIBE_LINK} +{'nbm_content_problem_contact'|@translate}{$CONTACT_EMAIL} +______________________________________________________________________________ -- cgit v1.2.3