[Vtigercrm-commits] [vtiger-commits] r10578 - in /vtigercrm/branches/5.0.3: Smarty/templates/EmailContents.tpl Smarty/templates/Emails.tpl modules/Emails/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Fri Apr  6 02:52:46 2007
New Revision: 10578

Log:
* Fixed issues related to Qualify mail and to show the sent mails based on Leads, Contactas and Accounts, Fixes #3228 #3240

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
    vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl Fri Apr  6 02:52:46 2007
@@ -17,16 +17,20 @@
             <th width="15%">{$LISTHEADER.1}</th>
             <th width="15%">{$LISTHEADER.2}</th>
         </tr>
-		{foreach key=id item=row from=$LISTENTITY}
-	    <tr id="row_{$id}">
-			<td>
-			<span><input type="checkbox" name="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
-</span></td>
-			<td onClick="getEmailContents('{$id}'),setSubject('{$row.0}');" style="cursor:pointer;"><b>{$row.0}</b></td>
-			<td onClick="getEmailContents('{$id}'),setSubject('{$row.0}');" style="cursor:pointer;">{$row.1}</td>
-			<td onClick="getEmailContents('{$id}'),setSubject('{$row.0}');" style="cursor:pointer;">{$row.2}</td>
-        </tr>
-		{/foreach}
+		{if $LISTENTITY != NULL}
+			{foreach key=id item=row from=$LISTENTITY}
+			    <tr id="row_{$id}">
+				<td>
+				<span><input type="checkbox" name="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
+				</span></td>
+				<td onClick="getEmailContents('{$id}'),setSubject('{$row.0}');" style="cursor:pointer;"><b>{$row.0}</b></td>
+				<td onClick="getEmailContents('{$id}'),setSubject('{$row.0}');" style="cursor:pointer;">{$row.1}</td>
+				<td onClick="getEmailContents('{$id}'),setSubject('{$row.0}');" style="cursor:pointer;">{$row.2}</td>
+			        </tr>
+			{/foreach}
+		{else}
+			<tr><td align="center"><b>{$MOD.LBL_NO_RECORDS}</b></td></tr>
+		{/if}
     </table>
 </div>
 <SCRIPT>

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 Fri Apr  6 02:52:46 2007
@@ -45,10 +45,12 @@
                 postBody: 'module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid='+folderid,
                 onComplete: function(response) {ldelim}
                                         $("status").style.display="none";
-                                        if(gFolderid != folderid)
+                                        if(gFolderid == folderid)
                                         {ldelim}
                                                 gselectedrowid = 0;
                                                 $("email_con").innerHTML=response.responseText;
+						$('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='';
                                                 execJS($('email_con'));
                                         {rdelim}
                                         else

Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Fri Apr  6 02:52:46 2007
@@ -164,6 +164,7 @@
 'LBL_CONF_MAILSERVER_ERROR'=>'Please configure your outgoing mailserver under Settings ---> Outgoing Server link',
 'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Email Client',
 'LBL_MAILSELECT_INFO3'=>'You don\'t have permission to view email id(s) of the selected Record(s).',
+'LBL_NO_RECORDS' => 'No Records in this folder',
 //Added  for script alerts
 'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f
 or an update!',