[Phpgroupware-cvs] email/templates/base index_main_b0_l2.tpl, 1.3 search_results.tpl, 1.2 index_main_b0_l1.tpl, 1.3 compose.tpl, 1.3 addressbook.tpl, 1.3 message_main.tpl, 1.3

[skwashd]

Update of email/templates/base

Modified Files:
     Branch: MAIN
            index_main_b0_l2.tpl lines: +9 -2
            search_results.tpl lines: +2 -2
            index_main_b0_l1.tpl lines: +10 -1
            compose.tpl lines: +1 -7
            addressbook.tpl lines: +0 -0
            message_main.tpl lines: +1 -6

Log Message:
should have done this a while ago - SaD code

====================================================
Index: email/templates/base/index_main_b0_l2.tpl
diff -u email/templates/base/index_main_b0_l2.tpl:1.2 
email/templates/base/index_main_b0_l2.tpl:1.3
--- email/templates/base/index_main_b0_l2.tpl:1.2       Mon Feb 21 05:31:25 2005
+++ email/templates/base/index_main_b0_l2.tpl   Sun Mar 13 23:22:44 2005
@@ -115,8 +115,15 @@
                 
                {delmov_button}
        </td>
-       <td colspan="3" align="right">
-               {delmov_listbox}&nbsp;
+       <td align="left">
+               <!-- BEGIN B_empty_trash -->
+                       <a href="{empty_trash_link}"
+                               onClick="return 
window.confirm('{lang_empty_trash_warn}');">{lang_empty_trash}</a>
+               <!-- END B_empty_trash -->
+               &nbsp;
+       </td>
+       <td colspan="2" align="center">
+               &nbsp;{delmov_listbox}
        </td>
        </form>
 </tr>

====================================================
Index: email/templates/base/search_results.tpl
diff -u email/templates/base/search_results.tpl:1.1 
email/templates/base/search_results.tpl:1.2
--- email/templates/base/search_results.tpl:1.1 Wed Jan 12 15:12:07 2005
+++ email/templates/base/search_results.tpl     Sun Mar 13 23:22:44 2005
@@ -71,8 +71,8 @@

 <tr bgcolor="#D3DCE3">
        <td colspan="3" align="left">
-               <a href="javascript:check_all('{form_name}')"><img 
src="/phpgroupware/email/templates/default/images/check.gif" border="0" 
height="16" width="21"></a>&nbsp;&nbsp;
-       <a href="javascript:do_action('{form_name}', 'delall')"><img 
src="/phpgroupware/email/templates/default/images/evo-trash-24.gif" border="0" 
alt="[image]">&nbsp;Delete</a>
+               <a href="javascript:check_all('{form_name}')"><img 
src="/phpgroupware/email/templates/default/images/check.png" border="0" 
height="16" width="21"></a>&nbsp;&nbsp;
+       <a href="javascript:do_action('{form_name}', 'delall')"><img 
src="/phpgroupware/email/templates/default/images/evo-trash-24.png" border="0" 
alt="[image]">&nbsp;Delete</a>
        </td>
        <td colspan="3" align="right">
                <select name="to_fldball_fake_uri" 
onChange="do_action('{form_name}', 'move')">

====================================================
Index: email/templates/base/index_main_b0_l1.tpl
diff -u email/templates/base/index_main_b0_l1.tpl:1.2 
email/templates/base/index_main_b0_l1.tpl:1.3
--- email/templates/base/index_main_b0_l1.tpl:1.2       Mon Feb 21 05:31:25 2005
+++ email/templates/base/index_main_b0_l1.tpl   Sun Mar 13 23:22:44 2005
@@ -143,7 +143,16 @@
                                        &nbsp;&nbsp;{compose_clickme}
                                </font>
                        </td>
-                       <td width="80%" align="right">
+                       <td width="30%" align="center">
+                               <font face="{stats_font}" 
size="{stats_font_size}">
+                               <!-- BEGIN B_empty_trash -->
+                                       <a href="{empty_trash_link}"
+                                       onClick="return 
window.confirm('{lang_empty_trash_warn}');">{lang_empty_trash}</a>
+                               <!-- END B_empty_trash -->
+                               &nbsp;
+                               </font>
+                       </td>
+                       <td width="50%" align="right">
                                {delmov_listbox}
                        </td>
                        </form>

====================================================
Index: email/templates/base/compose.tpl
diff -u email/templates/base/compose.tpl:1.2 
email/templates/base/compose.tpl:1.3
--- email/templates/base/compose.tpl:1.2        Mon Feb 21 05:31:25 2005
+++ email/templates/base/compose.tpl    Sun Mar 13 23:22:44 2005
@@ -28,13 +28,7 @@
         {
                 //alert('OPENER GOT -> '+contact_ids);
         }
-
-       function save()
-       {
-               document.doit.draft.value = 'save';
-               document.doit.submit();
-       }
-
+
        function save()
        {
                document.doit.draft.value = 'save';

====================================================

====================================================
Index: email/templates/base/message_main.tpl
diff -u email/templates/base/message_main.tpl:1.2 
email/templates/base/message_main.tpl:1.3
--- email/templates/base/message_main.tpl:1.2   Mon Feb 21 05:31:25 2005
+++ email/templates/base/message_main.tpl       Sun Mar 13 23:22:44 2005
@@ -89,12 +89,7 @@
                                        <!-- END edit_message -->
                                </tr>
                                </table>
-                                       </td>
-                                       <!-- BEGIN edit_message -->
-                                       <td align="center">
-                                               {ilnk_edit}<font size="2" 
face="{theme_font}">{href_edit}</font>
-                                       </td>
-                                       <!-- END edit_message -->
+                       </td>
                        <td align="right" valign="middle" width="20%">
                                <font size="2" face="{theme_font}" 
color="{reply_btns_text}">
                                {ilnk_prev_msg}{href_prev_msg}