aboutsummaryrefslogtreecommitdiffstats
path: root/template/yoga
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-02-06 22:55:12 +0000
committerrub <rub@piwigo.org>2007-02-06 22:55:12 +0000
commite517cfad640d7697eb021cb698e5958f154f908b (patch)
tree8b386ddbcb42a7d09a7f2e6eafe64f1524075c22 /template/yoga
parent5f94909b4236730057499fd876ae96f88fcc95ff (diff)
Issue 0000598: NBM: Add new informations
Notification by mail: Add new informations about last categories and last images like new feature of RSS notification. 2 parts: - Possibility to send HTML mail - Include last categories and last images on HTML format into notification mail ccs & HTML experts! Please! Check, fix, improve and enhance HTML mail content! git-svn-id: http://piwigo.org/svn/trunk@1784 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--template/yoga/admin/notification_by_mail.tpl25
-rw-r--r--template/yoga/mail/index.php2
-rw-r--r--template/yoga/mail/text/html/footer.tpl (renamed from template/yoga/mail/footer.tpl)2
-rw-r--r--template/yoga/mail/text/html/header.tpl (renamed from template/yoga/mail/header.tpl)0
-rw-r--r--template/yoga/mail/text/html/index.php (renamed from template/yoga/mail/admin/index.php)2
-rw-r--r--template/yoga/mail/text/index.php35
-rw-r--r--template/yoga/mail/text/plain/footer.tpl3
-rw-r--r--template/yoga/mail/text/plain/header.tpl1
-rw-r--r--template/yoga/mail/text/plain/index.php35
9 files changed, 98 insertions, 7 deletions
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 620f8a8dc..da61bcdfb 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -27,23 +27,40 @@
<legend>{lang:nbm_title_param}</legend>
<table>
<tr>
+ <td><label>{lang:nbm_send_html_mail}</label></td>
+ <td>
+ <label><input type="radio" name="nbm_send_html_mail" value="true" {param.SEND_HTML_MAIL_YES}/>{lang:yes}</label>
+ <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:no}</label>
+ </td>
+ </tr>
+ <tr>
<td>
<label for="send_mail_as">{lang:nbm_send_mail_as}</label>
<br><i><small>{lang:nbm_info_send_mail_as}</small></i>
</td>
<td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{param.SEND_MAIL_AS}"/></td>
</tr>
- <tr>
- <td><label>{lang:nbm_send_detailed_content} </label></td>
+ <tr>
+ <td><label>{lang:nbm_send_detailed_content}</label></td>
<td>
<label><input type="radio" name="nbm_send_detailed_content" value="true" {param.SEND_DETAILED_CONTENT_YES}/>{lang:yes}</label>
<label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:no}</label>
</td>
</tr>
<tr>
- <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content} </label></td>
+ <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content}</label></td>
<td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
</tr>
+ <tr>
+ <td>
+ <label>{lang:nbm_send_recent_post_dates}</label>
+ <br><i><small>{lang:nbm_info_send_recent_post_dates}</small></i>
+ </td>
+ <td>
+ <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {param.SEND_RECENT_POST_DATES_YES}/>{lang:yes}</label>
+ <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:no}</label>
+ </td>
+ </tr>
</table>
</fieldset>
@@ -98,7 +115,7 @@
<legend>{lang:nbm_send_options}</legend>
<table>
<tr>
- <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content} </label></td>
+ <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content}</label></td>
<td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{send.send_data.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
</tr>
</table>
diff --git a/template/yoga/mail/index.php b/template/yoga/mail/index.php
index ad16c4524..871f06a8e 100644
--- a/template/yoga/mail/index.php
+++ b/template/yoga/mail/index.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
// | file : $RCSfile$
diff --git a/template/yoga/mail/footer.tpl b/template/yoga/mail/text/html/footer.tpl
index 22076068a..ac0d2784f 100644
--- a/template/yoga/mail/footer.tpl
+++ b/template/yoga/mail/text/html/footer.tpl
@@ -1,5 +1,5 @@
<div id="copyright">
-
+<HR>
<!-- Please, do not remove this copyright. If you really want to,
contact us on http://phpwebgallery.net to find a solution on how
to show the origin of the script...-->
diff --git a/template/yoga/mail/header.tpl b/template/yoga/mail/text/html/header.tpl
index fee4d441c..fee4d441c 100644
--- a/template/yoga/mail/header.tpl
+++ b/template/yoga/mail/text/html/header.tpl
diff --git a/template/yoga/mail/admin/index.php b/template/yoga/mail/text/html/index.php
index ad16c4524..871f06a8e 100644
--- a/template/yoga/mail/admin/index.php
+++ b/template/yoga/mail/text/html/index.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
// | file : $RCSfile$
diff --git a/template/yoga/mail/text/index.php b/template/yoga/mail/text/index.php
new file mode 100644
index 000000000..871f06a8e
--- /dev/null
+++ b/template/yoga/mail/text/index.php
@@ -0,0 +1,35 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
+// | last modifier : $Author: plg $
+// | revision : $Revision: 1082 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/template/yoga/mail/text/plain/footer.tpl b/template/yoga/mail/text/plain/footer.tpl
new file mode 100644
index 000000000..7d97bba50
--- /dev/null
+++ b/template/yoga/mail/text/plain/footer.tpl
@@ -0,0 +1,3 @@
+
+------------------------
+PhpWebGallery {VERSION}
diff --git a/template/yoga/mail/text/plain/header.tpl b/template/yoga/mail/text/plain/header.tpl
new file mode 100644
index 000000000..fec68b422
--- /dev/null
+++ b/template/yoga/mail/text/plain/header.tpl
@@ -0,0 +1 @@
+{FAKE_SIMULATE_EMPTY_FILE} \ No newline at end of file
diff --git a/template/yoga/mail/text/plain/index.php b/template/yoga/mail/text/plain/index.php
new file mode 100644
index 000000000..871f06a8e
--- /dev/null
+++ b/template/yoga/mail/text/plain/index.php
@@ -0,0 +1,35 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
+// | last modifier : $Author: plg $
+// | revision : $Revision: 1082 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>