- admin/notification_by_mail goes smarty - THE LAST ONE :-) :-)

- get rid of user_list warnings
- some code reorganisation in template class + explode modifier
- minor template and language changes in search.tpl and cat_modify.tpl

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

1 files changed, 60 insertions, 61 deletions

diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 3afa4161b..eb5e2a0f9 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -1,125 +1,124 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id: notification_by_mail.tpl Ruben ARNAUD -->
+{* $Id$ *}
+
 <div class="titrePage">
   <ul class="categoryActions">
-    <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>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:nbm_send_mail_to_users} {TABSHEET_TITLE}</h2>
-  {TABSHEET}
+  <h2>{'nbm_send_mail_to_users'|@translate} {$TABSHEET_TITLE}</h2>
+  {$TABSHEET}
 </div>
 
-<form method="post" name="notification_by_mail" id="notification_by_mail" action="{F_ACTION}">
-  <!-- BEGIN repost -->
+<form method="post" name="notification_by_mail" id="notification_by_mail" action="{$F_ACTION}">
+  {if isset($REPOST_SUBMIT_NAME)}
   <fieldset>
     <div class="infos">
-      <input class="submit" type="submit" value="{lang:nbm_repost_submit}" name="{repost.REPOST_SUBMIT_NAME}" {TAG_INPUT_ENABLED}/>
+      <input class="submit" type="submit" value="{'nbm_repost_submit'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}/>
     </div>
   </fieldset>
-  <!-- END repost -->
+  {/if}
 
-  <!-- BEGIN param -->
+  {if isset($param)}
   <fieldset>
-    <legend>{lang:nbm_title_param}</legend>
+    <legend>{'nbm_title_param'|@translate}</legend>
     <table>
       <tr>
-        <td><label>{lang:nbm_send_html_mail}</label></td>
+        <td><label>{'nbm_send_html_mail'|@translate}</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>
+          <label><input type="radio" name="nbm_send_html_mail" value="true"  {if $param.SEND_HTML_MAIL}checked="checked"{/if}/>{'Yes'|@translate}</label>
+          <label><input type="radio" name="nbm_send_html_mail" value="false" {if not $param.SEND_HTML_MAIL}checked="checked"{/if}/>{'No'|@translate}</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>
+          <label for="send_mail_as">{'nbm_send_mail_as'|@translate}</label>
+          <br/><i><small>{'nbm_info_send_mail_as'|@translate}</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>
+        <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>
+        <td><label>{'nbm_send_detailed_content'|@translate}</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>
+          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {if $param.SEND_DETAILED_CONTENT}checked="checked"{/if}/>{'Yes'|@translate}</label>
+          <label><input type="radio" name="nbm_send_detailed_content" value="false" {if not $param.SEND_DETAILED_CONTENT}checked="checked"{/if}/>{'No'|@translate}</label>
         </td>
       </tr>
      <tr>
-        <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>
+        <td><label for="complementary_mail_content">{'nbm_complementary_mail_content'|@translate}</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>
+          <label>{'nbm_send_recent_post_dates'|@translate}</label>
+          <br/><i><small>{'nbm_info_send_recent_post_dates'|@translate}</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>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {if $param.SEND_RECENT_POST_DATES}checked="checked"{/if}/>{'Yes'|@translate}</label>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {if not $param.SEND_RECENT_POST_DATES}checked="checked"{/if}/>{'No'|@translate}</label>
         </td>
       </tr>
     </table>
   </fieldset>
 
   <p>
-    <input class="submit" type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="reset" value="{lang:Reset}" name="param_reset"/>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="param_submit" {$TAG_INPUT_ENABLED}/>
+    <input class="submit" type="reset" value="{'Reset'|@translate}" name="param_reset"/>
   </p>
-  <!-- END param -->
+  {/if}{* isset $param*}
 
-  <!-- BEGIN subscribe -->
+  {if isset($subscribe)}
   <fieldset>
-    <legend>{lang:nbm_title_subscribe}</legend>
-    <p><i>{lang:nbm_warning_subscribe_unsubscribe}</i></p>
-    {DOUBLE_SELECT}
+    <legend>{'nbm_title_subscribe'|@translate}</legend>
+    <p><i>{'nbm_warning_subscribe_unsubscribe'|@translate}</i></p>
+    {$DOUBLE_SELECT}
   </fieldset>
-  <!-- END subscribe -->
+  {/if}{* isset $subscribe*}
 
-  <!-- BEGIN send -->
-    <!-- BEGIN send_empty -->
-    <p>{lang:nbm_no_user_available_to_send_L1}</p>
+  {if isset($send)}
+    {if empty($send.users)}
+    <p>{'nbm_no_user_available_to_send_L1'|@translate}</p>
     <p>
-    {lang:nbm_no_user_available_to_send_L2}<br>
-    {lang:nbm_no_user_available_to_send_L3}
+    {'nbm_no_user_available_to_send_L2'|@translate}<br>
+    {'nbm_no_user_available_to_send_L3'|@translate}
     </p>
-    <!-- END send_empty -->
-    <!-- BEGIN send_data -->
+    {else}
     <fieldset>
-      <legend>{lang:nbm_title_send}</legend>
+      <legend>{'nbm_title_send'|@translate}</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>
+          <th>{'nbm_col_user'|@translate}</th>
+          <th>{'nbm_col_mail'|@translate}</th>
+          <th>{'nbm_col_last_send'|@translate}</th>
+          <th>{'nbm_col_check_user_send_mail'|@translate}</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>
+        {foreach from=$send.users item=u name=user_loop}
+        <tr class="{if $smarty.foreach.user_loop.index is odd}row1{else}row2{/if}">
+          <td><label for="send_selection-{$u.ID}">{$u.USERNAME}</label></td>
+          <td><label for="send_selection-{$u.ID}">{$u.EMAIL}</label></td>
+          <td><label for="send_selection-{$u.ID}">{$u.LAST_SEND}</label></td>
+          <td><input type="checkbox" name="send_selection[]" value="{$u.ID}" {$u.CHECKED} id="send_selection-{$u.ID}"/></td>
         </tr>
-        <!-- END user_send_mail -->
+        {/foreach}
       </table>
       <p>
-          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:Check all}</a>
-        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:Uncheck all}</a>
+          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{'Check all'|@translate}</a>
+        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{'Uncheck all'|@translate}</a>
       </p>
     </fieldset>
 
     <fieldset>
-      <legend>{lang:nbm_send_options}</legend>
+      <legend>{'nbm_send_options'|@translate}</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>
+          <td><label for="send_customize_mail_content">{'nbm_send_complementary_mail_content'|@translate}</label></td>
+          <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{$send.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
         </tr>
       </table>
     </fieldset>
 
     <p>
-      <input class="submit" type="submit" value="{lang:nbm_send_submit}" name="send_submit" {TAG_INPUT_ENABLED}/>
+      <input class="submit" type="submit" value="{'nbm_send_submit'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}/>
     </p>
-    <!-- END send_data -->
-  <!-- END send -->
+    {/if}
+  {/if}{* isset $send*}
 
 </form>