[Phpgroupware-cvs] CVS: felamimail/templates/default config.tpl,1.1.1.1.2.1,1.1.1.1.2.2 filterForm.tpl,1.1.2.2,1.1.2.3 mainscreen.tpl,1.1.1.1.2.2,1.1.1.1.2.3 preferences_email.tpl,1.1.1.1,1.1.1.1.2.1

[Lars Kneschke <address@hidden>]

Update of /cvsroot/phpgroupware/felamimail/templates/default
In directory subversions:/tmp/cvs-serv5506/templates/default

Modified Files:
      Tag: Version-0_9_14-branch
        config.tpl filterForm.tpl mainscreen.tpl preferences_email.tpl 
Log Message:
preparing for the next release
- filter dialog improved again
        - you store multiple filters now
        
- integration of sieve-php
        - you can manage sieve scripts on a sieve enables imap server
        
- internal code cleanup
- modified linux-at-work.de template
- updated preferences dialog to do it the phpgroupware way
- you can define a refresh time for the mailbox message list
                


Index: config.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/templates/default/config.tpl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** config.tpl  4 Jun 2002 12:15:23 -0000       1.1.1.1.2.1
--- config.tpl  16 Oct 2002 08:09:38 -0000      1.1.1.1.2.2
***************
*** 66,69 ****
--- 66,79 ----
     </tr>
  
+    <tr bgcolor="{row_off}">
+     <td>{lang_Enter_your_SIEVE_server_hostname_or_IP_address}:</td>
+     <td><input name="newsettings[sieveServer]" 
value="{value_sieveServer}"></td>
+    </tr>
+ 
+    <tr bgcolor="{row_on}">
+     <td>{lang_Enter_your_SMTP_server_port}:</td>
+     <td><input name="newsettings[sievePort]" value="{value_sievePort}"></td>
+    </tr>
+ 
  <!-- END body -->
  <!-- BEGIN footer -->

Index: filterForm.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/felamimail/templates/default/Attic/filterForm.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** filterForm.tpl      20 Jun 2002 12:46:27 -0000      1.1.2.2
--- filterForm.tpl      16 Oct 2002 08:09:38 -0000      1.1.2.3
***************
*** 21,24 ****
--- 21,32 ----
  <tr>
        <td class="body" width="40%" align="right">
+               {lang_filter_name}:
+       </td>
+       <td class="body" width="60%" colspan="2">
+               <input class="body" type=text size="60" name="filterName" 
value="{filterName}">
+       </td>
+ </tr>
+ <tr>
+       <td class="body" width="40%" align="right">
                {lang_from}:
        </td>
***************
*** 49,59 ****
  </tr>
  <tr>
!       <td class="body" width="10%" align="right">
!               {lang_filter_active}:
!       </td>
!       <td class="body">
!               <input class="body" type=checkbox name="filter_active" 
{filter_checked}>
        </td>
!       <td  class="body" align="right">
                <input type="submit" class="body" value="Speichern">
        </td>
--- 57,64 ----
  </tr>
  <tr>
!       <td class="body" width="10%" align="left">
!               <a href="{link_newFilter} ">{lang_new_filter}</a>
        </td>
!       <td  class="body" align="right" colspan="2">
                <input type="submit" class="body" value="Speichern">
        </td>
***************
*** 63,72 ****
  </table>
  </form>
  <script language="javascript1.2">
  <!--
  // position cursor in top form field
! document.filterForm.from.focus();
  //-->
  </script>
  <!-- END header -->
  
--- 68,116 ----
  </table>
  </form>
+ 
+ <form method="post" name="filterList" action="{link_action}">
+ 
+ <table width="95%" border="0" cellspacing="1" cellpading="1">
+ <tr>
+       <td class="body">
+               {lang_no_filter}
+       </td>
+       <td class="body" align="right">
+               <a href={link_noFilter}>{lang_activate}</a>
+       </td>
+       <td class="body" align="right">
+               &nbsp;
+       </td>
+       <td class="body" align="right">
+               &nbsp;
+       </td>
+ </tr>
+ {filterrows}
+ </table>
+ 
+ </form>
+ 
  <script language="javascript1.2">
  <!--
  // position cursor in top form field
! document.filterForm.filterName.focus();
  //-->
  </script>
  <!-- END header -->
  
+ <!-- BEGIN filterrow -->
+ <tr>
+       <td class="body">
+               {filtername}
+       </td>
+       <td class="body" align="right">
+               <a href={link_activateFilter}>{lang_activate}</a>
+       </td>
+       <td class="body" align="right">
+               <a href={link_deleteFilter}>{lang_delete}</a>
+       </td>
+       <td class="body" align="right">
+               <a href={link_editFilter}>{lang_edit}</a>
+       </td>
+ </tr>
+ <!-- END filterrow -->
\ No newline at end of file

Index: mainscreen.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/templates/default/mainscreen.tpl,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** mainscreen.tpl      20 Jun 2002 12:46:27 -0000      1.1.1.1.2.2
--- mainscreen.tpl      16 Oct 2002 08:09:38 -0000      1.1.1.1.2.3
***************
*** 1,3 ****
--- 1,34 ----
  <!-- BEGIN main -->
+ <script language="JavaScript1.2">
+ <!--
+ var sURL = unescape(window.location.pathname);
+ 
+ function doLoad()
+ {
+     // the timeout value should be the same as in the "refresh" meta-tag
+     {refreshTime}
+ }
+ 
+ function refresh()
+ {
+     //  This version of the refresh function will be invoked
+     //  for browsers that support JavaScript version 1.2
+     //
+     
+     //  The argument to the location.reload function determines
+     //  if the browser should retrieve the document from the
+     //  web-server.  In our example all we need to do is cause
+     //  the JavaScript block in the document body to be
+     //  re-evaluated.  If we needed to pull the document from
+     //  the web-server again (such as where the document contents
+     //  change dynamically) we would pass the argument as 'true'.
+     //  
+     window.location.reload( false );
+ }
+ 
+ doLoad();
+ 
+ //-->
+ </script>
  <script type="text/javascript">
  <!--

Index: preferences_email.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/felamimail/templates/default/preferences_email.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** preferences_email.tpl       31 Dec 2001 00:59:11 -0000      1.1.1.1
--- preferences_email.tpl       16 Oct 2002 08:09:38 -0000      1.1.1.1.2.1
***************
*** 6,45 ****
  <tr>
        <td colspan="2" bgcolor="{th_bg}">
-               <b>{page_title}</b>
-       </td>
- </tr>
- <tr>
-       <td align="left" bgcolor="{bg_row1}">
-               {email_sig_blurb}
-       </td>
-       <td align="center" bgcolor="{bg_row1}">
-               <textarea name="{email_sig_textarea_name}" rows="3" 
cols="30">{email_sig_textarea_content}</textarea>
-       </td>
- </tr>
- <tr>
-       <td align="left" bgcolor="{bg_row2}">
-               {sorting_blurb}
-       </td>
-       <td align="center" bgcolor="{bg_row2}">
-               <select name="{sorting_select_name}">
-                       {sorting_select_options}
-               </select>
-       </td>
- </tr>
- <tr>
-       <td align="left" bgcolor="{bg_row1}">
-               {mainscreen_showmail_blurb}
-       </td>
-       <td align="center" bgcolor="{bg_row1}">
-               <input type="checkbox" 
name="{mainscreen_showmail_checkbox_name}" 
value="{mainscreen_showmail_checkbox_value}" {mainscreen_showmail_checked}>
-       </td>
- </tr>
- <tr>
-       <td colspan="2">
-               &nbsp;
-       </td>
- </tr>
- <tr>
-       <td colspan="2" bgcolor="{th_bg}">
                <b>{section_title}</b>
        </td>
--- 6,9 ----