[Vtigercrm-commits] [vtiger-commits] r10632 - in /vtigercrm/branches/5.0.3: Smarty/templates/Emails.tpl modules/Emails/Emails.js

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed Apr 11 02:55:27 2007
New Revision: 10632

Log:
* Fixed the issue in mail search, Fixed #3349#3346

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
    vtigercrm/branches/5.0.3/modules/Emails/Emails.js

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl Wed Apr 11 02:55:27 2007
@@ -159,17 +159,20 @@
 									<table width="100%"  border="0" cellspacing="0" cellpadding="2">
 									<input name="idlist" type="hidden">
 										<tr>
-											<td width="25%" align="left"><input type="button" name="Button2" value=" {$APP.LBL_DELETE_BUTTON}"  class="crmbutton small delete" onClick="return massDelete();"/> &nbsp;</td>
-											<td width="50%" align="right" class="small">
-												<font color="#000000">{$APP.LBL_SEARCH}</font>&nbsp;<input type="text" name="search_text" id="search_text" class="importBox" onkeyUp="Searchfn();">&nbsp;
+											<td width="30%" align="left"><input type="button" name="Button2" value=" {$APP.LBL_DELETE_BUTTON}"  class="crmbutton small delete" onClick="return massDelete();"/> &nbsp;</td>
+											<td width="40%" align="right" class="small">
+												<font color="#000000">{$APP.LBL_SEARCH}</font>&nbsp;<input type="text" name="search_text" id="search_text" class="importBox" >&nbsp;
 											</td>
-											<td width="25%" align=left class="small">
+											<td width="20%" align=left class="small">
 												<select name="search_field" id="search_field" onChange="Searchfn();" class="importBox">
 												<option value='subject'>{$MOD.LBL_IN_SUBJECT}</option>
 												<option value='user_name'>{$MOD.LBL_IN_SENDER}</option>
 												<option value='join'>{$MOD.LBL_IN_SUBJECT_OR_SENDER}</option>
 												</select>&nbsp;
 											</td>
+											<td width="10%">
+					<input name="find" value=" Find " class="crmbutton small create" onclick="Searchfn();" type="button">
+				</td>
 										</tr>
 									</table>
 									

Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.js
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/Emails.js (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/Emails.js Wed Apr 11 02:55:27 2007
@@ -202,10 +202,10 @@
                         method: 'post',
                         postBody: "module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text,
                         onComplete: function(response) {
-                                        $("status").style.display="none";
+                        		$("email_con").innerHTML=response.responseText;
+			                $("status").style.display="none";
                                         $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
                                         $("subjectsetter").innerHTML='';
-                                        $("email_con").innerHTML=response.responseText;
                                         execJS($('email_con'));
                         }
                 }