[Phpgroupware-cvs] CVS: felamimail/templates/default composeForm.tpl,1.1.1.1.2.1,1.1.1.1.2.2 config.tpl,1.1.1.1,1.1.1.1.2.1 mainscreen.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-serv14909/templates/default

Modified Files:
      Tag: Version-0_9_14-branch
        composeForm.tpl config.tpl mainscreen.tpl 
Log Message:
- you can now filter messages
  so far only for senderaddress, sendername and subject
  
- updated the way, felamimail find its options. it was broken

- when you have ldap account storage enabled, felamimail trys to
  read the users email address from ldap


Index: composeForm.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/templates/default/composeForm.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
*** composeForm.tpl     25 Feb 2002 23:58:37 -0000      1.1.1.1.2.1
--- composeForm.tpl     4 Jun 2002 12:15:23 -0000       1.1.1.1.2.2
***************
*** 26,38 ****
        </td>
  </tr>
  <tr bgcolor="{bg01}">
        <td width="10%">
                <b>{lang_to}:</b>
        </td>
!       <td width="60%">
!               <input class="text" type=text size="60" name="to" value='{to}'>
!       </td>
!       <td align="right">
!               <input class="text" type="button" value="{lang_addressbook}" 
onclick="addybook();">
        </td>
  </tr>
--- 26,46 ----
        </td>
  </tr>
+ <tr bgcolor="{bg02}">
+       <td class="body" width="10%">
+               <b>{lang_from}:</b>
+       </td>
+       <td class="body" align="left" width="60%">
+               {from}
+       </td>
+       <td class="body" align="right">
+               <input class="text" type="button" value="{lang_addressbook}" 
onclick="addybook();">
+       </td>
+ </tr>
  <tr bgcolor="{bg01}">
        <td width="10%">
                <b>{lang_to}:</b>
        </td>
!       <td width="60%" colspan="2">
!               <input class="text" type=text size="60" name="to" value="{to}">
        </td>
  </tr>
***************
*** 78,81 ****
--- 86,97 ----
  </tr>
  </table>
+ 
+ <script language="javascript1.2">
+ <!--
+ // position cursor in top form field
+ document.doit.to.focus();
+ //-->
+ </script>
+ 
  <!-- END header -->
  

Index: config.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/templates/default/config.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
*** config.tpl  31 Dec 2001 00:59:11 -0000      1.1.1.1
--- config.tpl  4 Jun 2002 12:15:23 -0000       1.1.1.1.2.1
***************
*** 17,21 ****
     <tr bgcolor="{row_on}">
      
<td>{lang_Enter_your_POP}/{lang_IMAP_mail_server_hostname_or_IP_address}:</td>
!     <td><input name="newsettings[mail_server]" 
value="{value_mail_server}"></td>
     </tr>
  
--- 17,21 ----
     <tr bgcolor="{row_on}">
      
<td>{lang_Enter_your_POP}/{lang_IMAP_mail_server_hostname_or_IP_address}:</td>
!     <td><input name="newsettings[imapServer]" value="{value_imapServer}"></td>
     </tr>
  
***************
*** 23,31 ****
      <td>{lang_Select_your_mail_server_type}:</td>
      <td>
!      <select name="newsettings[mail_server_type]">
!       <option value="imap" {selected_mail_server_type_imap}>IMAP</option>
!       <option value="pop3" {selected_mail_server_type_pop3}>POP-3</option>
!       <option value="imaps" {selected_mail_server_type_imaps}>IMAPS</option>
!       <option value="pop3s" {selected_mail_server_type_pop3s}>POP-3S</option>
       </select>
      </td>
--- 23,29 ----
      <td>{lang_Select_your_mail_server_type}:</td>
      <td>
!      <select name="newsettings[imapServerMode]">
!       <option value="imap" {selected_imapServerMode_imap}>IMAP</option>
!       <option value="imaps" {selected_imapServerMode_imaps}>IMAPS</option>
       </select>
      </td>
***************
*** 35,42 ****
      <td>IMAP server type:</td>
      <td>
!      <select name="newsettings[imap_server_type]">
!       <option value="Cyrus" {selected_imap_server_type_Cyrus}>Cyrus or 
Courier</option>
!       <option value="UWash" {selected_imap_server_type_UWash}>UWash</option>
!       <option value="UW-Maildir" 
{selected_imap_server_type_UW-Maildir}>UW-Maildir</option>
       </select>
      </td>
--- 33,40 ----
      <td>IMAP server type:</td>
      <td>
!      <select name="newsettings[imapServerType]">
!       <option value="Cyrus" {selected_imapServerType_Cyrus}>Cyrus or 
Courier</option>
!       <option value="UWash" {selected_imapServerType_UWash}>UWash</option>
!       <option value="UW-Maildir" 
{selected_imapServerType_UW-Maildir}>UW-Maildir</option>
       </select>
      </td>
***************
*** 45,49 ****
     <tr bgcolor="{row_off}">
      <td>{lang_Enter_your_default_mail_domain_(_From:address@hidden)}:</td>
!     <td><input name="newsettings[mail_suffix]" 
value="{value_mail_suffix}"></td>
     </tr>
  
--- 43,47 ----
     <tr bgcolor="{row_off}">
      <td>{lang_Enter_your_default_mail_domain_(_From:address@hidden)}:</td>
!     <td><input name="newsettings[mailSuffix]" value="{value_mailSuffix}"></td>
     </tr>
  
***************
*** 51,57 ****
      <td>{lang_Mail_server_login_type}:</td>
      <td>
!      <select name="newsettings[mail_login_type]">
!       <option value="standard" 
{selected_mail_login_type_standard}>standard</option>
!       <option value="vmailmgr" 
{selected_mail_login_type_vmailmgr}>vmailmgr</option>
       </select>
      </td>
--- 49,55 ----
      <td>{lang_Mail_server_login_type}:</td>
      <td>
!      <select name="newsettings[mailLoginType]">
!       <option value="standard" 
{selected_mailLoginType_standard}>standard</option>
!       <option value="vmailmgr" 
{selected_mailLoginType_vmailmgr}>vmailmgr</option>
       </select>
      </td>
***************
*** 60,69 ****
     <tr bgcolor="{row_off}">
      <td>{lang_Enter_your_SMTP_server_hostname_or_IP_address}:</td>
!     <td><input name="newsettings[smtp_server]" 
value="{value_smtp_server}"></td>
     </tr>
  
     <tr bgcolor="{row_on}">
      <td>{lang_Enter_your_SMTP_server_port}:</td>
!     <td><input name="newsettings[smtp_port]" value="{value_smtp_port}"></td>
     </tr>
  
--- 58,67 ----
     <tr bgcolor="{row_off}">
      <td>{lang_Enter_your_SMTP_server_hostname_or_IP_address}:</td>
!     <td><input name="newsettings[smtpServer]" value="{value_smtpServer}"></td>
     </tr>
  
     <tr bgcolor="{row_on}">
      <td>{lang_Enter_your_SMTP_server_port}:</td>
!     <td><input name="newsettings[smtpPort]" value="{value_smtpPort}"></td>
     </tr>
  

Index: mainscreen.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/templates/default/mainscreen.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
*** mainscreen.tpl      31 Dec 2001 00:59:11 -0000      1.1.1.1
--- mainscreen.tpl      4 Jun 2002 12:15:23 -0000       1.1.1.1.2.1
***************
*** 12,16 ****
        <TR BGCOLOR="{row_off}">
                <TD ALIGN="left" WIDTH="30%">
!                       <a 
href="{url_compose_empty}">{lang_compose}</a>&nbsp;&nbsp;<a 
href="{url_search}">{lang_search}</a>
                </td>
                <td align="right" width="70%">
--- 12,17 ----
        <TR BGCOLOR="{row_off}">
                <TD ALIGN="left" WIDTH="30%">
!                       <a 
href="{url_compose_empty}">{lang_compose}</a>&nbsp;&nbsp;
!                       <a href="{url_filter}">{lang_edit_filter}</a>
                </td>
                <td align="right" width="70%">