[Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.5,1.6 filters_blocks.tpl,1.3,1.4

[Angelo Tony Puglisi <address@hidden>]

Update of /cvsroot/phpgroupware//email/templates/default
In directory subversions:/tmp/cvs-serv8841/email/templates/default

Modified Files:
        filters.tpl filters_blocks.tpl 
Log Message:
first implementation of messages moving between different folders on different 
accounts in a filter logic loop

Index: filters.tpl
===================================================================
RCS file: /cvsroot/phpgroupware//email/templates/default/filters.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** filters.tpl 22 Jan 2002 13:16:34 -0000      1.5
--- filters.tpl 23 Jan 2002 13:22:23 -0000      1.6
***************
*** 53,57 ****
                        <select name="{comparator_selectbox_name}">
                                <option value="contains" 
{contains_selected}>{lang_contains}</option>
!                               <option value="notcontains" 
{notcontains_selected}>{lang_notcontains}</option>
                        </select>
                        </font>
--- 53,57 ----
                        <select name="{comparator_selectbox_name}">
                                <option value="contains" 
{contains_selected}>{lang_contains}</option>
!                               <!-- <option value="notcontains" 
{notcontains_selected}>{lang_notcontains}</option> -->
                        </select>
                        </font>
***************
*** 104,135 ****
        <br>
        
!       <table width="75%" border="0" cellPadding="0" cellSpacing="0">
        <tr> 
!               <td width="50%">
!                       &nbsp;
!               </td>
!               <td width="25%">
                        <input type="submit" name="submit" 
value="{lang_submit}">
!                       &nbsp; &nbsp;
                        <input type="reset" name="reset" value="{lang_clear}">
                </td>
-       
  </form>
-       
  <form action="{form_cancel_action}" method="post">
!       
!               <td width="25%">
                        <input type="submit" name="cancel" 
value="{lang_cancel}">
                </td>
-       
  </form>
-       
        </tr>
        </table>
        
        <p>&nbsp;</p>
! 
!       {V_mlist_html}
        
  
  <!-- END Sieve Mail Filters -->
--- 104,147 ----
        <br>
        
!       <table width="50%" border="0" cellPadding="0" cellSpacing="0" 
align="center">
        <tr> 
!               <td width="33%" align="center">
                        <input type="submit" name="submit" 
value="{lang_submit}">
!               </td>
!               <td width="34%" align="center">
                        <input type="reset" name="reset" value="{lang_clear}">
                </td>
  </form>
  <form action="{form_cancel_action}" method="post">
!               <td width="33%" align="center">
                        <input type="submit" name="cancel" 
value="{lang_cancel}">
                </td>
  </form>
        </tr>
        </table>
        
        <p>&nbsp;</p>
!       <hr>
!       <p>&nbsp;</p>
        
+       <table width="90%" border="0" cellPadding="4" cellSpacing="4" 
align="center">
+       <tr> 
+               <td colspan="2" align="center">
+                       <em>Under Development</em>
+                       <br>Submit the filter data to the database by clicking 
submit,
+                       <br>then you may test or apply the filter.
+               </td>
+       </tr>
+       <tr> 
+               <td width="50%" align="center">
+                       {test_this_filter_href}
+               </td>
+               <td width="50%" align="center">
+                       {apply_this_filter_href}
+               </td>
+       </tr>
+       </table>
+       
+       <p>&nbsp;</p>
  
  <!-- END Sieve Mail Filters -->

Index: filters_blocks.tpl
===================================================================
RCS file: /cvsroot/phpgroupware//email/templates/default/filters_blocks.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** filters_blocks.tpl  22 Jan 2002 13:16:34 -0000      1.3
--- filters_blocks.tpl  23 Jan 2002 13:22:23 -0000      1.4
***************
*** 13,17 ****
  <select name="{andor_select_name}">
        <option value="ignore_me" 
{ignore_me_selected}>&lt;{lang_ignore_me1}&gt;</option>
!       <option value="or" {or_selected}>{lang_or}</option>
        <option value="and" {and_selected}>{lang_and}</option>
  </select>
--- 13,17 ----
  <select name="{andor_select_name}">
        <option value="ignore_me" 
{ignore_me_selected}>&lt;{lang_ignore_me1}&gt;</option>
!       <!-- <option value="or" {or_selected}>{lang_or}</option> -->
        <option value="and" {and_selected}>{lang_and}</option>
  </select>