phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: email/templates/default search_form.tpl, NONE, 1


From: Dave Hall <address@hidden>
Subject: [Phpgroupware-cvs] CVS: email/templates/default search_form.tpl, NONE, 1.1.2.1 search_results.tpl, NONE, 1.1.2.1 search_results_js.tpl, NONE, 1.1.2.1 addressbook-real-plain.tpl-UNUSED, 1.2, 1.2.2.1 addressbook.tpl, 1.10, 1.10.2.1 addressbook.tpl-BAD, 1.2, 1.2.2.1 addressbook.tpl-ORIG, 1.2, 1.2.2.1 app_data.xsl, 1.1.1.1.2.1, 1.1.1.1.2.2 debug.tpl, 1.2, 1.2.2.1 filters.tpl, 1.11, 1.11.2.1 filters_list.tpl, 1.5, 1.5.2.1 index_main_b0_l2.tpl, 1.18, 1.18.2.1 message_main.tpl, 1.11, 1.11.2.1 widget_toolbar.tpl, 1.2, 1.2.2.1
Date: Mon, 08 Sep 2003 04:34:09 -0400

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

Modified Files:
      Tag: Version-0_9_16-branch
        addressbook-real-plain.tpl-UNUSED addressbook.tpl 
        addressbook.tpl-BAD addressbook.tpl-ORIG app_data.xsl 
        debug.tpl filters.tpl filters_list.tpl index_main_b0_l2.tpl 
        message_main.tpl widget_toolbar.tpl 
Added Files:
      Tag: Version-0_9_16-branch
        search_form.tpl search_results.tpl search_results_js.tpl 
Log Message:
merging AM 1.2-dev4-01


--- NEW FILE ---

<form name="search_frm" action="{form_action}" method="POST">
<table cellpadding="4" cellspacing="4" border="0"
 style="width: 75%; text-align: left; margin-left: auto; margin-right: auto;">
  <tbody>
    <tr>
      <td style="width: 70%; vertical-align: top;">
      <div align="center"> </div>
      <table cellpadding="2" cellspacing="2" border="0"
 style="width: 100%;">
        <tbody>
          <tr>
            <td style="vertical-align: top;">
            <table border="1" bordercolor="#000000" cellspacing="0"
 cellpadding="0" width="100%">
              <tbody>
                <tr>
                  <td>
                  <table style="width: 100%;" border="0" cellspacing="2"
 cellpadding="2" width="100%">
                    <tbody>
                      <tr>
                        <td colspan="2" bgcolor="#d3dce3">
                        <div align="center"><span
 style="font-weight: bold;">{lang_search_string}</span></div>
                        <table cellpadding="2" cellspacing="2"
 border="0" style="width: 100%;">
                          <tbody>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">{lang_subject}</td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb"><input size="30" name="search_subject" maxlength="50"> </td>
                            </tr>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">{lang_from}<br>
                              </td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb" width="25%"><input size="30" name="search_from" 
maxlength="50"></td>
                            </tr>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">Body<br>
                              </td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb"> <input size="30" name="search_body" maxlength="50"></td>
                            </tr>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">{lang_to}<br>
                              </td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb"> <input size="30" name="search_to" maxlength="50"></td>
                            </tr>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">{lang_cc}<br>
                              </td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb"> <input size="30" name="search_cc" maxlength="50"></td>
                            </tr>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">{lang_bcc}<br>
                              </td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb"> <input size="30" name="search_bcc" maxlength="50"></td>
                            </tr>
                            <tr>
                              <td style="vertical-align: top;"
 bgcolor="#eeeeee" width="60%" align="right" valign="middle">{lang_keyword}<br>
                              </td>
                              <td style="vertical-align: top;"
 bgcolor="#bbbbbb"> <input size="30" name="search_keyword" maxlength="50"></td>
                            </tr>
                          </tbody>
                        </table>
                        </td>
                      </tr>
                    </tbody>
                  </table>
                  </td>
                </tr>
              </tbody>
            </table>
            </td>
          </tr>
          <tr>
            <td>
            <table border="1" bordercolor="#000000" cellspacing="0"
 cellpadding="0" width="100%">
              <tbody>
                <tr>
                                  <td valign="top">
                                        <table border="1" cellpadding="2" 
cellspacing="2" width="100%">
                                        <tr>
                                        <td bgcolor="#d3dce3">
                                                <b>{lang_search}</b>
                                        </td>
                                        </tr>
                                        <!-- BEGIN folder -->
                                        <tr>
                                        <td bgcolor="#eeeeee">
                                                <input type="checkbox" 
name="folder_list[]" value="{fld_value}"
 {fld_checked}>
 &nbsp;{fld_value}
                                        </td>
                                        </tr>
                                        <!-- END folder -->
                                        </table>
                                  </td>
                </tr>
              </tbody>
            </table>
            </td>
          </tr>
          <tr>
            <td style="vertical-align: top;">
            <table border="1" bordercolor="#000000" cellspacing="0"
 cellpadding="0" width="100%">
              <tbody>
                <tr>
                  <td>
                  <table cellpadding="2" cellspacing="2" border="0"
 width="100%">
                    <tbody>
                      <tr>
                        <td valign="top" colspan="2" align="center"
 bgcolor="#d3dce3"><b>{lang_return_mails_during}<b><br>
                        </td>
                      </tr>
                      <tr>
                        <td valign="top" bgcolor="#cccccc"><input
 type="checkbox" name="date_on">&nbsp;&nbsp;&nbsp;{lang_on}</td>
                        <td valign="top" bgcolor="#cccccc">

                                        <select name="date_on_month">
                                <!-- BEGIN month_on -->
                            <option value="{month_value}" 
{selected}>{month_option}</option>
                            <!-- END month_on -->
                        </select>
                    <select name="date_on_day">
                            <!-- BEGIN day_on -->
                        <option value="{day_option}" 
{selected}>{day_option}</option>
                            <!-- END day_on -->
                        </select>
                    <select name="date_on_year">
                            <!-- BEGIN year_on -->
                        <option value="{year_option}" 
{selected}>{year_option}</option>
                            <!-- END year_on -->
                        </select>
                        </td>
                      </tr>
                      <tr>
                        <td valign="top" bgcolor="#cccccc"><input
 type="checkbox" name="date_before"> &nbsp; {lang_before}</td>
                        <td valign="top" bgcolor="#cccccc">

                                        <select name="date_before_month">
                        <!-- BEGIN month_before -->
                           <option value="{month_value}" 
{selected}>{month_option}</option>
                       <!-- END month_before -->
                       </select>
                   <select name="date_before_day">
                           <!-- BEGIN day_before -->
                       <option value="{day_option}" 
{selected}>{day_option}</option>
                           <!-- END day_before -->
                       </select>
                   <select name="date_before_year">
                           <!-- BEGIN year_before -->
                       <option value="{year_option}" 
{selected}>{year_option}</option>
                           <!-- END year_before -->
                       </select>

                        </td>
                      </tr>
                      <tr>
                        <td valign="top" bgcolor="#cccccc"><input
 type="checkbox" name="date_after">&nbsp;&nbsp; {lang_after} </td>
                        <td valign="top" bgcolor="#cccccc">

                                <select name="date_after_month">
                    <!-- BEGIN month_after -->
                    <option value="{month_value}" 
{selected}>{month_option}</option>
                    <!-- END month_after -->
                </select>
                <select name="date_after_day">
                    <!-- BEGIN day_after -->
                    <option value="{day_option}" 
{selected}>{day_option}</option>
                    <!-- END day_after -->
                </select>
                <select name="date_after_year">
                    <!-- BEGIN year_after -->
                    <option value="{year_option}" 
{selected}>{year_option}</option>
                    <!-- END year_after -->
                </select>


                        </td>
                      </tr>
                    </tbody>
                  </table>
                  </td>
                </tr>
              </tbody>
            </table>
            </td>
          </tr>
        </tbody>
      </table>
      </td>
      <td width="30%" valign="top">
      <table cellpadding="0" cellspacing="0" border="1"
 bordercolor="#000000" width="100%">
        <tbody>
          <tr>
            <td>
            <table cellpadding="2" cellspacing="2" border="0"
 style="width: 100%;">
              <tbody>
                <tr>
                  <td bgcolor="#d3dce3">
                  <div align="center"><b>{lang_check_flags}
                  </b></div>
                  </td>
                </tr>
                                <!-- BEGIN flag -->
                <tr>
                  <td style="vertical-align: top;" bgcolor="#dddddd"><input
 type="checkbox" name="{flg_name}">&nbsp;{flg_value}</td>
                </tr>
                                <!-- END flag -->
              </tbody>
            </table>
            </td>
          </tr>
        </tbody>
      </table>
      <br>
      </td>
    </tr>
    <tr>
      <td valign="top" colspan="2" align="center"> <input type="submit"
 value="{lang_search_button}">&nbsp;&nbsp;<input type="reset" 
value="{lang_clear_form_button}"> </td>
    </tr>
  </tbody>
</table>
<br>
</form>


--- NEW FILE ---

<table border="0" cellspacing="0" cellpadding="8" align="center">
<tr bgcolor="DDDDDD">
  <td>
        <b>{num_msg} {lang_messages_found_in_folder} "{folder}"</b>
  </td>
</tr>
</table>

<form name="{form_name}" action="{delmov_action}" method="POST">
<input type="hidden" name="what" value="delete">
<input type="hidden" name="folder" value="{folder_short}">
<table border="0" cellpadding="4" cellspacing="1" width="95%" align="center">
<tr bgcolor="#D3DCE3">
        <td width="3%" align="center">
                &nbsp;
        </td>
        <td width="2%">
                &nbsp;

        </td>
        <td width="20%">
                <font size="2" face="Arial, Helvetica, san-serif">
                <strong>{lang_from}</strong>
                </font>
        </td>
        <td width="39%">
                <font size="2" face="Arial, Helvetica, san-serif">

                <strong>{lang_subject}</strong>
                </font>
        </td>
        <td width="10%" align="center">
                <font size="1" face="Arial, Helvetica, san-serif">
                <strong>{lang_date}</strong>
                </font>
        </td>

        <td width="4%" align="center">
                <font size="1" face="Arial, Helvetica, san-serif">
                <strong>{lang_size}</strong>
                </font>
        </td>
</tr>


<!-- BEGIN search_result -->
<tr bgcolor="#DDDDDD">
        <td align="center">
                <input type="checkbox" name="delmov_list[]" 
value="{checkbox_val}">
        </td>
        <td align="center">

                &nbsp;
        </td>
        <td align="left">
                <font size="2" face="Arial, Helvetica, san-serif">{from}</font>
        </td>
        <td align="left">
                <font size="2" face="Arial, Helvetica, san-serif"><a 
href="{msg_link}">{subject}</a></font>

        </td>
        <td align="center">
                <font size="2" face="Arial, Helvetica, san-serif">{date}</font>
        </td>
        <td align="center">
                <font size="1" face="Arial, Helvetica, san-serif">{size}</font>
        </td>
</tr>
<!-- END search_result -->

<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>
        </td>
        <td colspan="3" align="right">
                <select name="to_fldball_fake_uri" 
onChange="do_action('{form_name}', 'move')">
                        <option 
value="">{lang_move_selected_messages_into}</option>
                        <!-- BEGIN folder_list -->
                        <option value="{fld_link}">{fld_value}</option>
                        <!-- END folder_list -->
                </select>
        </td>
</tr>
</table>
</form>


--- NEW FILE ---

<script type="text/javascript">

function check_all(form_name)
{
        for (i=0; i<document.forms[form_name].elements.length; i++) {
                if (document.forms[form_name].elements[i].type == "checkbox") {
                        if (document.forms[form_name].elements[i].checked) {
                                document.forms[form_name].elements[i].checked = 
false;
                        } else {
                                document.forms[form_name].elements[i].checked = 
true;
                        }
                } 
        }
}

function do_action(form_name, act)
{
        flag = 0;
        for (i=0; i<document.forms[form_name].elements.length; i++) {
                //alert(document.forms[form_name].elements[i].type);
                if (document.forms[form_name].elements[i].type == "checkbox") {
                        if (document.forms[form_name].elements[i].checked) {
                                flag = 1;
                        }
                }
        }
        if (flag != 0) {
                document.forms[form_name].what.value = act;
                document.forms[form_name].submit();
        } else {
                alert("Please select a message first");
                document.forms[form_name].tofolder.selectedIndex = 0;
        }
}

</script>


Index: addressbook-real-plain.tpl-UNUSED
===================================================================
RCS file: 
/cvsroot/phpgroupware/email/templates/default/addressbook-real-plain.tpl-UNUSED,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1

Index: addressbook.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/addressbook.tpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1

Index: addressbook.tpl-BAD
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/addressbook.tpl-BAD,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1

Index: addressbook.tpl-ORIG
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/addressbook.tpl-ORIG,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1

Index: app_data.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/app_data.xsl,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
*** app_data.xsl        20 Apr 2003 21:07:56 -0000      1.1.1.1.2.1
--- app_data.xsl        8 Sep 2003 08:33:37 -0000       1.1.1.1.2.2
***************
*** 114,117 ****
--- 114,123 ----
                <!-- end the table where the message list will go -->
                </table>
+               <!-- optional GeekBar -->
+               <xsl:if test="geek_bar != ''">
+                       <!-- GeekBar comes pre made as an html widget -->
+                       <br />
+                       <xsl:value-of disable-output-escaping="yes" 
select="geek_bar"/>
+               </xsl:if>
                <!-- optional debug data -->
                <xsl:if test="debugdata != ''">

Index: debug.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/debug.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** debug.tpl   14 Mar 2003 04:02:58 -0000      1.2
--- debug.tpl   8 Sep 2003 08:33:37 -0000       1.2.2.1
***************
*** 40,43 ****
--- 40,44 ----
                        <li>{func_D4}</li>
                        <li>{func_D5}</li>
+                       <li>{func_D6}</li>
                        <li> = = Inline Docs = =</li>
                        <li>{func_I1}</li>
***************
*** 54,57 ****
--- 55,59 ----
                        <li>{func_O4}</li>
                        <li>{func_O5}</li>
+                       <li>{func_O6}</li>
                </ul>
                <br>
***************
*** 63,66 ****
--- 65,70 ----
  
  <br>
+ <!-- if using debug popup window that js will follow here -->
+ {debugdata}
  
  <!-- BEGIN B_after_echo -->

Index: filters.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/filters.tpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** filters.tpl 14 Mar 2003 04:02:58 -0000      1.11
--- filters.tpl 8 Sep 2003 08:33:37 -0000       1.11.2.1
***************
*** 129,133 ****
--- 129,136 ----
        <tr> 
                <td colspan="2" align="center">
+                       <!--
                        <em>Under Development</em>
+                       -->
+                       <!-- this text reminds the user to submit the filter 
first so AM knows about it -->
                        <br>Submit the filter data to the database by clicking 
submit,
                        <br>then you may test or apply the filter.
***************
*** 145,148 ****
--- 148,153 ----
        
        <p>&nbsp;</p>
+ 
  {debugdata}
+ 
  <!-- END Sieve Mail Filters -->

Index: filters_list.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/filters_list.tpl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** filters_list.tpl    14 Mar 2003 04:03:05 -0000      1.5
--- filters_list.tpl    8 Sep 2003 08:33:37 -0000       1.5.2.1
***************
*** 75,78 ****
  
  <p>&nbsp;</p>
! {debugdata}
  <!-- end filter_list.tpl -->
--- 75,78 ----
  
  <p>&nbsp;</p>
! 
  <!-- end filter_list.tpl -->

Index: index_main_b0_l2.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/index_main_b0_l2.tpl,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -r1.18 -r1.18.2.1
*** index_main_b0_l2.tpl        14 Mar 2003 04:03:06 -0000      1.18
--- index_main_b0_l2.tpl        8 Sep 2003 08:33:37 -0000       1.18.2.1
***************
*** 122,125 ****
--- 122,128 ----
  </tr>
  </table>
+ 
+ {geek_bar}
+ 
  {debugdata}
  <br> 

Index: message_main.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/message_main.tpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** message_main.tpl    14 Mar 2003 04:03:06 -0000      1.11
--- message_main.tpl    8 Sep 2003 08:33:37 -0000       1.11.2.1
***************
*** 68,76 ****
  </tr>
  <tr>
!       <td bgcolor="{tofrom_labels_bkcolor}" class="{tofrom_labels_class}" 
valign="top" width="50%">
                <font size="2" face="{theme_font}">
                <strong>{lang_from}:</strong></font>
        </td>
!       <td bgcolor="{tofrom_data_bkcolor}" class="{tofrom_data_class}" 
width="50%">
                <font size="2" face="{theme_font}">
                {from_data_final}
--- 68,76 ----
  </tr>
  <tr>
!       <td bgcolor="{tofrom_labels_bkcolor}" class="{tofrom_labels_class}" 
valign="top" width="20%">
                <font size="2" face="{theme_font}">
                <strong>{lang_from}:</strong></font>
        </td>
!       <td bgcolor="{tofrom_data_bkcolor}" class="{tofrom_data_class}" 
width="80%">
                <font size="2" face="{theme_font}">
                {from_data_final}
***************
*** 171,174 ****
--- 171,176 ----
  
  </table>
+ {geek_bar}
+ <!-- lame sep ##### Lame Sep -->
  {debugdata}
  <!-- end message_main.tpl -->

Index: widget_toolbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/email/templates/default/widget_toolbar.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** widget_toolbar.tpl  14 Mar 2003 04:03:06 -0000      1.2
--- widget_toolbar.tpl  8 Sep 2003 08:33:37 -0000       1.2.2.1
***************
*** 6,10 ****
  <table border="0" cellpadding="2" cellspacing="0" width="100%" align="center">
  <tr bgcolor="{toolbar_row1_bgcolor}" class="{row1_rowcolor_key}">
!       <td width="20%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {compose_img_link}
--- 6,10 ----
  <table border="0" cellpadding="2" cellspacing="0" width="100%" align="center">
  <tr bgcolor="{toolbar_row1_bgcolor}" class="{row1_rowcolor_key}">
!       <td width="16%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {compose_img_link}
***************
*** 12,16 ****
                </font>
        </td>
!       <td width="20%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {folders_img_link}
--- 12,16 ----
                </font>
        </td>
!       <td width="17%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {folders_img_link}
***************
*** 18,22 ****
                </font>
        </td>
!       <td width="20%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {filters_img_link}
--- 18,28 ----
                </font>
        </td>
!       <td width="17%" valign="middle" align="center">
!               <font face="{toolbar_font}">
!               {search_img_link}
!               {search_txt_link}
!               </font>
!       </td>
!       <td width="17%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {filters_img_link}
***************
*** 24,28 ****
                </font>
        </td>
!       <td width="20%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {accounts_img_link}
--- 30,34 ----
                </font>
        </td>
!       <td width="17%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {accounts_img_link}
***************
*** 30,34 ****
                </font>
        </td>
!       <td width="20%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {settings_img_link}
--- 36,40 ----
                </font>
        </td>
!       <td width="16%" valign="middle" align="center">
                <font face="{toolbar_font}">
                {settings_img_link}





reply via email to

[Prev in Thread] Current Thread [Next in Thread]