1 files changed, 72 insertions, 16 deletions
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 36bff3cf3..07ddda54e 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -4,13 +4,15 @@
     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
   <h2>{lang:nbm_Send mail to users} [{U_TABSHEET_TITLE}]</h2>
+  <!-- BEGIN header_link -->
   <h3>
     <p style="text-align:center;">
-      <a href="{U_PARAM_MODE}">{lang:nbm_param_mode}</a> | 
-      <a href="{U_SUBSCRIBE_MODE}">{lang:nbm_subscribe_mode}</a> | 
-      <a href="{U_SEND_MODE}">{lang:nbm_send_mode}</a>
+      <a href="{header_link.PARAM_MODE}">{lang:nbm_param_mode}</a> | 
+      <a href="{header_link.SUBSCRIBE_MODE}">{lang:nbm_subscribe_mode}</a> | 
+      <a href="{header_link.SEND_MODE}">{lang:nbm_send_mode}</a>
     </p>
   </h3>
+  <!-- END header_link -->
 </div>
 
 <form method="post" name="notification_by_mail" action="{F_ACTION}">
@@ -21,40 +23,94 @@
 
     <table>
       <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>
         <td><label for="send_detailed_content">{lang:nbm_send_detailed_content} </label></td>
-        <td><input type="checkbox" name="send_detailed_content" id="send_detailed_content" value="true" {param.SEND_DETAILED_CONTENT}/></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><textarea cols="50" rows="5" name="complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
+        <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
       </tr>
     </table>
   </fieldset>
 
   <p>
-    <input type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED} />
-    <input type="reset" value="{lang:Reset}" name="param_reset" />
+    <input type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED}/>
+    <input type="reset" value="{lang:Reset}" name="param_reset"/>
   </p>
   <!-- END param -->
 
   <!-- BEGIN subscribe -->
   <fieldset>
     <legend><strong>{lang:nbm_title_subscribe}</strong></legend>
-    <legend><center><i>{lang:nbm_warning_subscribe_unsubcribe}</i></center></legend>
+    <br><center><i>{lang:nbm_warning_subscribe_unsubcribe}</i></center><br>
     {DOUBLE_SELECT}
   </fieldset>
   <!-- END subscribe -->
 
   <!-- BEGIN send -->
-  <fieldset>
-    <legend><strong>{lang:nbm_title_send}</strong></legend>
-    {DOUBLE_SELECT}
-  </fieldset>
+    <!-- BEGIN send_empty -->
+    <center>
+      {lang:nbm_no_user_available_to_send_L1}<br>
+      {lang:nbm_no_user_available_to_send_L2}
+    </center>
+    <!-- END send_empty -->
+    <!-- BEGIN send_data -->
+    <fieldset>
+      <legend><strong>{lang:nbm_title_send}</strong></legend>
+      <table class="table2">
+        <tr class="throw">
+          <th>{lang:nbm_col_user}</th>
+          <th>{lang:nbm_col_mail}</th>
+          <th>{lang:nbm_col_last_send}</th>
+          <th>{lang:nbm_col_check_user_send_mail}</th>
+        </tr>
+        <!-- BEGIN user_send_mail -->
+        <tr class="{send.send_data.user_send_mail.CLASS}">
+          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.USERNAME}</label></td>
+          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.EMAIL}</label></td>
+          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.LAST_SEND}</label></td>
+          <td><input type="checkbox" name="send_selection[]" value="{send.send_data.user_send_mail.ID}" {send.send_data.user_send_mail.CHECKED} id="send_selection-{send.send_data.user_send_mail.ID}"/></td>
+        </tr>
+        <!-- END user_send_mail -->
+      </table>
+  <!--
+      <p>
+          <a href="{send.send_data.URL_CHECK_ALL}">{lang:nbm_send_check_all}</a>
+        / <a href="{send.send_data.URL_UNCHECK_ALL}">{lang:nbm_send_uncheck_all}</a>
+      </p>
+  -->
+      <p>
+        <input type="submit" value="{lang:nbm_send_check_all}" name="send_check_all"/>
+        /
+        <input type="submit" value="{lang:nbm_send_uncheck_all}" name="send_uncheck_all"/>
+      </p>
+    </fieldset>
 
-  <p>
-    <input type="submit" value="{lang:nbm_send_submit}" name="sene_submit" {TAG_INPUT_ENABLED} />
-    <input type="reset" value="{lang:Reset}" name="send_reset" />
-  </p>
+    <fieldset>
+      <legend><strong>{lang:nbm_send_options}</strong></legend>
+
+      <table>
+       <tr>
+          <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>
+    </fieldset>
+
+    <p>
+      <input type="submit" value="{lang:nbm_send_submit}" name="send_submit" {TAG_INPUT_ENABLED}/>
+    </p>
+    <!-- END send_data -->
   <!-- END send -->
 
 </form>