Send email on pwg group:

  o Best mail content
  o Add a text area in order to complete email

git-svn-id: http://piwigo.org/svn/trunk@1916 68402e56-0260-453c-a942-63ccdbb3a9ee

6 files changed, 31 insertions, 10 deletions

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 6eccb305d..fd6588c97 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -283,6 +283,8 @@ $template->assign_vars(
         )
       ),
 
+    'MAIL_CONTENT' => empty($_POST['mail_content'])
+        ? '' : stripslashes($_POST['mail_content']),
     'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_modify',
 
@@ -565,12 +567,14 @@ SELECT id, file, path, tn_ext
   pwg_mail_group(
     $_POST['group'],
     get_str_email_format(true), /* TODO add a checkbox in order to choose format*/
-    get_l10n_args('Come to visit %s', $category['name']),
+    get_l10n_args('[%s] Come to visit the category %s',
+      array($conf['gallery_title'], $category['name'])),
     'admin',
     'cat_group_info',
     array
     (
       'IMG_URL' => $img_url,
+      'CAT_NAME' => $category['name'],
       'LINK' => make_index_url(
           array(
             'category' => array(
@@ -578,7 +582,8 @@ SELECT id, file, path, tn_ext
               'name' => $category['name'],
               'permalink' => $category['permalink']
               ))),
-      'CPL_CONTENT' => '' /* TODO Add text area to add complementary content */
+      'CPL_CONTENT' => empty($_POST['mail_content'])
+                          ? '' : stripslashes($_POST['mail_content'])
     ),
     '' /* TODO Add listbox in order to choose Language selected */);
 
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 7bed53f74..94883cf27 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -582,5 +582,8 @@ $lang['cat_options_title'] = 'Properties';
 $lang['An information email was sent to group "%s"'] = 'An information email was sent to group "%s';
 $lang['Send an information email to group members'] = 'Send an information email to group members';
 $lang['Group'] = 'Group';
-$lang['Come to visit %s'] = 'Come to visit %s';
+$lang['[%s] Come to visit the category %s'] = '[%s] Come to visit the category %s';
+$lang['See you soon.'] = 'See you soon.';
+$lang['Come to discover the category:'] = 'Come to discover the category:';
+$lang['mail_content'] = 'Mail content';
 ?>
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index e8b4d7e54..e529c23d6 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -581,5 +581,8 @@ $lang['cat_options_title'] = 'Propriétés';
 $lang['An information email was sent to group "%s"'] = 'Un mail d\'informations a été envoyé aux membres du groupe';
 $lang['Send an information email to group members'] = 'Envoyer un mail d\'informations aux membres d\'un groupe';
 $lang['Group'] = 'Groupe';
-$lang['Come to visit %s'] = 'Venez visiter %s';
+$lang['[%s] Come to visit the category %s'] = '[%s] Venez visiter la catégorie %s';
+$lang['See you soon.'] = 'A bientôt.';
+$lang['Come to discover the category:'] = 'Venez découvrir la catégorie:';
+$lang['mail_content'] = 'Contenu du mail';
 ?>
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index f28f8ab22..8db494991 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -72,15 +72,15 @@
     <tr>
       <td><strong>{L_EDIT_STATUS}</strong>
       <td>
-	  <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
-	  <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
+    <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
+    <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
       </td>
     </tr>
     <tr>
       <td><strong>{L_EDIT_LOCK}</strong>
       <td>
-	  <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
-	  <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
+    <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
+    <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
       </td>
     </tr>
     <tr>
@@ -217,7 +217,7 @@
 
   <table>
     <tr>
-      <td>{lang:Group}</td>
+      <td><strong>{lang:Group}</strong></td>
       <td>
         <select name="group">
           <!-- BEGIN group_option -->
@@ -226,6 +226,13 @@
         </select>
       </td>
     </tr>
+    <tr>
+      <td><strong>{lang:mail_content}</strong></td>
+      <td>
+        <textarea cols="50" rows="5" name="mail_content" class="description">{MAIL_CONTENT}</textarea>
+      </td>
+    </tr>
+
   </table>
 
   <p>
diff --git a/template/yoga/mail/text/html/admin/cat_group_info.tpl b/template/yoga/mail/text/html/admin/cat_group_info.tpl
index 664c8701e..fc05c6831 100644
--- a/template/yoga/mail/text/html/admin/cat_group_info.tpl
+++ b/template/yoga/mail/text/html/admin/cat_group_info.tpl
@@ -2,6 +2,7 @@
 <h2>{lang:Informations}</h2>
 <p>{IMG_URL}</p>
 <p>{lang:hello}</p>
-<p><a href="{LINK}">{LINK}</a></p>
+<p>{lang:Come to discover the category:} <a href="{LINK}">{CAT_NAME}</a></p>
 <p>{CPL_CONTENT}</p>
+<p>{lang:See you soon.}</p>
 </div>
diff --git a/template/yoga/mail/text/plain/admin/cat_group_info.tpl b/template/yoga/mail/text/plain/admin/cat_group_info.tpl
index 9969824b8..87d510fae 100644
--- a/template/yoga/mail/text/plain/admin/cat_group_info.tpl
+++ b/template/yoga/mail/text/plain/admin/cat_group_info.tpl
@@ -1,6 +1,8 @@
 {lang:hello}
 
+{lang:Come to discover the category:} {CAT_NAME}
 {LINK}
 
 {CPL_CONTENT}
 
+{lang:See you soon.}
\ No newline at end of file